External/libvirt
1
0
Fork 0
Code

qemu: migration: Extract flags for starting VM into a variable

Browse Source 
qemuMigrationPrepareAny called multiple of the functions starting the
qemu process for incoming migration by adding the flags explicitly.
Extract them to a variable so that they can be easily used for other
calls or changed in the future.
This commit is contained in:
Peter Krempa 2017-10-03 09:59:03 +02:00
parent fda4298515
commit b8c0262efa
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_migration.c
View File

@ -2511,6 +2511,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
bool tunnel = !!st; bool tunnel = !!st;
char *xmlout = NULL; char *xmlout = NULL;
unsigned int cookieFlags; unsigned int cookieFlags;
unsigned int startFlags;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
qemuProcessIncomingDefPtr incoming = NULL; qemuProcessIncomingDefPtr incoming = NULL;
bool taint_hook = false; bool taint_hook = false;
@ -2671,8 +2672,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
goto stopjob; goto stopjob;
} }
startFlags = VIR_QEMU_PROCESS_START_AUTODESTROY;
if (qemuProcessInit(driver, vm, mig->cpu, QEMU_ASYNC_JOB_MIGRATION_IN, if (qemuProcessInit(driver, vm, mig->cpu, QEMU_ASYNC_JOB_MIGRATION_IN,
true, VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) true, startFlags) < 0)
goto stopjob; goto stopjob;
stopProcess = true; stopProcess = true;
@ -2681,8 +2684,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
dataFD[0]))) dataFD[0])))
goto stopjob; goto stopjob;
if (qemuProcessPrepareDomain(dconn, driver, vm, if (qemuProcessPrepareDomain(dconn, driver, vm, startFlags) < 0)
VIR_QEMU_PROCESS_START_AUTODESTROY) < 0)
goto stopjob; goto stopjob;
if (qemuProcessPrepareHost(driver, vm, !!incoming) < 0) if (qemuProcessPrepareHost(driver, vm, !!incoming) < 0)
@ -2691,7 +2693,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
rv = qemuProcessLaunch(dconn, driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, rv = qemuProcessLaunch(dconn, driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN,
incoming, NULL, incoming, NULL,
VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START,
VIR_QEMU_PROCESS_START_AUTODESTROY); startFlags);
if (rv < 0) { if (rv < 0) {
if (rv == -2) if (rv == -2)
relabel = true; relabel = true;