Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
25d807d4
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,发现更多精彩内容 >>
提交
25d807d4
编写于
8月 11, 2014
作者:
T
Taowei
提交者:
Michal Privoznik
8月 15, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: Rewrite vboxDomainDestroyFlags
上级
14babb49
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
65 addition
and
62 deletion
+65
-62
src/vbox/vbox_common.c
src/vbox/vbox_common.c
+45
-0
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+18
-62
src/vbox/vbox_uniformed_api.h
src/vbox/vbox_uniformed_api.h
+2
-0
未找到文件。
src/vbox/vbox_common.c
浏览文件 @
25d807d4
...
...
@@ -2553,3 +2553,48 @@ int vboxDomainReboot(virDomainPtr dom, unsigned int flags)
vboxIIDUnalloc
(
&
iid
);
return
ret
;
}
int
vboxDomainDestroyFlags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
VBOX_OBJECT_CHECK
(
dom
->
conn
,
int
,
-
1
);
IMachine
*
machine
=
NULL
;
vboxIIDUnion
iid
;
IConsole
*
console
=
NULL
;
PRUint32
state
;
PRBool
isAccessible
=
PR_FALSE
;
virCheckFlags
(
0
,
-
1
);
if
(
openSessionForMachine
(
data
,
dom
->
uuid
,
&
iid
,
&
machine
,
false
)
<
0
)
goto
cleanup
;
if
(
!
machine
)
goto
cleanup
;
gVBoxAPI
.
UIMachine
.
GetAccessible
(
machine
,
&
isAccessible
);
if
(
!
isAccessible
)
goto
cleanup
;
gVBoxAPI
.
UIMachine
.
GetState
(
machine
,
&
state
);
if
(
gVBoxAPI
.
machineStateChecker
.
PoweredOff
(
state
))
{
virReportError
(
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"machine already powered down"
));
goto
cleanup
;
}
gVBoxAPI
.
UISession
.
OpenExisting
(
data
,
&
iid
,
machine
);
gVBoxAPI
.
UISession
.
GetConsole
(
data
->
vboxSession
,
&
console
);
if
(
console
)
{
gVBoxAPI
.
UIConsole
.
PowerDown
(
console
);
VBOX_RELEASE
(
console
);
dom
->
id
=
-
1
;
ret
=
0
;
}
gVBoxAPI
.
UISession
.
Close
(
data
->
vboxSession
);
cleanup:
VBOX_RELEASE
(
machine
);
vboxIIDUnalloc
(
&
iid
);
return
ret
;
}
src/vbox/vbox_tmpl.c
浏览文件 @
25d807d4
...
...
@@ -933,68 +933,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
return
result
;
}
static
int
vboxDomainDestroyFlags
(
virDomainPtr
dom
,
unsigned
int
flags
)
{
VBOX_OBJECT_CHECK
(
dom
->
conn
,
int
,
-
1
);
IMachine
*
machine
=
NULL
;
vboxIID
iid
=
VBOX_IID_INITIALIZER
;
IConsole
*
console
=
NULL
;
PRUint32
state
=
MachineState_Null
;
PRBool
isAccessible
=
PR_FALSE
;
nsresult
rc
;
virCheckFlags
(
0
,
-
1
);
vboxIIDFromUUID
(
&
iid
,
dom
->
uuid
);
rc
=
VBOX_OBJECT_GET_MACHINE
(
iid
.
value
,
&
machine
);
if
(
NS_FAILED
(
rc
))
{
virReportError
(
VIR_ERR_NO_DOMAIN
,
_
(
"no domain with matching id %d"
),
dom
->
id
);
goto
cleanup
;
}
if
(
!
machine
)
goto
cleanup
;
machine
->
vtbl
->
GetAccessible
(
machine
,
&
isAccessible
);
if
(
isAccessible
)
{
machine
->
vtbl
->
GetState
(
machine
,
&
state
);
if
(
state
==
MachineState_PoweredOff
)
{
virReportError
(
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"machine already powered down"
));
goto
cleanup
;
}
VBOX_SESSION_OPEN_EXISTING
(
iid
.
value
,
machine
);
data
->
vboxSession
->
vtbl
->
GetConsole
(
data
->
vboxSession
,
&
console
);
if
(
console
)
{
#if VBOX_API_VERSION == 2002000
console
->
vtbl
->
PowerDown
(
console
);
#else
IProgress
*
progress
=
NULL
;
console
->
vtbl
->
PowerDown
(
console
,
&
progress
);
if
(
progress
)
{
progress
->
vtbl
->
WaitForCompletion
(
progress
,
-
1
);
VBOX_RELEASE
(
progress
);
}
#endif
VBOX_RELEASE
(
console
);
dom
->
id
=
-
1
;
ret
=
0
;
}
VBOX_SESSION_CLOSE
();
}
cleanup:
VBOX_RELEASE
(
machine
);
vboxIIDUnalloc
(
&
iid
);
return
ret
;
}
static
int
vboxDomainDestroy
(
virDomainPtr
dom
)
{
...
...
@@ -9849,6 +9787,23 @@ _consolePowerButton(IConsole *console)
return
console
->
vtbl
->
PowerButton
(
console
);
}
static
nsresult
_consolePowerDown
(
IConsole
*
console
)
{
nsresult
rc
;
#if VBOX_API_VERSION == 2002000
rc
=
console
->
vtbl
->
PowerDown
(
console
);
#else
IProgress
*
progress
=
NULL
;
rc
=
console
->
vtbl
->
PowerDown
(
console
,
&
progress
);
if
(
progress
)
{
rc
=
progress
->
vtbl
->
WaitForCompletion
(
progress
,
-
1
);
VBOX_RELEASE
(
progress
);
}
#endif
return
rc
;
}
static
nsresult
_consoleReset
(
IConsole
*
console
)
{
...
...
@@ -10381,6 +10336,7 @@ static vboxUniformedIConsole _UIConsole = {
.
Pause
=
_consolePause
,
.
Resume
=
_consoleResume
,
.
PowerButton
=
_consolePowerButton
,
.
PowerDown
=
_consolePowerDown
,
.
Reset
=
_consoleReset
,
};
...
...
src/vbox/vbox_uniformed_api.h
浏览文件 @
25d807d4
...
...
@@ -240,6 +240,7 @@ typedef struct {
nsresult
(
*
Pause
)(
IConsole
*
console
);
nsresult
(
*
Resume
)(
IConsole
*
console
);
nsresult
(
*
PowerButton
)(
IConsole
*
console
);
nsresult
(
*
PowerDown
)(
IConsole
*
console
);
nsresult
(
*
Reset
)(
IConsole
*
console
);
}
vboxUniformedIConsole
;
...
...
@@ -426,6 +427,7 @@ int vboxDomainResume(virDomainPtr dom);
int
vboxDomainShutdownFlags
(
virDomainPtr
dom
,
unsigned
int
flags
);
int
vboxDomainShutdown
(
virDomainPtr
dom
);
int
vboxDomainReboot
(
virDomainPtr
dom
,
unsigned
int
flags
);
int
vboxDomainDestroyFlags
(
virDomainPtr
dom
,
unsigned
int
flags
);
/* Version specified functions for installing uniformed API */
void
vbox22InstallUniformedAPI
(
vboxUniformedAPI
*
pVBoxAPI
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录