NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Use g_autoptr in qemuProcessInit

Browse Source 
The only thing we need to free in the cleanup code is virCPUDef and for
that we already have g_autoptr handler.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark
2024-04-16 15:11:02 +02:00
parent 8b9d35c82c
commit ded74b3369
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_process.c
View File

@@ -5657,8 +5657,7 @@ qemuProcessInit(virQEMUDriver *driver,
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
int stopFlags; int stopFlags;
virCPUDef *origCPU = NULL; g_autoptr(virCPUDef) origCPU = NULL;
int ret = -1;
VIR_DEBUG("vm=%p name=%s id=%d migration=%d", VIR_DEBUG("vm=%p name=%s id=%d migration=%d",
vm, vm->def->name, vm->def->id, migration); vm, vm->def->name, vm->def->id, migration);
@@ -5668,7 +5667,7 @@ qemuProcessInit(virQEMUDriver *driver,
if (virDomainObjIsActive(vm)) { if (virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("VM is already active")); _("VM is already active"));
goto cleanup; return -1;
} }
/* in case when the post parse callback failed we need to re-run it on the /* in case when the post parse callback failed we need to re-run it on the
@@ -5678,18 +5677,18 @@ qemuProcessInit(virQEMUDriver *driver,
/* we don't have the private copy of qemuCaps at this point */ /* we don't have the private copy of qemuCaps at this point */
if (virDomainDefPostParse(vm->def, 0, driver->xmlopt, NULL) < 0) if (virDomainDefPostParse(vm->def, 0, driver->xmlopt, NULL) < 0)
goto cleanup; return -1;
} }
VIR_DEBUG("Determining emulator version"); VIR_DEBUG("Determining emulator version");
if (qemuProcessPrepareQEMUCaps(vm, driver->qemuCapsCache) < 0) if (qemuProcessPrepareQEMUCaps(vm, driver->qemuCapsCache) < 0)
goto cleanup; return -1;
if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0) if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0)
goto cleanup; return -1;
if (qemuProcessStartValidate(driver, vm, priv->qemuCaps, flags) < 0) if (qemuProcessStartValidate(driver, vm, priv->qemuCaps, flags) < 0)
goto cleanup; return -1;
/* Do this upfront, so any part of the startup process can add /* Do this upfront, so any part of the startup process can add
* runtime state to vm->def that won't be persisted. This let's us * runtime state to vm->def that won't be persisted. This let's us
@@ -5697,12 +5696,12 @@ qemuProcessInit(virQEMUDriver *driver,
*/ */
VIR_DEBUG("Setting current domain def as transient"); VIR_DEBUG("Setting current domain def as transient");
if (virDomainObjSetDefTransient(driver->xmlopt, vm, priv->qemuCaps) < 0) if (virDomainObjSetDefTransient(driver->xmlopt, vm, priv->qemuCaps) < 0)
goto cleanup; return -1;
if (flags & VIR_QEMU_PROCESS_START_PRETEND) { if (flags & VIR_QEMU_PROCESS_START_PRETEND) {
if (qemuDomainSetPrivatePaths(driver, vm) < 0) { if (qemuDomainSetPrivatePaths(driver, vm) < 0) {
virDomainObjRemoveTransientDef(vm); virDomainObjRemoveTransientDef(vm);
goto cleanup; return -1;
} }
} else { } else {
vm->def->id = qemuDriverAllocateID(driver); vm->def->id = qemuDriverAllocateID(driver);
@@ -5724,18 +5723,14 @@ qemuProcessInit(virQEMUDriver *driver,
priv->origCPU = g_steal_pointer(&origCPU); priv->origCPU = g_steal_pointer(&origCPU);
} }
ret = 0; return 0;
cleanup:
virCPUDefFree(origCPU);
return ret;
stop: stop:
stopFlags = VIR_QEMU_PROCESS_STOP_NO_RELABEL; stopFlags = VIR_QEMU_PROCESS_STOP_NO_RELABEL;
if (migration) if (migration)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags);
goto cleanup; return -1;
} }