Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
1004d632
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看板
提交
1004d632
编写于
6月 25, 2013
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Move internals of Confirm phase to qemu_migration.c
上级
ecd81131
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
144 addition
and
129 deletion
+144
-129
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+5
-38
src/qemu/qemu_migration.c
src/qemu/qemu_migration.c
+137
-88
src/qemu/qemu_migration.h
src/qemu/qemu_migration.h
+2
-3
未找到文件。
src/qemu/qemu_driver.c
浏览文件 @
1004d632
...
...
@@ -10338,53 +10338,20 @@ qemuDomainMigrateConfirm3(virDomainPtr domain,
unsigned
long
flags
,
int
cancelled
)
{
virQEMUDriverPtr
driver
=
domain
->
conn
->
privateData
;
virDomainObjPtr
vm
;
int
ret
=
-
1
;
enum
qemuMigrationJobPhase
phase
;
virQEMUDriverConfigPtr
cfg
=
NULL
;
virCheckFlags
(
QEMU_MIGRATION_FLAGS
,
-
1
);
if
(
!
(
vm
=
qemuDomObjFromDomain
(
domain
)))
return
-
1
;
cfg
=
virQEMUDriverGetConfig
(
driver
);
if
(
virDomainMigrateConfirm3EnsureACL
(
domain
->
conn
,
vm
->
def
)
<
0
)
goto
cleanup
;
if
(
!
qemuMigrationJobIsActive
(
vm
,
QEMU_ASYNC_JOB_MIGRATION_OUT
))
goto
cleanup
;
if
(
cancelled
)
phase
=
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
;
else
phase
=
QEMU_MIGRATION_PHASE_CONFIRM3
;
qemuMigrationJobStartPhase
(
driver
,
vm
,
phase
);
virQEMUCloseCallbacksUnset
(
driver
->
closeCallbacks
,
vm
,
qemuMigrationCleanup
);
ret
=
qemuMigrationConfirm
(
driver
,
domain
->
conn
,
vm
,
cookiein
,
cookieinlen
,
flags
,
cancelled
);
if
(
qemuMigrationJobFinish
(
driver
,
vm
)
==
0
)
{
vm
=
NULL
;
}
else
if
(
!
virDomainObjIsActive
(
vm
)
&&
(
!
vm
->
persistent
||
(
flags
&
VIR_MIGRATE_UNDEFINE_SOURCE
)))
{
if
(
flags
&
VIR_MIGRATE_UNDEFINE_SOURCE
)
virDomainDeleteConfig
(
cfg
->
configDir
,
cfg
->
autostartDir
,
vm
);
qemuDomainRemoveInactive
(
driver
,
vm
);
vm
=
NULL
;
if
(
virDomainMigrateConfirm3EnsureACL
(
domain
->
conn
,
vm
->
def
)
<
0
)
{
virObjectUnlock
(
vm
);
return
-
1
;
}
cleanup:
if
(
vm
)
virObjectUnlock
(
vm
);
virObjectUnref
(
cfg
);
return
ret
;
return
qemuMigrationConfirm
(
domain
->
conn
,
vm
,
cookiein
,
cookieinlen
,
flags
,
cancelled
);
}
...
...
src/qemu/qemu_migration.c
浏览文件 @
1004d632
...
...
@@ -2624,6 +2624,140 @@ cleanup:
}
static
int
qemuMigrationConfirmPhase
(
virQEMUDriverPtr
driver
,
virConnectPtr
conn
,
virDomainObjPtr
vm
,
const
char
*
cookiein
,
int
cookieinlen
,
unsigned
int
flags
,
int
retcode
)
{
qemuMigrationCookiePtr
mig
;
virDomainEventPtr
event
=
NULL
;
int
rv
=
-
1
;
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
VIR_DEBUG
(
"driver=%p, conn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
"flags=%x, retcode=%d"
,
driver
,
conn
,
vm
,
NULLSTR
(
cookiein
),
cookieinlen
,
flags
,
retcode
);
virCheckFlags
(
QEMU_MIGRATION_FLAGS
,
-
1
);
qemuMigrationJobSetPhase
(
driver
,
vm
,
retcode
==
0
?
QEMU_MIGRATION_PHASE_CONFIRM3
:
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
);
if
(
!
(
mig
=
qemuMigrationEatCookie
(
driver
,
vm
,
cookiein
,
cookieinlen
,
0
)))
goto
cleanup
;
if
(
flags
&
VIR_MIGRATE_OFFLINE
)
goto
done
;
/* Did the migration go as planned? If yes, kill off the
* domain object, but if no, resume CPUs
*/
if
(
retcode
==
0
)
{
/* If guest uses SPICE and supports seamless migration we have to hold
* up domain shutdown until SPICE server transfers its data */
qemuMigrationWaitForSpice
(
driver
,
vm
);
qemuProcessStop
(
driver
,
vm
,
VIR_DOMAIN_SHUTOFF_MIGRATED
,
VIR_QEMU_PROCESS_STOP_MIGRATED
);
virDomainAuditStop
(
vm
,
"migrated"
);
event
=
virDomainEventNewFromObj
(
vm
,
VIR_DOMAIN_EVENT_STOPPED
,
VIR_DOMAIN_EVENT_STOPPED_MIGRATED
);
}
else
{
/* cancel any outstanding NBD jobs */
qemuMigrationCancelDriveMirror
(
mig
,
driver
,
vm
);
/* run 'cont' on the destination, which allows migration on qemu
* >= 0.10.6 to work properly. This isn't strictly necessary on
* older qemu's, but it also doesn't hurt anything there
*/
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_MIGRATED
,
QEMU_ASYNC_JOB_MIGRATION_OUT
)
<
0
)
{
if
(
virGetLastError
()
==
NULL
)
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"resume operation failed"
));
goto
cleanup
;
}
event
=
virDomainEventNewFromObj
(
vm
,
VIR_DOMAIN_EVENT_RESUMED
,
VIR_DOMAIN_EVENT_RESUMED_MIGRATED
);
if
(
virDomainSaveStatus
(
driver
->
xmlopt
,
cfg
->
stateDir
,
vm
)
<
0
)
{
VIR_WARN
(
"Failed to save status on vm %s"
,
vm
->
def
->
name
);
goto
cleanup
;
}
}
done:
qemuMigrationCookieFree
(
mig
);
rv
=
0
;
cleanup:
if
(
event
)
qemuDomainEventQueue
(
driver
,
event
);
virObjectUnref
(
cfg
);
return
rv
;
}
int
qemuMigrationConfirm
(
virConnectPtr
conn
,
virDomainObjPtr
vm
,
const
char
*
cookiein
,
int
cookieinlen
,
unsigned
int
flags
,
int
cancelled
)
{
virQEMUDriverPtr
driver
=
conn
->
privateData
;
enum
qemuMigrationJobPhase
phase
;
virQEMUDriverConfigPtr
cfg
=
NULL
;
int
ret
=
-
1
;
cfg
=
virQEMUDriverGetConfig
(
driver
);
if
(
!
qemuMigrationJobIsActive
(
vm
,
QEMU_ASYNC_JOB_MIGRATION_OUT
))
goto
cleanup
;
if
(
cancelled
)
phase
=
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
;
else
phase
=
QEMU_MIGRATION_PHASE_CONFIRM3
;
qemuMigrationJobStartPhase
(
driver
,
vm
,
phase
);
virQEMUCloseCallbacksUnset
(
driver
->
closeCallbacks
,
vm
,
qemuMigrationCleanup
);
ret
=
qemuMigrationConfirmPhase
(
driver
,
conn
,
vm
,
cookiein
,
cookieinlen
,
flags
,
cancelled
);
if
(
qemuMigrationJobFinish
(
driver
,
vm
)
==
0
)
{
vm
=
NULL
;
}
else
if
(
!
virDomainObjIsActive
(
vm
)
&&
(
!
vm
->
persistent
||
(
flags
&
VIR_MIGRATE_UNDEFINE_SOURCE
)))
{
if
(
flags
&
VIR_MIGRATE_UNDEFINE_SOURCE
)
virDomainDeleteConfig
(
cfg
->
configDir
,
cfg
->
autostartDir
,
vm
);
qemuDomainRemoveInactive
(
driver
,
vm
);
vm
=
NULL
;
}
cleanup:
if
(
vm
)
virObjectUnlock
(
vm
);
virObjectUnref
(
cfg
);
return
ret
;
}
enum
qemuMigrationDestinationType
{
MIGRATION_DEST_HOST
,
MIGRATION_DEST_CONNECT_HOST
,
...
...
@@ -3597,9 +3731,9 @@ finish:
cookieinlen
=
cookieoutlen
;
cookieout
=
NULL
;
cookieoutlen
=
0
;
ret
=
qemuMigrationConfirm
(
driver
,
sconn
,
vm
,
cookiein
,
cookieinlen
,
flags
,
cancelled
);
ret
=
qemuMigrationConfirm
Phase
(
driver
,
sconn
,
vm
,
cookiein
,
cookieinlen
,
flags
,
cancelled
);
/* If Confirm3 returns -1, there's nothing more we can
* do, but fortunately worst case is that there is a
* domain left in 'paused' state on source.
...
...
@@ -4267,91 +4401,6 @@ cleanup:
}
int
qemuMigrationConfirm
(
virQEMUDriverPtr
driver
,
virConnectPtr
conn
,
virDomainObjPtr
vm
,
const
char
*
cookiein
,
int
cookieinlen
,
unsigned
int
flags
,
int
retcode
)
{
qemuMigrationCookiePtr
mig
;
virDomainEventPtr
event
=
NULL
;
int
rv
=
-
1
;
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
VIR_DEBUG
(
"driver=%p, conn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
"flags=%x, retcode=%d"
,
driver
,
conn
,
vm
,
NULLSTR
(
cookiein
),
cookieinlen
,
flags
,
retcode
);
virCheckFlags
(
QEMU_MIGRATION_FLAGS
,
-
1
);
qemuMigrationJobSetPhase
(
driver
,
vm
,
retcode
==
0
?
QEMU_MIGRATION_PHASE_CONFIRM3
:
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
);
if
(
!
(
mig
=
qemuMigrationEatCookie
(
driver
,
vm
,
cookiein
,
cookieinlen
,
0
)))
goto
cleanup
;
if
(
flags
&
VIR_MIGRATE_OFFLINE
)
goto
done
;
/* Did the migration go as planned? If yes, kill off the
* domain object, but if no, resume CPUs
*/
if
(
retcode
==
0
)
{
/* If guest uses SPICE and supports seamless migration we have to hold
* up domain shutdown until SPICE server transfers its data */
qemuMigrationWaitForSpice
(
driver
,
vm
);
qemuProcessStop
(
driver
,
vm
,
VIR_DOMAIN_SHUTOFF_MIGRATED
,
VIR_QEMU_PROCESS_STOP_MIGRATED
);
virDomainAuditStop
(
vm
,
"migrated"
);
event
=
virDomainEventNewFromObj
(
vm
,
VIR_DOMAIN_EVENT_STOPPED
,
VIR_DOMAIN_EVENT_STOPPED_MIGRATED
);
}
else
{
/* cancel any outstanding NBD jobs */
qemuMigrationCancelDriveMirror
(
mig
,
driver
,
vm
);
/* run 'cont' on the destination, which allows migration on qemu
* >= 0.10.6 to work properly. This isn't strictly necessary on
* older qemu's, but it also doesn't hurt anything there
*/
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_MIGRATED
,
QEMU_ASYNC_JOB_MIGRATION_OUT
)
<
0
)
{
if
(
virGetLastError
()
==
NULL
)
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"resume operation failed"
));
goto
cleanup
;
}
event
=
virDomainEventNewFromObj
(
vm
,
VIR_DOMAIN_EVENT_RESUMED
,
VIR_DOMAIN_EVENT_RESUMED_MIGRATED
);
if
(
virDomainSaveStatus
(
driver
->
xmlopt
,
cfg
->
stateDir
,
vm
)
<
0
)
{
VIR_WARN
(
"Failed to save status on vm %s"
,
vm
->
def
->
name
);
goto
cleanup
;
}
}
done:
qemuMigrationCookieFree
(
mig
);
rv
=
0
;
cleanup:
if
(
event
)
qemuDomainEventQueue
(
driver
,
event
);
virObjectUnref
(
cfg
);
return
rv
;
}
/* Helper function called while vm is active. */
int
qemuMigrationToFile
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
...
...
src/qemu/qemu_migration.h
浏览文件 @
1004d632
...
...
@@ -143,13 +143,12 @@ virDomainPtr qemuMigrationFinish(virQEMUDriverPtr driver,
int
retcode
,
bool
v3proto
);
int
qemuMigrationConfirm
(
virQEMUDriverPtr
driver
,
virConnectPtr
conn
,
int
qemuMigrationConfirm
(
virConnectPtr
conn
,
virDomainObjPtr
vm
,
const
char
*
cookiein
,
int
cookieinlen
,
unsigned
int
flags
,
int
retcode
);
int
cancelled
);
bool
qemuMigrationIsAllowed
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virDomainDefPtr
def
,
bool
remote
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录