4:48 p.m.
qemuProcessStartWithMemoryState() is the only caller of qemuProcessStart()
that uses the qemuProcessIncomingDef struct. Move creation of the struct
to qemuProcessStartWithMemoryState().
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
---
src/qemu/qemu_process.c | 42 ++++++++++++++++++++---------------------
src/qemu/qemu_process.h | 2 +-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 7b7b5c17e3..cf99e4461d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8347,7 +8347,7 @@ qemuProcessStart(virConnectPtr conn,
virDomainObj *vm,
virCPUDef *updatedCPU,
virDomainAsyncJob asyncJob,
- const char *migrateFrom,
+ qemuProcessIncomingDef *incoming,
int migrateFd,
const char *migratePath,
virDomainMomentObj *snapshot,
@@ -8355,7 +8355,6 @@ qemuProcessStart(virConnectPtr conn,
unsigned int flags)
{
qemuDomainObjPrivate *priv = vm->privateData;
- qemuProcessIncomingDef *incoming = NULL;
unsigned int stopFlags;
bool relabel = false;
bool relabelSavedState = false;
@@ -8363,11 +8362,11 @@ qemuProcessStart(virConnectPtr conn,
int rv;
VIR_DEBUG("conn=%p driver=%p vm=%p name=%s id=%d asyncJob=%s "
- "migrateFrom=%s migrateFd=%d migratePath=%s "
+ "incoming=%p migrateFd=%d migratePath=%s "
"snapshot=%p vmop=%d flags=0x%x",
conn, driver, vm, vm->def->name, vm->def->id,
virDomainAsyncJobTypeToString(asyncJob),
- NULLSTR(migrateFrom), migrateFd, NULLSTR(migratePath),
+ incoming, migrateFd, NULLSTR(migratePath),
snapshot, vmop, flags);
virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD |
@@ -8376,20 +8375,13 @@ qemuProcessStart(virConnectPtr conn,
VIR_QEMU_PROCESS_START_GEN_VMID |
VIR_QEMU_PROCESS_START_RESET_NVRAM, cleanup);
- if (!migrateFrom && !snapshot)
+ if (!incoming && !snapshot)
flags |= VIR_QEMU_PROCESS_START_NEW;
if (qemuProcessInit(driver, vm, updatedCPU,
- asyncJob, !!migrateFrom, flags) < 0)
+ asyncJob, !!incoming, flags) < 0)
goto cleanup;
- if (migrateFrom) {
- incoming = qemuProcessIncomingDefNew(priv->qemuCaps, NULL, migrateFrom,
- migrateFd, migratePath);
- if (!incoming)
- goto stop;
- }
-
if (qemuProcessPrepareDomain(driver, vm, flags) < 0)
goto stop;
@@ -8442,14 +8434,13 @@ qemuProcessStart(virConnectPtr conn,
qemuSecurityRestoreSavedStateLabel(driver->securityManager,
vm->def, migratePath) < 0)
VIR_WARN("failed to restore save state label on %s", migratePath);
- qemuProcessIncomingDefFree(incoming);
return ret;
stop:
stopFlags = 0;
if (!relabel)
stopFlags |= VIR_QEMU_PROCESS_STOP_NO_RELABEL;
- if (migrateFrom)
+ if (incoming)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
if (priv->mon)
qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL);
@@ -8503,8 +8494,9 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
VIR_AUTOCLOSE intermediatefd = -1;
g_autoptr(virCommand) cmd = NULL;
g_autofree char *errbuf = NULL;
- const char *migrateFrom = NULL;
+ qemuProcessIncomingDef *incoming = NULL;
int rc = 0;
+ int ret = -1;
if (data) {
if (virSaveCookieParseString(data->cookie, (virObject **)&cookie,
@@ -8515,10 +8507,15 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
&errbuf, &cmd) < 0) {
return -1;
}
-
- migrateFrom = "stdio";
}
+ /* The fd passed to qemuProcessIncomingDefNew is used to create the migration
+ * URI, so it must be called after starting the decompression program.
+ */
+ incoming = qemuProcessIncomingDefNew(priv->qemuCaps, NULL, "stdio", *fd,
path);
+ if (!incoming)
+ return -1;
+
/* No cookie means libvirt which saved the domain was too old to mess up
* the CPU definitions.
*/
@@ -8529,7 +8526,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
priv->disableSlirp = true;
if (qemuProcessStart(conn, driver, vm, cookie ? cookie->cpu : NULL,
- asyncJob, migrateFrom, *fd, path, snapshot,
+ asyncJob, incoming, *fd, path, snapshot,
VIR_NETDEV_VPORT_PROFILE_OP_RESTORE,
start_flags) == 0)
*started = true;
@@ -8541,14 +8538,17 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
virDomainAuditStart(vm, reason, *started);
if (!*started || rc < 0)
- return -1;
+ goto cleanup;
/* qemuProcessStart doesn't unset the qemu error reporting infrastructure
* in case of migration (which is used in this case) so we need to reset it
* so that the handle to virtlogd is not held open unnecessarily */
qemuMonitorSetDomainLog(qemuDomainGetMonitor(vm), NULL, NULL, NULL);
+ ret = 0;
- return 0;
+ cleanup:
+ qemuProcessIncomingDefFree(incoming);
+ return ret;
}
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index fee00ce53b..a9e0a03a21 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -83,7 +83,7 @@ int qemuProcessStart(virConnectPtr conn,
virDomainObj *vm,
virCPUDef *updatedCPU,
virDomainAsyncJob asyncJob,
- const char *migrateFrom,
+ qemuProcessIncomingDef *incoming,
int stdin_fd,
const char *stdin_path,
virDomainMomentObj *snapshot,
--
2.43.0