Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
39babffb
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,体验更适合开发者的 AI 搜索 >>
提交
39babffb
编写于
7月 20, 2011
作者:
O
Osier Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
undefine: Implement undefineFlags for all other drivers
上级
67d33735
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
71 addition
and
7 deletion
+71
-7
src/esx/esx_driver.c
src/esx/esx_driver.c
+10
-1
src/lxc/lxc_driver.c
src/lxc/lxc_driver.c
+10
-1
src/openvz/openvz_driver.c
src/openvz/openvz_driver.c
+10
-1
src/test/test_driver.c
src/test/test_driver.c
+11
-1
src/uml/uml_driver.c
src/uml/uml_driver.c
+11
-1
src/vmware/vmware_driver.c
src/vmware/vmware_driver.c
+11
-1
src/xen/xen_driver.c
src/xen/xen_driver.c
+8
-1
未找到文件。
src/esx/esx_driver.c
浏览文件 @
39babffb
...
...
@@ -3290,7 +3290,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml)
static
int
esxDomainUndefine
(
virDomainPtr
domain
)
esxDomainUndefineFlags
(
virDomainPtr
domain
,
unsigned
int
flags
)
{
int
result
=
-
1
;
esxPrivate
*
priv
=
domain
->
conn
->
privateData
;
...
...
@@ -3299,6 +3300,8 @@ esxDomainUndefine(virDomainPtr domain)
esxVI_String
*
propertyNameList
=
NULL
;
esxVI_VirtualMachinePowerState
powerState
;
virCheckFlags
(
0
,
-
1
);
if
(
priv
->
vCenter
!=
NULL
)
{
ctx
=
priv
->
vCenter
;
}
else
{
...
...
@@ -3339,6 +3342,11 @@ esxDomainUndefine(virDomainPtr domain)
}
static
int
esxDomainUndefine
(
virDomainPtr
domain
)
{
return
esxDomainUndefineFlags
(
domain
,
0
);
}
static
int
esxDomainGetAutostart
(
virDomainPtr
domain
,
int
*
autostart
)
...
...
@@ -4747,6 +4755,7 @@ static virDriver esxDriver = {
.
domainCreateWithFlags
=
esxDomainCreateWithFlags
,
/* 0.8.2 */
.
domainDefineXML
=
esxDomainDefineXML
,
/* 0.7.2 */
.
domainUndefine
=
esxDomainUndefine
,
/* 0.7.1 */
.
domainUndefineFlags
=
esxDomainUndefineFlags
,
/* 0.9.4 */
.
domainGetAutostart
=
esxDomainGetAutostart
,
/* 0.9.0 */
.
domainSetAutostart
=
esxDomainSetAutostart
,
/* 0.9.0 */
.
domainGetSchedulerType
=
esxDomainGetSchedulerType
,
/* 0.7.0 */
...
...
src/lxc/lxc_driver.c
浏览文件 @
39babffb
...
...
@@ -458,13 +458,16 @@ cleanup:
return
dom
;
}
static
int
lxcDomainUndefine
(
virDomainPtr
dom
)
static
int
lxcDomainUndefineFlags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
lxc_driver_t
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
virDomainEventPtr
event
=
NULL
;
int
ret
=
-
1
;
virCheckFlags
(
0
,
-
1
);
lxcDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
if
(
!
vm
)
{
...
...
@@ -509,6 +512,11 @@ cleanup:
return
ret
;
}
static
int
lxcDomainUndefine
(
virDomainPtr
dom
)
{
return
lxcDomainUndefineFlags
(
dom
,
0
);
}
static
int
lxcDomainGetInfo
(
virDomainPtr
dom
,
virDomainInfoPtr
info
)
{
...
...
@@ -2935,6 +2943,7 @@ static virDriver lxcDriver = {
.
domainCreateWithFlags
=
lxcDomainStartWithFlags
,
/* 0.8.2 */
.
domainDefineXML
=
lxcDomainDefine
,
/* 0.4.2 */
.
domainUndefine
=
lxcDomainUndefine
,
/* 0.4.2 */
.
domainUndefineFlags
=
lxcDomainUndefineFlags
,
/* 0.9.4 */
.
domainGetAutostart
=
lxcDomainGetAutostart
,
/* 0.7.0 */
.
domainSetAutostart
=
lxcDomainSetAutostart
,
/* 0.7.0 */
.
domainGetSchedulerType
=
lxcGetSchedulerType
,
/* 0.5.0 */
...
...
src/openvz/openvz_driver.c
浏览文件 @
39babffb
...
...
@@ -1085,13 +1085,16 @@ openvzDomainCreate(virDomainPtr dom)
}
static
int
openvzDomainUndefine
(
virDomainPtr
dom
)
openvzDomainUndefineFlags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
struct
openvz_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
const
char
*
prog
[]
=
{
VZCTL
,
"--quiet"
,
"destroy"
,
PROGRAM_SENTINAL
,
NULL
};
int
ret
=
-
1
;
virCheckFlags
(
0
,
-
1
);
openvzDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
if
(
!
vm
)
{
...
...
@@ -1122,6 +1125,11 @@ cleanup:
return
ret
;
}
static
int
openvzDomainUndefine
(
virDomainPtr
dom
)
{
return
openvzDomainUndefineFlags
(
dom
,
0
);
}
static
int
openvzDomainSetAutostart
(
virDomainPtr
dom
,
int
autostart
)
{
...
...
@@ -1627,6 +1635,7 @@ static virDriver openvzDriver = {
.
domainCreateWithFlags
=
openvzDomainCreateWithFlags
,
/* 0.8.2 */
.
domainDefineXML
=
openvzDomainDefineXML
,
/* 0.3.3 */
.
domainUndefine
=
openvzDomainUndefine
,
/* 0.3.3 */
.
domainUndefineFlags
=
openvzDomainUndefineFlags
,
/* 0.9.4 */
.
domainGetAutostart
=
openvzDomainGetAutostart
,
/* 0.4.6 */
.
domainSetAutostart
=
openvzDomainSetAutostart
,
/* 0.4.6 */
.
isEncrypted
=
openvzIsEncrypted
,
/* 0.7.3 */
...
...
src/test/test_driver.c
浏览文件 @
39babffb
...
...
@@ -2535,12 +2535,16 @@ static int testDomainCreate(virDomainPtr domain) {
return
testDomainCreateWithFlags
(
domain
,
0
);
}
static
int
testDomainUndefine
(
virDomainPtr
domain
)
{
static
int
testDomainUndefineFlags
(
virDomainPtr
domain
,
unsigned
int
flags
)
{
testConnPtr
privconn
=
domain
->
conn
->
privateData
;
virDomainObjPtr
privdom
;
virDomainEventPtr
event
=
NULL
;
int
ret
=
-
1
;
virCheckFlags
(
0
,
-
1
);
testDriverLock
(
privconn
);
privdom
=
virDomainFindByName
(
&
privconn
->
domains
,
domain
->
name
);
...
...
@@ -2573,6 +2577,11 @@ cleanup:
return
ret
;
}
static
int
testDomainUndefine
(
virDomainPtr
domain
)
{
return
testDomainUndefineFlags
(
domain
,
0
);
}
static
int
testDomainGetAutostart
(
virDomainPtr
domain
,
int
*
autostart
)
{
...
...
@@ -5556,6 +5565,7 @@ static virDriver testDriver = {
.
domainCreateWithFlags
=
testDomainCreateWithFlags
,
/* 0.8.2 */
.
domainDefineXML
=
testDomainDefineXML
,
/* 0.1.11 */
.
domainUndefine
=
testDomainUndefine
,
/* 0.1.11 */
.
domainUndefineFlags
=
testDomainUndefineFlags
,
/* 0.9.4 */
.
domainGetAutostart
=
testDomainGetAutostart
,
/* 0.3.2 */
.
domainSetAutostart
=
testDomainSetAutostart
,
/* 0.3.2 */
.
domainGetSchedulerType
=
testDomainGetSchedulerType
,
/* 0.3.2 */
...
...
src/uml/uml_driver.c
浏览文件 @
39babffb
...
...
@@ -1778,11 +1778,15 @@ cleanup:
return
dom
;
}
static
int
umlDomainUndefine
(
virDomainPtr
dom
)
{
static
int
umlDomainUndefineFlags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
struct
uml_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
int
ret
=
-
1
;
virCheckFlags
(
0
,
-
1
);
umlDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
if
(
!
vm
)
{
...
...
@@ -1819,6 +1823,11 @@ cleanup:
}
static
int
umlDomainUndefine
(
virDomainPtr
dom
)
{
return
umlDomainUndefineFlags
(
dom
,
0
);
}
static
int
umlDomainAttachUmlDisk
(
struct
uml_driver
*
driver
,
virDomainObjPtr
vm
,
virDomainDiskDefPtr
disk
)
...
...
@@ -2427,6 +2436,7 @@ static virDriver umlDriver = {
.
domainCreateWithFlags
=
umlDomainStartWithFlags
,
/* 0.8.2 */
.
domainDefineXML
=
umlDomainDefine
,
/* 0.5.0 */
.
domainUndefine
=
umlDomainUndefine
,
/* 0.5.0 */
.
domainUndefineFlags
=
umlDomainUndefineFlags
,
/* 0.9.4 */
.
domainAttachDevice
=
umlDomainAttachDevice
,
/* 0.8.4 */
.
domainAttachDeviceFlags
=
umlDomainAttachDeviceFlags
,
/* 0.8.4 */
.
domainDetachDevice
=
umlDomainDetachDevice
,
/* 0.8.4 */
...
...
src/vmware/vmware_driver.c
浏览文件 @
39babffb
...
...
@@ -609,12 +609,15 @@ vmwareDomainCreate(virDomainPtr dom)
}
static
int
vmwareDomainUndefine
(
virDomainPtr
dom
)
vmwareDomainUndefineFlags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
struct
vmware_driver
*
driver
=
dom
->
conn
->
privateData
;
virDomainObjPtr
vm
;
int
ret
=
-
1
;
virCheckFlags
(
0
,
-
1
);
vmwareDriverLock
(
driver
);
vm
=
virDomainFindByUUID
(
&
driver
->
domains
,
dom
->
uuid
);
...
...
@@ -650,6 +653,12 @@ vmwareDomainUndefine(virDomainPtr dom)
return
ret
;
}
static
int
vmwareDomainUndefine
(
virDomainPtr
dom
)
{
return
vmwareDomainUndefineFlags
(
dom
,
0
);
}
static
virDomainPtr
vmwareDomainLookupByID
(
virConnectPtr
conn
,
int
id
)
{
...
...
@@ -969,6 +978,7 @@ static virDriver vmwareDriver = {
.
domainCreateWithFlags
=
vmwareDomainCreateWithFlags
,
/* 0.8.7 */
.
domainDefineXML
=
vmwareDomainDefineXML
,
/* 0.8.7 */
.
domainUndefine
=
vmwareDomainUndefine
,
/* 0.8.7 */
.
domainUndefineFlags
=
vmwareDomainUndefineFlags
,
/* 0.9.4 */
.
domainIsActive
=
vmwareDomainIsActive
,
/* 0.8.7 */
.
domainIsPersistent
=
vmwareDomainIsPersistent
,
/* 0.8.7 */
};
...
...
src/xen/xen_driver.c
浏览文件 @
39babffb
...
...
@@ -1527,11 +1527,12 @@ xenUnifiedDomainDefineXML (virConnectPtr conn, const char *xml)
}
static
int
xenUnifiedDomainUndefine
(
virDomainPtr
dom
)
xenUnifiedDomainUndefine
Flags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
GET_PRIVATE
(
dom
->
conn
);
int
i
;
virCheckFlags
(
0
,
-
1
);
for
(
i
=
0
;
i
<
XEN_UNIFIED_NR_DRIVERS
;
++
i
)
if
(
priv
->
opened
[
i
]
&&
drivers
[
i
]
->
domainUndefine
&&
drivers
[
i
]
->
domainUndefine
(
dom
)
==
0
)
...
...
@@ -1540,6 +1541,11 @@ xenUnifiedDomainUndefine (virDomainPtr dom)
return
-
1
;
}
static
int
xenUnifiedDomainUndefine
(
virDomainPtr
dom
)
{
return
xenUnifiedDomainUndefineFlags
(
dom
,
0
);
}
static
int
xenUnifiedDomainAttachDevice
(
virDomainPtr
dom
,
const
char
*
xml
)
{
...
...
@@ -2223,6 +2229,7 @@ static virDriver xenUnifiedDriver = {
.
domainCreateWithFlags
=
xenUnifiedDomainCreateWithFlags
,
/* 0.8.2 */
.
domainDefineXML
=
xenUnifiedDomainDefineXML
,
/* 0.1.1 */
.
domainUndefine
=
xenUnifiedDomainUndefine
,
/* 0.1.1 */
.
domainUndefineFlags
=
xenUnifiedDomainUndefineFlags
,
/* 0.9.4 */
.
domainAttachDevice
=
xenUnifiedDomainAttachDevice
,
/* 0.1.9 */
.
domainAttachDeviceFlags
=
xenUnifiedDomainAttachDeviceFlags
,
/* 0.7.7 */
.
domainDetachDevice
=
xenUnifiedDomainDetachDevice
,
/* 0.1.9 */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录