Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
7371ca5c
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看板
提交
7371ca5c
编写于
6月 29, 2016
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Use proper async job to refresh virtio channels
Signed-off-by:
N
Jiri Denemark
<
jdenemar@redhat.com
>
上级
e893d3ca
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
5 deletion
+10
-5
src/qemu/qemu_migration.c
src/qemu/qemu_migration.c
+2
-1
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+6
-3
src/qemu/qemu_process.h
src/qemu/qemu_process.h
+2
-1
未找到文件。
src/qemu/qemu_migration.c
浏览文件 @
7371ca5c
...
@@ -6237,7 +6237,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
...
@@ -6237,7 +6237,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
if
(
qemuMigrationStopNBDServer
(
driver
,
vm
,
mig
)
<
0
)
if
(
qemuMigrationStopNBDServer
(
driver
,
vm
,
mig
)
<
0
)
goto
endjob
;
goto
endjob
;
if
(
qemuRefreshVirtioChannelState
(
driver
,
vm
)
<
0
)
if
(
qemuRefreshVirtioChannelState
(
driver
,
vm
,
QEMU_ASYNC_JOB_MIGRATION_IN
)
<
0
)
goto
endjob
;
goto
endjob
;
if
((
rc
=
qemuConnectAgent
(
driver
,
vm
))
<
0
)
{
if
((
rc
=
qemuConnectAgent
(
driver
,
vm
))
<
0
)
{
...
...
src/qemu/qemu_process.c
浏览文件 @
7371ca5c
...
@@ -1974,13 +1974,16 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver,
...
@@ -1974,13 +1974,16 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver,
int
int
qemuRefreshVirtioChannelState
(
virQEMUDriverPtr
driver
,
qemuRefreshVirtioChannelState
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
)
virDomainObjPtr
vm
,
qemuDomainAsyncJob
asyncJob
)
{
{
qemuDomainObjPrivatePtr
priv
=
vm
->
privateData
;
qemuDomainObjPrivatePtr
priv
=
vm
->
privateData
;
virHashTablePtr
info
=
NULL
;
virHashTablePtr
info
=
NULL
;
int
ret
=
-
1
;
int
ret
=
-
1
;
qemuDomainObjEnterMonitor
(
driver
,
vm
);
if
(
qemuDomainObjEnterMonitorAsync
(
driver
,
vm
,
asyncJob
)
<
0
)
goto
cleanup
;
ret
=
qemuMonitorGetChardevInfo
(
priv
->
mon
,
&
info
);
ret
=
qemuMonitorGetChardevInfo
(
priv
->
mon
,
&
info
);
if
(
qemuDomainObjExitMonitor
(
driver
,
vm
)
<
0
)
if
(
qemuDomainObjExitMonitor
(
driver
,
vm
)
<
0
)
ret
=
-
1
;
ret
=
-
1
;
...
@@ -3312,7 +3315,7 @@ qemuProcessReconnect(void *opaque)
...
@@ -3312,7 +3315,7 @@ qemuProcessReconnect(void *opaque)
if
(
qemuProcessRefreshDisks
(
driver
,
obj
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
if
(
qemuProcessRefreshDisks
(
driver
,
obj
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
goto
error
;
goto
error
;
if
(
qemuRefreshVirtioChannelState
(
driver
,
obj
)
<
0
)
if
(
qemuRefreshVirtioChannelState
(
driver
,
obj
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
goto
error
;
goto
error
;
/* If querying of guest's RTC failed, report error, but do not kill the domain. */
/* If querying of guest's RTC failed, report error, but do not kill the domain. */
...
...
src/qemu/qemu_process.h
浏览文件 @
7371ca5c
...
@@ -180,7 +180,8 @@ int qemuProcessSetupIOThread(virDomainObjPtr vm,
...
@@ -180,7 +180,8 @@ int qemuProcessSetupIOThread(virDomainObjPtr vm,
virDomainIOThreadIDDefPtr
iothread
);
virDomainIOThreadIDDefPtr
iothread
);
int
qemuRefreshVirtioChannelState
(
virQEMUDriverPtr
driver
,
int
qemuRefreshVirtioChannelState
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
);
virDomainObjPtr
vm
,
qemuDomainAsyncJob
asyncJob
);
int
qemuProcessRefreshBalloonState
(
virQEMUDriverPtr
driver
,
int
qemuProcessRefreshBalloonState
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virDomainObjPtr
vm
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录