Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
a8936295
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看板
提交
a8936295
编写于
9月 05, 2008
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix trailing whitespace mistakes
上级
1cc9f9b3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
28 deletion
+33
-28
ChangeLog
ChangeLog
+5
-0
src/openvz_conf.c
src/openvz_conf.c
+18
-18
src/openvz_driver.c
src/openvz_driver.c
+10
-10
未找到文件。
ChangeLog
浏览文件 @
a8936295
Fri Sep 5 15:59:26 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/openvz_conf.c, src/openvz_driver.c: Fix trailing
whitespace mistakes
Fri Sep 5 15:09:26 BST 2008 Daniel P. Berrange <berrange@redhat.com>
Fri Sep 5 15:09:26 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/openvz_conf.c, src/openvz_conf.h, src/openvz_driver.c,
* src/openvz_conf.c, src/openvz_conf.h, src/openvz_driver.c,
...
...
src/openvz_conf.c
浏览文件 @
a8936295
...
@@ -156,19 +156,19 @@ void
...
@@ -156,19 +156,19 @@ void
openvzFreeDriver
(
struct
openvz_driver
*
driver
)
openvzFreeDriver
(
struct
openvz_driver
*
driver
)
{
{
virDomainObjPtr
dom
;
virDomainObjPtr
dom
;
if
(
!
driver
)
if
(
!
driver
)
return
;
return
;
dom
=
driver
->
domains
;
dom
=
driver
->
domains
;
while
(
dom
)
{
while
(
dom
)
{
virDomainObjPtr
tmp
=
dom
->
next
;
virDomainObjPtr
tmp
=
dom
->
next
;
virDomainObjFree
(
dom
);
virDomainObjFree
(
dom
);
dom
=
tmp
;
dom
=
tmp
;
}
}
virCapabilitiesFree
(
driver
->
caps
);
virCapabilitiesFree
(
driver
->
caps
);
}
}
...
@@ -192,38 +192,38 @@ int openvzLoadDomains(struct openvz_driver *driver) {
...
@@ -192,38 +192,38 @@ int openvzLoadDomains(struct openvz_driver *driver) {
if
(
fscanf
(
fp
,
"%d %s
\n
"
,
&
veid
,
status
)
!=
2
)
{
if
(
fscanf
(
fp
,
"%d %s
\n
"
,
&
veid
,
status
)
!=
2
)
{
if
(
feof
(
fp
))
if
(
feof
(
fp
))
break
;
break
;
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Failed to parse vzlist output"
));
_
(
"Failed to parse vzlist output"
));
goto
cleanup
;
goto
cleanup
;
}
}
if
(
VIR_ALLOC
(
dom
)
<
0
||
if
(
VIR_ALLOC
(
dom
)
<
0
||
VIR_ALLOC
(
dom
->
def
)
<
0
)
VIR_ALLOC
(
dom
->
def
)
<
0
)
goto
no_memory
;
goto
no_memory
;
if
(
STREQ
(
status
,
"stopped"
))
if
(
STREQ
(
status
,
"stopped"
))
dom
->
state
=
VIR_DOMAIN_SHUTOFF
;
dom
->
state
=
VIR_DOMAIN_SHUTOFF
;
else
else
dom
->
state
=
VIR_DOMAIN_RUNNING
;
dom
->
state
=
VIR_DOMAIN_RUNNING
;
dom
->
pid
=
veid
;
dom
->
pid
=
veid
;
dom
->
def
->
id
=
dom
->
state
==
VIR_DOMAIN_SHUTOFF
?
-
1
:
veid
;
dom
->
def
->
id
=
dom
->
state
==
VIR_DOMAIN_SHUTOFF
?
-
1
:
veid
;
if
(
asprintf
(
&
dom
->
def
->
name
,
"%i"
,
veid
)
<
0
)
{
if
(
asprintf
(
&
dom
->
def
->
name
,
"%i"
,
veid
)
<
0
)
{
dom
->
def
->
name
=
NULL
;
dom
->
def
->
name
=
NULL
;
goto
no_memory
;
goto
no_memory
;
}
}
openvzGetVPSUUID
(
veid
,
uuidstr
);
openvzGetVPSUUID
(
veid
,
uuidstr
);
ret
=
virUUIDParse
(
uuidstr
,
dom
->
def
->
uuid
);
ret
=
virUUIDParse
(
uuidstr
,
dom
->
def
->
uuid
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"UUID in config file malformed"
));
_
(
"UUID in config file malformed"
));
goto
cleanup
;
goto
cleanup
;
}
}
if
(
!
(
dom
->
def
->
os
.
type
=
strdup
(
"exe"
)))
if
(
!
(
dom
->
def
->
os
.
type
=
strdup
(
"exe"
)))
goto
no_memory
;
goto
no_memory
;
if
(
!
(
dom
->
def
->
os
.
init
=
strdup
(
"/sbin/init"
)))
if
(
!
(
dom
->
def
->
os
.
init
=
strdup
(
"/sbin/init"
)))
...
@@ -232,7 +232,7 @@ int openvzLoadDomains(struct openvz_driver *driver) {
...
@@ -232,7 +232,7 @@ int openvzLoadDomains(struct openvz_driver *driver) {
ret
=
openvzReadConfigParam
(
veid
,
"CPUS"
,
temp
,
sizeof
(
temp
));
ret
=
openvzReadConfigParam
(
veid
,
"CPUS"
,
temp
,
sizeof
(
temp
));
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Cound not read config for container %d"
),
_
(
"Cound not read config for container %d"
),
veid
);
veid
);
goto
cleanup
;
goto
cleanup
;
}
else
if
(
ret
>
0
)
{
}
else
if
(
ret
>
0
)
{
...
@@ -242,7 +242,7 @@ int openvzLoadDomains(struct openvz_driver *driver) {
...
@@ -242,7 +242,7 @@ int openvzLoadDomains(struct openvz_driver *driver) {
}
}
/* XXX load rest of VM config data .... */
/* XXX load rest of VM config data .... */
if
(
prev
)
{
if
(
prev
)
{
prev
->
next
=
dom
;
prev
->
next
=
dom
;
}
else
{
}
else
{
...
@@ -250,14 +250,14 @@ int openvzLoadDomains(struct openvz_driver *driver) {
...
@@ -250,14 +250,14 @@ int openvzLoadDomains(struct openvz_driver *driver) {
}
}
prev
=
dom
;
prev
=
dom
;
}
}
fclose
(
fp
);
fclose
(
fp
);
return
0
;
return
0
;
no_memory:
no_memory:
openvzError
(
NULL
,
VIR_ERR_NO_MEMORY
,
NULL
);
openvzError
(
NULL
,
VIR_ERR_NO_MEMORY
,
NULL
);
cleanup:
cleanup:
fclose
(
fp
);
fclose
(
fp
);
virDomainObjFree
(
dom
);
virDomainObjFree
(
dom
);
...
...
src/openvz_driver.c
浏览文件 @
a8936295
...
@@ -116,14 +116,14 @@ static int openvzDomainDefineCmd(virConnectPtr conn,
...
@@ -116,14 +116,14 @@ static int openvzDomainDefineCmd(virConnectPtr conn,
ADD_ARG_LIT
(
"--quiet"
);
ADD_ARG_LIT
(
"--quiet"
);
ADD_ARG_LIT
(
"create"
);
ADD_ARG_LIT
(
"create"
);
ADD_ARG_LIT
(
vmdef
->
name
);
ADD_ARG_LIT
(
vmdef
->
name
);
if
(
vmdef
->
fss
)
{
if
(
vmdef
->
fss
)
{
if
(
vmdef
->
fss
->
type
!=
VIR_DOMAIN_FS_TYPE_TEMPLATE
)
{
if
(
vmdef
->
fss
->
type
!=
VIR_DOMAIN_FS_TYPE_TEMPLATE
)
{
openvzError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
openvzError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"only filesystem templates are supported"
));
"%s"
,
_
(
"only filesystem templates are supported"
));
return
-
1
;
return
-
1
;
}
}
if
(
vmdef
->
fss
->
next
)
{
if
(
vmdef
->
fss
->
next
)
{
openvzError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
openvzError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"only one filesystem supported"
));
"%s"
,
_
(
"only one filesystem supported"
));
...
@@ -223,7 +223,7 @@ static virDomainPtr openvzDomainLookupByName(virConnectPtr conn,
...
@@ -223,7 +223,7 @@ static virDomainPtr openvzDomainLookupByName(virConnectPtr conn,
dom
=
virGetDomain
(
conn
,
vm
->
def
->
name
,
vm
->
def
->
uuid
);
dom
=
virGetDomain
(
conn
,
vm
->
def
->
name
,
vm
->
def
->
uuid
);
if
(
!
dom
)
if
(
!
dom
)
return
NULL
;
return
NULL
;
dom
->
id
=
vm
->
def
->
id
;
dom
->
id
=
vm
->
def
->
id
;
return
dom
;
return
dom
;
}
}
...
@@ -240,7 +240,7 @@ static int openvzDomainGetInfo(virDomainPtr dom,
...
@@ -240,7 +240,7 @@ static int openvzDomainGetInfo(virDomainPtr dom,
}
}
info
->
state
=
vm
->
state
;
info
->
state
=
vm
->
state
;
if
(
!
virDomainIsActive
(
vm
))
{
if
(
!
virDomainIsActive
(
vm
))
{
info
->
cpuTime
=
0
;
info
->
cpuTime
=
0
;
}
else
{
}
else
{
...
@@ -261,13 +261,13 @@ static int openvzDomainGetInfo(virDomainPtr dom,
...
@@ -261,13 +261,13 @@ static int openvzDomainGetInfo(virDomainPtr dom,
static
char
*
openvzDomainDumpXML
(
virDomainPtr
dom
,
int
flags
)
{
static
char
*
openvzDomainDumpXML
(
virDomainPtr
dom
,
int
flags
)
{
struct
openvz_driver
*
driver
=
(
struct
openvz_driver
*
)
dom
->
conn
->
privateData
;
struct
openvz_driver
*
driver
=
(
struct
openvz_driver
*
)
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
=
virDomainFindByUUID
(
driver
->
domains
,
dom
->
uuid
);
virDomainObjPtr
vm
=
virDomainFindByUUID
(
driver
->
domains
,
dom
->
uuid
);
if
(
!
vm
)
{
if
(
!
vm
)
{
openvzError
(
dom
->
conn
,
VIR_ERR_INVALID_DOMAIN
,
openvzError
(
dom
->
conn
,
VIR_ERR_INVALID_DOMAIN
,
_
(
"no domain with matching uuid"
));
_
(
"no domain with matching uuid"
));
return
NULL
;
return
NULL
;
}
}
return
virDomainDefFormat
(
dom
->
conn
,
vm
->
def
,
flags
);
return
virDomainDefFormat
(
dom
->
conn
,
vm
->
def
,
flags
);
}
}
...
@@ -283,16 +283,16 @@ static int openvzDomainShutdown(virDomainPtr dom) {
...
@@ -283,16 +283,16 @@ static int openvzDomainShutdown(virDomainPtr dom) {
_
(
"no domain with matching uuid"
));
_
(
"no domain with matching uuid"
));
return
-
1
;
return
-
1
;
}
}
if
(
vm
->
state
!=
VIR_DOMAIN_RUNNING
)
{
if
(
vm
->
state
!=
VIR_DOMAIN_RUNNING
)
{
openvzError
(
dom
->
conn
,
VIR_ERR_INTERNAL_ERROR
,
openvzError
(
dom
->
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"domain is not in running state"
));
_
(
"domain is not in running state"
));
return
-
1
;
return
-
1
;
}
}
if
(
virRun
(
dom
->
conn
,
prog
,
NULL
)
<
0
)
if
(
virRun
(
dom
->
conn
,
prog
,
NULL
)
<
0
)
return
-
1
;
return
-
1
;
vm
->
def
->
id
=
-
1
;
vm
->
def
->
id
=
-
1
;
vm
->
state
=
VIR_DOMAIN_SHUTOFF
;
vm
->
state
=
VIR_DOMAIN_SHUTOFF
;
...
@@ -558,7 +558,7 @@ openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
...
@@ -558,7 +558,7 @@ openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
vm
->
pid
=
strtoI
(
vmdef
->
name
);
vm
->
pid
=
strtoI
(
vmdef
->
name
);
vm
->
def
->
id
=
vm
->
pid
;
vm
->
def
->
id
=
vm
->
pid
;
vm
->
state
=
VIR_DOMAIN_RUNNING
;
vm
->
state
=
VIR_DOMAIN_RUNNING
;
dom
=
virGetDomain
(
conn
,
vm
->
def
->
name
,
vm
->
def
->
uuid
);
dom
=
virGetDomain
(
conn
,
vm
->
def
->
name
,
vm
->
def
->
uuid
);
if
(
dom
)
if
(
dom
)
dom
->
id
=
vm
->
def
->
id
;
dom
->
id
=
vm
->
def
->
id
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录