External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-24 12:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: caps: Remove cleanup section in virQEMUCapsInitQMPMonitor

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Peter Krempa 2019-03-29 09:25:21 +01:00
parent 78ad4c559e
commit c5c8618463
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/qemu/qemu_capabilities.c
View File

@ -4320,7 +4320,6 @@ int
virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
qemuMonitorPtr mon) qemuMonitorPtr mon)
{ {
int ret = -1;
int major, minor, micro; int major, minor, micro;
VIR_AUTOFREE(char *) package = NULL; VIR_AUTOFREE(char *) package = NULL;
@ -4331,7 +4330,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
&package) < 0) { &package) < 0) {
VIR_DEBUG("Failed to query monitor version %s", VIR_DEBUG("Failed to query monitor version %s",
virGetLastErrorMessage()); virGetLastErrorMessage());
goto cleanup; return -1;
} }
VIR_DEBUG("Got version %d.%d.%d (%s)", VIR_DEBUG("Got version %d.%d.%d (%s)",
@ -4343,7 +4342,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
_("QEMU version >= %d.%d.%d is required, but %d.%d.%d found"), _("QEMU version >= %d.%d.%d is required, but %d.%d.%d found"),
QEMU_MIN_MAJOR, QEMU_MIN_MINOR, QEMU_MIN_MICRO, QEMU_MIN_MAJOR, QEMU_MIN_MINOR, QEMU_MIN_MICRO,
major, minor, micro); major, minor, micro);
goto cleanup; return -1;
} }
qemuCaps->version = major * 1000000 + minor * 1000 + micro; qemuCaps->version = major * 1000000 + minor * 1000 + micro;
@ -4351,7 +4350,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
qemuCaps->usedQMP = true; qemuCaps->usedQMP = true;
if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0) if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0)
goto cleanup; return -1;
virQEMUCapsInitQMPBasicArch(qemuCaps); virQEMUCapsInitQMPBasicArch(qemuCaps);
@ -4359,40 +4358,38 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
virQEMUCapsInitQMPVersionCaps(qemuCaps); virQEMUCapsInitQMPVersionCaps(qemuCaps);
if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0)
goto cleanup; return -1;
/* Some capabilities may differ depending on KVM state */ /* Some capabilities may differ depending on KVM state */
if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false) < 0) if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPCommandLine(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPCommandLine(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPMigrationCapabilities(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPMigrationCapabilities(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, false) < 0) if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, false) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0)
goto cleanup; return -1;
if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
goto cleanup; return -1;
virQEMUCapsInitProcessCaps(qemuCaps); virQEMUCapsInitProcessCaps(qemuCaps);
ret = 0; return 0;
cleanup:
return ret;
} }