Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
f23c87a7
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f23c87a7
编写于
5月 21, 2013
作者:
O
Osier Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
src/uml: Remove the whitespace before ';'
上级
ba385415
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
13 deletion
+13
-13
src/uml/uml_conf.c
src/uml/uml_conf.c
+6
-6
src/uml/uml_driver.c
src/uml/uml_driver.c
+7
-7
未找到文件。
src/uml/uml_conf.c
浏览文件 @
f23c87a7
...
@@ -407,7 +407,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
...
@@ -407,7 +407,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
if
(
vm
->
def
->
os
.
root
)
if
(
vm
->
def
->
os
.
root
)
virCommandAddArgPair
(
cmd
,
"root"
,
vm
->
def
->
os
.
root
);
virCommandAddArgPair
(
cmd
,
"root"
,
vm
->
def
->
os
.
root
);
for
(
i
=
0
;
i
<
vm
->
def
->
ndisks
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
ndisks
;
i
++
)
{
virDomainDiskDefPtr
disk
=
vm
->
def
->
disks
[
i
];
virDomainDiskDefPtr
disk
=
vm
->
def
->
disks
[
i
];
if
(
!
STRPREFIX
(
disk
->
dst
,
"ubd"
))
{
if
(
!
STRPREFIX
(
disk
->
dst
,
"ubd"
))
{
...
@@ -419,7 +419,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
...
@@ -419,7 +419,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
virCommandAddArgPair
(
cmd
,
disk
->
dst
,
disk
->
src
);
virCommandAddArgPair
(
cmd
,
disk
->
dst
,
disk
->
src
);
}
}
for
(
i
=
0
;
i
<
vm
->
def
->
nnets
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
nnets
;
i
++
)
{
char
*
ret
=
umlBuildCommandLineNet
(
conn
,
vm
->
def
,
vm
->
def
->
nets
[
i
],
i
);
char
*
ret
=
umlBuildCommandLineNet
(
conn
,
vm
->
def
,
vm
->
def
->
nets
[
i
],
i
);
if
(
!
ret
)
if
(
!
ret
)
goto
error
;
goto
error
;
...
@@ -427,10 +427,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
...
@@ -427,10 +427,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
VIR_FREE
(
ret
);
VIR_FREE
(
ret
);
}
}
for
(
i
=
0
;
i
<
UML_MAX_CHAR_DEVICE
;
i
++
)
{
for
(
i
=
0
;
i
<
UML_MAX_CHAR_DEVICE
;
i
++
)
{
virDomainChrDefPtr
chr
=
NULL
;
virDomainChrDefPtr
chr
=
NULL
;
char
*
ret
=
NULL
;
char
*
ret
=
NULL
;
for
(
j
=
0
;
j
<
vm
->
def
->
nconsoles
;
j
++
)
for
(
j
=
0
;
j
<
vm
->
def
->
nconsoles
;
j
++
)
if
(
vm
->
def
->
consoles
[
j
]
->
target
.
port
==
i
)
if
(
vm
->
def
->
consoles
[
j
]
->
target
.
port
==
i
)
chr
=
vm
->
def
->
consoles
[
j
];
chr
=
vm
->
def
->
consoles
[
j
];
if
(
chr
)
if
(
chr
)
...
@@ -442,10 +442,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
...
@@ -442,10 +442,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
VIR_FREE
(
ret
);
VIR_FREE
(
ret
);
}
}
for
(
i
=
0
;
i
<
UML_MAX_CHAR_DEVICE
;
i
++
)
{
for
(
i
=
0
;
i
<
UML_MAX_CHAR_DEVICE
;
i
++
)
{
virDomainChrDefPtr
chr
=
NULL
;
virDomainChrDefPtr
chr
=
NULL
;
char
*
ret
=
NULL
;
char
*
ret
=
NULL
;
for
(
j
=
0
;
j
<
vm
->
def
->
nserials
;
j
++
)
for
(
j
=
0
;
j
<
vm
->
def
->
nserials
;
j
++
)
if
(
vm
->
def
->
serials
[
j
]
->
target
.
port
==
i
)
if
(
vm
->
def
->
serials
[
j
]
->
target
.
port
==
i
)
chr
=
vm
->
def
->
serials
[
j
];
chr
=
vm
->
def
->
serials
[
j
];
if
(
chr
)
if
(
chr
)
...
...
src/uml/uml_driver.c
浏览文件 @
f23c87a7
...
@@ -276,13 +276,13 @@ umlIdentifyChrPTY(struct uml_driver *driver,
...
@@ -276,13 +276,13 @@ umlIdentifyChrPTY(struct uml_driver *driver,
{
{
int
i
;
int
i
;
for
(
i
=
0
;
i
<
dom
->
def
->
nconsoles
;
i
++
)
for
(
i
=
0
;
i
<
dom
->
def
->
nconsoles
;
i
++
)
if
(
dom
->
def
->
consoles
[
i
]
->
source
.
type
==
VIR_DOMAIN_CHR_TYPE_PTY
)
if
(
dom
->
def
->
consoles
[
i
]
->
source
.
type
==
VIR_DOMAIN_CHR_TYPE_PTY
)
if
(
umlIdentifyOneChrPTY
(
driver
,
dom
,
if
(
umlIdentifyOneChrPTY
(
driver
,
dom
,
dom
->
def
->
consoles
[
i
],
"con"
)
<
0
)
dom
->
def
->
consoles
[
i
],
"con"
)
<
0
)
return
-
1
;
return
-
1
;
for
(
i
=
0
;
i
<
dom
->
def
->
nserials
;
i
++
)
for
(
i
=
0
;
i
<
dom
->
def
->
nserials
;
i
++
)
if
(
dom
->
def
->
serials
[
i
]
->
source
.
type
==
VIR_DOMAIN_CHR_TYPE_PTY
&&
if
(
dom
->
def
->
serials
[
i
]
->
source
.
type
==
VIR_DOMAIN_CHR_TYPE_PTY
&&
umlIdentifyOneChrPTY
(
driver
,
dom
,
umlIdentifyOneChrPTY
(
driver
,
dom
,
dom
->
def
->
serials
[
i
],
"ssl"
)
<
0
)
dom
->
def
->
serials
[
i
],
"ssl"
)
<
0
)
...
@@ -1004,7 +1004,7 @@ error:
...
@@ -1004,7 +1004,7 @@ error:
static
void
umlCleanupTapDevices
(
virDomainObjPtr
vm
)
{
static
void
umlCleanupTapDevices
(
virDomainObjPtr
vm
)
{
int
i
;
int
i
;
for
(
i
=
0
;
i
<
vm
->
def
->
nnets
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
nnets
;
i
++
)
{
virDomainNetDefPtr
def
=
vm
->
def
->
nets
[
i
];
virDomainNetDefPtr
def
=
vm
->
def
->
nets
[
i
];
if
(
def
->
type
!=
VIR_DOMAIN_NET_TYPE_BRIDGE
&&
if
(
def
->
type
!=
VIR_DOMAIN_NET_TYPE_BRIDGE
&&
...
@@ -1092,7 +1092,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
...
@@ -1092,7 +1092,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
if
(
!
(
cmd
=
umlBuildCommandLine
(
conn
,
driver
,
vm
)))
if
(
!
(
cmd
=
umlBuildCommandLine
(
conn
,
driver
,
vm
)))
goto
cleanup
;
goto
cleanup
;
for
(
i
=
0
;
i
<
vm
->
def
->
nconsoles
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
nconsoles
;
i
++
)
{
VIR_FREE
(
vm
->
def
->
consoles
[
i
]
->
info
.
alias
);
VIR_FREE
(
vm
->
def
->
consoles
[
i
]
->
info
.
alias
);
if
(
virAsprintf
(
&
vm
->
def
->
consoles
[
i
]
->
info
.
alias
,
"console%zu"
,
i
)
<
0
)
{
if
(
virAsprintf
(
&
vm
->
def
->
consoles
[
i
]
->
info
.
alias
,
"console%zu"
,
i
)
<
0
)
{
virReportOOMError
();
virReportOOMError
();
...
@@ -2037,7 +2037,7 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver,
...
@@ -2037,7 +2037,7 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver,
char
*
cmd
=
NULL
;
char
*
cmd
=
NULL
;
char
*
reply
=
NULL
;
char
*
reply
=
NULL
;
for
(
i
=
0
;
i
<
vm
->
def
->
ndisks
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
ndisks
;
i
++
)
{
if
(
STREQ
(
vm
->
def
->
disks
[
i
]
->
dst
,
disk
->
dst
))
{
if
(
STREQ
(
vm
->
def
->
disks
[
i
]
->
dst
,
disk
->
dst
))
{
virReportError
(
VIR_ERR_OPERATION_FAILED
,
virReportError
(
VIR_ERR_OPERATION_FAILED
,
_
(
"target %s already exists"
),
disk
->
dst
);
_
(
"target %s already exists"
),
disk
->
dst
);
...
@@ -2163,7 +2163,7 @@ static int umlDomainDetachUmlDisk(struct uml_driver *driver,
...
@@ -2163,7 +2163,7 @@ static int umlDomainDetachUmlDisk(struct uml_driver *driver,
char
*
cmd
;
char
*
cmd
;
char
*
reply
;
char
*
reply
;
for
(
i
=
0
;
i
<
vm
->
def
->
ndisks
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
ndisks
;
i
++
)
{
if
(
STREQ
(
vm
->
def
->
disks
[
i
]
->
dst
,
dev
->
data
.
disk
->
dst
))
{
if
(
STREQ
(
vm
->
def
->
disks
[
i
]
->
dst
,
dev
->
data
.
disk
->
dst
))
{
break
;
break
;
}
}
...
@@ -2456,7 +2456,7 @@ umlDomainOpenConsole(virDomainPtr dom,
...
@@ -2456,7 +2456,7 @@ umlDomainOpenConsole(virDomainPtr dom,
}
}
if
(
dev_name
)
{
if
(
dev_name
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
nconsoles
;
i
++
)
{
for
(
i
=
0
;
i
<
vm
->
def
->
nconsoles
;
i
++
)
{
if
(
vm
->
def
->
consoles
[
i
]
->
info
.
alias
&&
if
(
vm
->
def
->
consoles
[
i
]
->
info
.
alias
&&
STREQ
(
vm
->
def
->
consoles
[
i
]
->
info
.
alias
,
dev_name
))
{
STREQ
(
vm
->
def
->
consoles
[
i
]
->
info
.
alias
,
dev_name
))
{
chr
=
vm
->
def
->
consoles
[
i
];
chr
=
vm
->
def
->
consoles
[
i
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录