[PATCH v1 00/10] more simple g_autoptr() cleanups
I intended to clean up the virDomainDefFree() calls that I kept seeing in qemu_driver.c, ended up doing a bit more than that. Daniel Henrique Barboza (10): qemu_driver.c: use g_autoptr() with virDomainDef pointers qemu_driver.c: use g_autoptr() with qemuMigrationParams pointers qemu_driver.c: use g_autoptr() with virDomainDeviceDefPtr qemu_driver.c: remove unneeded 'cleanup' labels qemu_snapshot.c: remove uneeded 'cleanup' label in qemuSnapshotDelete() qemu_domain.c: use g_autoptr() with virDomainDef pointers qemu_domain.c: remove unneeded cleanup labels qemu_domain.c: modernize qemuDomainFixupCPUs() qemu_domain.c: modernize qemuDomainWriteMasterKeyFile() qemu_domain.c: modernize qemuMonitorGetCpuHalted() src/qemu/qemu_domain.c | 100 ++++++------------ src/qemu/qemu_driver.c | 219 +++++++++++++++------------------------ src/qemu/qemu_snapshot.c | 3 +- 3 files changed, 119 insertions(+), 203 deletions(-) -- 2.26.2
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_driver.c | 54 ++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05f8eb2cb7..fdbac9d21d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1737,7 +1737,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; virObjectEventPtr event = NULL; @@ -1810,7 +1810,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, qemuProcessEndJob(driver, vm); cleanup: - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); @@ -5997,7 +5996,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, { virQEMUDriverPtr driver = conn->privateData; qemuDomainObjPrivatePtr priv = NULL; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; virDomainObjPtr vm = NULL; g_autofree char *xmlout = NULL; const char *newxml = dxml; @@ -6078,7 +6077,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, qemuProcessEndJob(driver, vm); cleanup: - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) ret = -1; @@ -6104,7 +6102,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path, { virQEMUDriverPtr driver = conn->privateData; char *ret = NULL; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; int fd = -1; virQEMUSaveDataPtr data = NULL; @@ -6123,7 +6121,6 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path, cleanup: virQEMUSaveDataFree(data); - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); return ret; } @@ -6134,8 +6131,8 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, const char *path, { virQEMUDriverPtr driver = conn->privateData; int ret = -1; - virDomainDefPtr def = NULL; - virDomainDefPtr newdef = NULL; + g_autoptr(virDomainDef) def = NULL; + g_autoptr(virDomainDef) newdef = NULL; int fd = -1; virQEMUSaveDataPtr data = NULL; int state = -1; @@ -6194,8 +6191,6 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, const char *path, ret = 0; cleanup: - virDomainDefFree(def); - virDomainDefFree(newdef); VIR_FORCE_CLOSE(fd); virQEMUSaveDataFree(data); return ret; @@ -6208,7 +6203,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, unsigned int flags) virDomainObjPtr vm; g_autofree char *path = NULL; char *ret = NULL; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; int fd = -1; virQEMUSaveDataPtr data = NULL; qemuDomainObjPrivatePtr priv; @@ -6240,7 +6235,6 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, unsigned int flags) cleanup: virQEMUSaveDataFree(data); - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&vm); return ret; @@ -6289,7 +6283,7 @@ qemuDomainObjRestore(virConnectPtr conn, bool bypass_cache, qemuDomainAsyncJob asyncJob) { - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; int fd = -1; int ret = -1; @@ -6350,7 +6344,6 @@ qemuDomainObjRestore(virConnectPtr conn, cleanup: virQEMUSaveDataFree(data); - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) ret = -1; @@ -6689,8 +6682,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - virDomainDefPtr def = NULL; - virDomainDefPtr oldDef = NULL; + g_autoptr(virDomainDef) def = NULL; + g_autoptr(virDomainDef) oldDef = NULL; virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; virObjectEventPtr event = NULL; @@ -6751,8 +6744,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); cleanup: - virDomainDefFree(oldDef); - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return dom; @@ -7755,7 +7746,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, unsigned int flags) { qemuDomainObjPrivatePtr priv = vm->privateData; - virDomainDefPtr vmdef = NULL; + g_autoptr(virDomainDef) vmdef = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL; virDomainDeviceDefPtr devConf = NULL; virDomainDeviceDef devConfSave = { 0 }; @@ -7845,7 +7836,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, ret = 0; cleanup: - virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); @@ -7903,7 +7893,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; - virDomainDefPtr vmdef = NULL; + g_autoptr(virDomainDef) vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; @@ -7998,7 +7988,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: - virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -8017,7 +8006,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; - virDomainDefPtr vmdef = NULL; + g_autoptr(virDomainDef) vmdef = NULL; int ret = -1; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -8092,7 +8081,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver, if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - virDomainDefFree(vmdef); return ret; } @@ -8107,7 +8095,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg = NULL; virDomainDefPtr def = NULL; virDomainDefPtr persistentDef = NULL; - virDomainDefPtr vmdef = NULL; + g_autoptr(virDomainDef) vmdef = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; int ret = -1; @@ -8161,7 +8149,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver, ret = 0; cleanup: - virDomainDefFree(vmdef); return ret; } @@ -9281,7 +9268,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, virDomainObjPtr vm = NULL; virDomainDefPtr def = NULL; virDomainDefPtr persistentDef = NULL; - virDomainDefPtr persistentDefCopy = NULL; + g_autoptr(virDomainDef) persistentDefCopy = NULL; unsigned long long value_ul; long long value_l; int ret = -1; @@ -9569,7 +9556,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: - virDomainDefFree(persistentDefCopy); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -11168,7 +11154,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, const char *dom_xml) { virQEMUDriverPtr driver = dconn->privateData; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; qemuMigrationParamsPtr migParams = NULL; int ret = -1; @@ -11204,7 +11190,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } @@ -11224,7 +11209,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, const char *dom_xml) { virQEMUDriverPtr driver = dconn->privateData; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; qemuMigrationParamsPtr migParams = NULL; int ret = -1; @@ -11270,7 +11255,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } @@ -11612,7 +11596,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, const char *dom_xml) { virQEMUDriverPtr driver = dconn->privateData; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; qemuMigrationParamsPtr migParams = NULL; int ret = -1; @@ -11642,7 +11626,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } @@ -11658,7 +11641,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, unsigned int flags) { virQEMUDriverPtr driver = dconn->privateData; - virDomainDefPtr def = NULL; + g_autoptr(virDomainDef) def = NULL; const char *dom_xml = NULL; const char *dname = NULL; g_autofree char *origname = NULL; @@ -11700,7 +11683,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } -- 2.26.2
Coverity found a bad merge conflict resolution... On 11/12/20 4:48 PM, Daniel Henrique Barboza wrote:
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_driver.c | 54 ++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 36 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05f8eb2cb7..fdbac9d21d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c
[...]
ret = -1; @@ -6689,8 +6682,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - virDomainDefPtr def = NULL; - virDomainDefPtr oldDef = NULL; + g_autoptr(virDomainDef) def = NULL; + g_autoptr(virDomainDef) oldDef = NULL; virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; virObjectEventPtr event = NULL; @@ -6751,8 +6744,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
cleanup: - virDomainDefFree(oldDef); - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return dom; @@ -7755,7 +7746,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm,
The code that was pushed added: + + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + !oldDef ? + VIR_DOMAIN_EVENT_DEFINED_ADDED : + VIR_DOMAIN_EVENT_DEFINED_UPDATED); + + VIR_INFO("Creating domain '%s'", vm->def->name); + dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); + within the cleanup: label even though recent commit 773c7c43611 had moved the code up higher. The coverity error is that @event gets overwritten... Hopefully easy enough to figure out. John [...]
On 11/13/20 2:39 PM, John Ferlan wrote:
Coverity found a bad merge conflict resolution...
Thanks John. Just posted a fix. Guess I'll have to find a way to run Coverity before pushing stuff ... DHB
On 11/12/20 4:48 PM, Daniel Henrique Barboza wrote:
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_driver.c | 54 ++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 36 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05f8eb2cb7..fdbac9d21d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c
[...]
ret = -1; @@ -6689,8 +6682,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - virDomainDefPtr def = NULL; - virDomainDefPtr oldDef = NULL; + g_autoptr(virDomainDef) def = NULL; + g_autoptr(virDomainDef) oldDef = NULL; virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; virObjectEventPtr event = NULL; @@ -6751,8 +6744,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
cleanup: - virDomainDefFree(oldDef); - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return dom; @@ -7755,7 +7746,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm,
The code that was pushed added:
+ + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + !oldDef ? + VIR_DOMAIN_EVENT_DEFINED_ADDED : + VIR_DOMAIN_EVENT_DEFINED_UPDATED); + + VIR_INFO("Creating domain '%s'", vm->def->name); + dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); +
within the cleanup: label even though recent commit 773c7c43611 had moved the code up higher.
The coverity error is that @event gets overwritten...
Hopefully easy enough to figure out.
John [...]
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_driver.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fdbac9d21d..2198e7f1e9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11156,7 +11156,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, virQEMUDriverPtr driver = dconn->privateData; g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; - qemuMigrationParamsPtr migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11189,7 +11189,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, st, &def, origname, migParams, flags); cleanup: - qemuMigrationParamsFree(migParams); return ret; } @@ -11211,7 +11210,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, virQEMUDriverPtr driver = dconn->privateData; g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; - qemuMigrationParamsPtr migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11254,7 +11253,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, migParams, flags); cleanup: - qemuMigrationParamsFree(migParams); return ret; } @@ -11273,7 +11271,7 @@ qemuDomainMigratePerform(virDomainPtr dom, virDomainObjPtr vm = NULL; int ret = -1; const char *dconnuri = NULL; - qemuMigrationParamsPtr migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11312,7 +11310,6 @@ qemuDomainMigratePerform(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); - qemuMigrationParamsFree(migParams); return ret; } @@ -11598,7 +11595,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, virQEMUDriverPtr driver = dconn->privateData; g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; - qemuMigrationParamsPtr migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11625,7 +11622,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, st, &def, origname, migParams, flags); cleanup: - qemuMigrationParamsFree(migParams); return ret; } @@ -11645,7 +11641,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, const char *dom_xml = NULL; const char *dname = NULL; g_autofree char *origname = NULL; - qemuMigrationParamsPtr migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11682,7 +11678,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, st, &def, origname, migParams, flags); cleanup: - qemuMigrationParamsFree(migParams); return ret; } @@ -12988,7 +12983,7 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; - qemuMigrationParamsPtr migParams = NULL; + g_autoptr(qemuMigrationParams) migParams = NULL; int ret = -1; int rc; @@ -13029,7 +13024,6 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: - qemuMigrationParamsFree(migParams); virDomainObjEndAPI(&vm); return ret; } -- 2.26.2
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_driver.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2198e7f1e9..6ff7289fd1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7748,9 +7748,9 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; g_autoptr(virDomainDef) vmdef = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL; - virDomainDeviceDefPtr devConf = NULL; + g_autoptr(virDomainDeviceDef) devConf = NULL; virDomainDeviceDef devConfSave = { 0 }; - virDomainDeviceDefPtr devLive = NULL; + g_autoptr(virDomainDeviceDef) devLive = NULL; int ret = -1; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -7836,9 +7836,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, ret = 0; cleanup: - virDomainDeviceDefFree(devConf); - virDomainDeviceDefFree(devLive); - return ret; } @@ -7894,7 +7891,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; g_autoptr(virDomainDef) vmdef = NULL; - virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; + g_autoptr(virDomainDeviceDef) dev = NULL; + virDomainDeviceDefPtr dev_copy = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; g_autoptr(virQEMUDriverConfig) cfg = NULL; @@ -7990,7 +7988,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, cleanup: if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); - virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virNWFilterUnlockFilterUpdates(); return ret; @@ -8004,7 +8001,8 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; g_autoptr(virQEMUDriverConfig) cfg = NULL; - virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; + g_autoptr(virDomainDeviceDef) dev = NULL; + virDomainDeviceDefPtr dev_copy = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; g_autoptr(virDomainDef) vmdef = NULL; int ret = -1; @@ -8080,7 +8078,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver, cleanup: if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); - virDomainDeviceDefFree(dev); return ret; } -- 2.26.2
Some labels became deprecated after the previous patches. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_driver.c | 132 +++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 77 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ff7289fd1..b3c676001f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7751,7 +7751,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, g_autoptr(virDomainDeviceDef) devConf = NULL; virDomainDeviceDef devConfSave = { 0 }; g_autoptr(virDomainDeviceDef) devLive = NULL; - int ret = -1; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -7767,12 +7766,12 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, vmdef = virDomainObjCopyPersistentDef(vm, driver->xmlopt, priv->qemuCaps); if (!vmdef) - goto cleanup; + return -1; if (!(devConf = virDomainDeviceDefParse(xml, vmdef, driver->xmlopt, priv->qemuCaps, parse_flags))) - goto cleanup; + return -1; /* * devConf will be NULLed out by @@ -7783,60 +7782,58 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm, if (virDomainDeviceValidateAliasForHotplug(vm, devConf, VIR_DOMAIN_AFFECT_CONFIG) < 0) - goto cleanup; + return -1; if (virDomainDefCompatibleDevice(vmdef, devConf, NULL, VIR_DOMAIN_DEVICE_ACTION_ATTACH, false) < 0) - goto cleanup; + return -1; if (qemuDomainAttachDeviceConfig(vmdef, devConf, priv->qemuCaps, parse_flags, driver->xmlopt) < 0) - goto cleanup; + return -1; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!(devLive = virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, priv->qemuCaps, parse_flags))) - goto cleanup; + return -1; if (flags & VIR_DOMAIN_AFFECT_CONFIG) qemuDomainAttachDeviceLiveAndConfigHomogenize(&devConfSave, devLive); if (virDomainDeviceValidateAliasForHotplug(vm, devLive, VIR_DOMAIN_AFFECT_LIVE) < 0) - goto cleanup; + return -1; if (virDomainDefCompatibleDevice(vm->def, devLive, NULL, VIR_DOMAIN_DEVICE_ACTION_ATTACH, true) < 0) - goto cleanup; + return -1; if (qemuDomainAttachDeviceLive(vm, devLive, driver) < 0) - goto cleanup; + return -1; /* * update domain status forcibly because the domain status may be * changed even if we failed to attach the device. For example, * a new controller may be created. */ if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - goto cleanup; + return -1; } /* Finally, if no error until here, we can save config. */ if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0) - goto cleanup; + return -1; virDomainObjAssignDef(vm, vmdef, false, NULL); vmdef = NULL; } - ret = 0; - cleanup: - return ret; + return 0; } static int @@ -8094,7 +8091,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver, virDomainDefPtr persistentDef = NULL; g_autoptr(virDomainDef) vmdef = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; - int ret = -1; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -8106,21 +8102,21 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver, parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) - goto cleanup; + return -1; if (persistentDef) { virDomainDeviceDef dev; if (!(vmdef = virDomainObjCopyPersistentDef(vm, driver->xmlopt, priv->qemuCaps))) - goto cleanup; + return -1; if (virDomainDefFindDevice(vmdef, alias, &dev, true) < 0) - goto cleanup; + return -1; if (qemuDomainDetachDeviceConfig(vmdef, &dev, priv->qemuCaps, parse_flags, driver->xmlopt) < 0) - goto cleanup; + return -1; } if (def) { @@ -8128,25 +8124,23 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver, int rc; if (virDomainDefFindDevice(def, alias, &dev, true) < 0) - goto cleanup; + return -1; if ((rc = qemuDomainDetachDeviceLive(vm, &dev, driver, true)) < 0) - goto cleanup; + return -1; if (rc == 0 && qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) - goto cleanup; + return -1; } if (vmdef) { if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0) - goto cleanup; + return -1; virDomainObjAssignDef(vm, vmdef, false, NULL); vmdef = NULL; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -11154,39 +11148,35 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; g_autoptr(qemuMigrationParams) migParams = NULL; - int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); if (!(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PrepareTunnel called but no TUNNELLED flag set")); - goto cleanup; + return -1; } if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, QEMU_MIGRATION_DESTINATION))) - goto cleanup; + return -1; if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot use migrate v2 protocol with lock manager %s"), virLockManagerPluginGetName(driver->lockManager)); - goto cleanup; + return -1; } if (!(def = qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname, &origname))) - goto cleanup; + return -1; if (virDomainMigratePrepareTunnelEnsureACL(dconn, def) < 0) - goto cleanup; - - ret = qemuMigrationDstPrepareTunnel(driver, dconn, - NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, &def, origname, migParams, flags); + return -1; - cleanup: - return ret; + return qemuMigrationDstPrepareTunnel(driver, dconn, + NULL, 0, NULL, NULL, /* No cookies in v2 */ + st, &def, origname, migParams, flags); } /* Prepare is the first step, and it runs on the destination host. @@ -11208,7 +11198,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; g_autoptr(qemuMigrationParams) migParams = NULL; - int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11219,38 +11208,35 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Tunnelled migration requested but invalid " "RPC method called")); - goto cleanup; + return -1; } if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, QEMU_MIGRATION_DESTINATION))) - goto cleanup; + return -1; if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot use migrate v2 protocol with lock manager %s"), virLockManagerPluginGetName(driver->lockManager)); - goto cleanup; + return -1; } if (!(def = qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname, &origname))) - goto cleanup; + return -1; if (virDomainMigratePrepare2EnsureACL(dconn, def) < 0) - goto cleanup; + return -1; /* Do not use cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - ret = qemuMigrationDstPrepareDirect(driver, dconn, - NULL, 0, NULL, NULL, /* No cookies */ - uri_in, uri_out, - &def, origname, NULL, 0, NULL, 0, NULL, - migParams, flags); - - cleanup: - return ret; + return qemuMigrationDstPrepareDirect(driver, dconn, + NULL, 0, NULL, NULL, /* No cookies */ + uri_in, uri_out, + &def, origname, NULL, 0, NULL, 0, NULL, + migParams, flags); } @@ -11593,33 +11579,29 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, g_autoptr(virDomainDef) def = NULL; g_autofree char *origname = NULL; g_autoptr(qemuMigrationParams) migParams = NULL; - int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); if (!(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PrepareTunnel called but no TUNNELLED flag set")); - goto cleanup; + return -1; } if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, QEMU_MIGRATION_DESTINATION))) - goto cleanup; + return -1; if (!(def = qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname, &origname))) - goto cleanup; + return -1; if (virDomainMigratePrepareTunnel3EnsureACL(dconn, def) < 0) - goto cleanup; - - ret = qemuMigrationDstPrepareTunnel(driver, dconn, - cookiein, cookieinlen, - cookieout, cookieoutlen, - st, &def, origname, migParams, flags); + return -1; - cleanup: - return ret; + return qemuMigrationDstPrepareTunnel(driver, dconn, + cookiein, cookieinlen, + cookieout, cookieoutlen, + st, &def, origname, migParams, flags); } static int @@ -11639,7 +11621,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, const char *dname = NULL; g_autofree char *origname = NULL; g_autoptr(qemuMigrationParams) migParams = NULL; - int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); if (virTypedParamsValidate(params, nparams, QEMU_MIGRATION_PARAMETERS) < 0) @@ -11656,26 +11637,23 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, if (!(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PrepareTunnel called but no TUNNELLED flag set")); - goto cleanup; + return -1; } if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags, QEMU_MIGRATION_DESTINATION))) - goto cleanup; + return -1; if (!(def = qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname, &origname))) - goto cleanup; + return -1; if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) - goto cleanup; - - ret = qemuMigrationDstPrepareTunnel(driver, dconn, - cookiein, cookieinlen, - cookieout, cookieoutlen, - st, &def, origname, migParams, flags); + return -1; - cleanup: - return ret; + return qemuMigrationDstPrepareTunnel(driver, dconn, + cookiein, cookieinlen, + cookieout, cookieoutlen, + st, &def, origname, migParams, flags); } -- 2.26.2
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_snapshot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 8e3540bbc1..a31a62b7ec 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2304,7 +2304,7 @@ qemuSnapshotDelete(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY, -1); if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto endjob; @@ -2378,6 +2378,5 @@ qemuSnapshotDelete(virDomainObjPtr vm, endjob: qemuDomainObjEndJob(driver, vm); - cleanup: return ret; } -- 2.26.2
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_domain.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 70896ad80e..3c17e6e4b4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5796,7 +5796,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, virBuffer *buf) { int ret = -1; - virDomainDefPtr copy = NULL; + g_autoptr(virDomainDef) copy = NULL; virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU, -1); @@ -5971,7 +5971,6 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, virDomainDefFormatConvertXMLFlags(flags)); cleanup: - virDomainDefFree(copy); return ret; } @@ -7939,8 +7938,8 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, virDomainDefPtr src, virDomainDefPtr dst) { - virDomainDefPtr migratableDefSrc = NULL; - virDomainDefPtr migratableDefDst = NULL; + g_autoptr(virDomainDef) migratableDefSrc = NULL; + g_autoptr(virDomainDef) migratableDefDst = NULL; bool ret = false; if (!(migratableDefSrc = qemuDomainDefCopy(driver, qemuCaps, src, COPY_FLAGS)) || @@ -7952,8 +7951,6 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, dst, migratableDefDst); cleanup: - virDomainDefFree(migratableDefSrc); - virDomainDefFree(migratableDefDst); return ret; } @@ -7964,8 +7961,8 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, virDomainDefPtr dst) { qemuDomainObjPrivatePtr priv = vm->privateData; - virDomainDefPtr migratableSrc = NULL; - virDomainDefPtr migratableDst = NULL; + g_autoptr(virDomainDef) migratableSrc = NULL; + g_autoptr(virDomainDef) migratableDst = NULL; g_autofree char *xml = NULL; bool ret = false; @@ -7979,8 +7976,6 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, dst, migratableDst); cleanup: - virDomainDefFree(migratableSrc); - virDomainDefFree(migratableDst); return ret; } -- 2.26.2
Remove obsolete 'cleanup' labels after the changes from the previous patch. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_domain.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3c17e6e4b4..2fe8d06fdf 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5795,7 +5795,6 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, unsigned int flags, virBuffer *buf) { - int ret = -1; g_autoptr(virDomainDef) copy = NULL; virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU, -1); @@ -5805,7 +5804,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, if (!(copy = virDomainDefCopy(def, driver->xmlopt, qemuCaps, flags & VIR_DOMAIN_XML_MIGRATABLE))) - goto cleanup; + return -1; def = copy; @@ -5823,13 +5822,13 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, def->virtType, def->emulator, def->os.machine))) - goto cleanup; + return -1; } if (virCPUUpdate(def->os.arch, def->cpu, virQEMUCapsGetHostModel(qCaps, def->virtType, VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0) - goto cleanup; + return -1; } if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) { @@ -5959,19 +5958,16 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, if (origCPU) { virCPUDefFree(def->cpu); if (!(def->cpu = virCPUDefCopy(origCPU))) - goto cleanup; + return -1; } if (def->cpu && qemuDomainMakeCPUMigratable(def->cpu) < 0) - goto cleanup; + return -1; } format: - ret = virDomainDefFormatInternal(def, driver->xmlopt, buf, - virDomainDefFormatConvertXMLFlags(flags)); - - cleanup: - return ret; + return virDomainDefFormatInternal(def, driver->xmlopt, buf, + virDomainDefFormatConvertXMLFlags(flags)); } @@ -7940,18 +7936,14 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, { g_autoptr(virDomainDef) migratableDefSrc = NULL; g_autoptr(virDomainDef) migratableDefDst = NULL; - bool ret = false; if (!(migratableDefSrc = qemuDomainDefCopy(driver, qemuCaps, src, COPY_FLAGS)) || !(migratableDefDst = qemuDomainDefCopy(driver, qemuCaps, dst, COPY_FLAGS))) - goto cleanup; - - ret = qemuDomainMigratableDefCheckABIStability(driver, - src, migratableDefSrc, - dst, migratableDefDst); + return false; - cleanup: - return ret; + return qemuDomainMigratableDefCheckABIStability(driver, + src, migratableDefSrc, + dst, migratableDefDst); } @@ -7964,19 +7956,15 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, g_autoptr(virDomainDef) migratableSrc = NULL; g_autoptr(virDomainDef) migratableDst = NULL; g_autofree char *xml = NULL; - bool ret = false; if (!(xml = qemuDomainFormatXML(driver, vm, COPY_FLAGS)) || !(migratableSrc = qemuDomainDefFromXML(driver, priv->qemuCaps, xml)) || !(migratableDst = qemuDomainDefCopy(driver, priv->qemuCaps, dst, COPY_FLAGS))) - goto cleanup; - - ret = qemuDomainMigratableDefCheckABIStability(driver, - vm->def, migratableSrc, - dst, migratableDst); + return false; - cleanup: - return ret; + return qemuDomainMigratableDefCheckABIStability(driver, + vm->def, migratableSrc, + dst, migratableDst); } #undef COPY_FLAGS -- 2.26.2
Use g_autoptr() to deprecate the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_domain.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2fe8d06fdf..67d11aca92 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10082,10 +10082,9 @@ int qemuDomainFixupCPUs(virDomainObjPtr vm, virCPUDefPtr *origCPU) { - virCPUDefPtr fixedCPU = NULL; - virCPUDefPtr fixedOrig = NULL; + g_autoptr(virCPUDef) fixedCPU = NULL; + g_autoptr(virCPUDef) fixedOrig = NULL; virArch arch = vm->def->os.arch; - int ret = -1; if (!ARCH_IS_X86(arch)) return 0; @@ -10106,13 +10105,13 @@ qemuDomainFixupCPUs(virDomainObjPtr vm, (!(fixedCPU = virCPUDefCopyWithoutModel(vm->def->cpu)) || virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false, virQEMUCapsCPUFilterFeatures, &arch) < 0)) - goto cleanup; + return -1; if (virCPUDefFindFeature(*origCPU, "cmt") && (!(fixedOrig = virCPUDefCopyWithoutModel(*origCPU)) || virCPUDefCopyModelFilter(fixedOrig, *origCPU, false, virQEMUCapsCPUFilterFeatures, &arch) < 0)) - goto cleanup; + return -1; if (fixedCPU) { virCPUDefFree(vm->def->cpu); @@ -10124,12 +10123,7 @@ qemuDomainFixupCPUs(virDomainObjPtr vm, *origCPU = g_steal_pointer(&fixedOrig); } - ret = 0; - - cleanup: - virCPUDefFree(fixedCPU); - virCPUDefFree(fixedOrig); - return ret; + return 0; } -- 2.26.2
Use VIR_AUTOCLOSE with 'fd' and delete the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_domain.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 67d11aca92..f28178af61 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -406,8 +406,7 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, virDomainObjPtr vm) { g_autofree char *path = NULL; - int fd = -1; - int ret = -1; + VIR_AUTOCLOSE fd = -1; qemuDomainObjPrivatePtr priv = vm->privateData; /* Only gets filled in if we have the capability */ @@ -420,24 +419,19 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, if ((fd = open(path, O_WRONLY|O_TRUNC|O_CREAT, 0600)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to open domain master key file for write")); - goto cleanup; + return -1; } if (safewrite(fd, priv->masterKey, priv->masterKeyLen) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to write master key file for domain")); - goto cleanup; + return -1; } if (qemuSecurityDomainSetPathLabel(driver, vm, path, false) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FORCE_CLOSE(fd); + return -1; - return ret; + return 0; } -- 2.26.2
Use g_autoptr() and remove the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_domain.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f28178af61..aea0a6bd93 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9217,9 +9217,8 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, virDomainVcpuDefPtr vcpu; qemuDomainVcpuPrivatePtr vcpupriv; size_t maxvcpus = virDomainDefGetVcpusMax(vm->def); - virBitmapPtr haltedmap = NULL; + g_autoptr(virBitmap) haltedmap = NULL; size_t i; - int ret = -1; bool fast; /* Not supported currently for TCG, see qemuDomainRefreshVcpuInfo */ @@ -9244,7 +9243,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, haltedmap = qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcpus, fast); if (qemuDomainObjExitMonitor(driver, vm) < 0 || !haltedmap) - goto cleanup; + return -1; for (i = 0; i < maxvcpus; i++) { vcpu = virDomainDefGetVcpu(vm->def, i); @@ -9253,11 +9252,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, vcpupriv->qemu_id)); } - ret = 0; - - cleanup: - virBitmapFree(haltedmap); - return ret; + return 0; } bool -- 2.26.2
On Thu, 12 Nov 2020 18:48:30 -0300 Daniel Henrique Barboza <danielhb413@gmail.com> wrote:
I intended to clean up the virDomainDefFree() calls that I kept seeing in qemu_driver.c, ended up doing a bit more than that.
Daniel Henrique Barboza (10): qemu_driver.c: use g_autoptr() with virDomainDef pointers qemu_driver.c: use g_autoptr() with qemuMigrationParams pointers qemu_driver.c: use g_autoptr() with virDomainDeviceDefPtr qemu_driver.c: remove unneeded 'cleanup' labels qemu_snapshot.c: remove uneeded 'cleanup' label in qemuSnapshotDelete() qemu_domain.c: use g_autoptr() with virDomainDef pointers qemu_domain.c: remove unneeded cleanup labels qemu_domain.c: modernize qemuDomainFixupCPUs() qemu_domain.c: modernize qemuDomainWriteMasterKeyFile() qemu_domain.c: modernize qemuMonitorGetCpuHalted()
src/qemu/qemu_domain.c | 100 ++++++------------ src/qemu/qemu_driver.c | 219 +++++++++++++++------------------------ src/qemu/qemu_snapshot.c | 3 +- 3 files changed, 119 insertions(+), 203 deletions(-)
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
On 11/12/20 7:21 PM, Jonathon Jongsma wrote:
On Thu, 12 Nov 2020 18:48:30 -0300 Daniel Henrique Barboza <danielhb413@gmail.com> wrote:
I intended to clean up the virDomainDefFree() calls that I kept seeing in qemu_driver.c, ended up doing a bit more than that.
Daniel Henrique Barboza (10): qemu_driver.c: use g_autoptr() with virDomainDef pointers qemu_driver.c: use g_autoptr() with qemuMigrationParams pointers qemu_driver.c: use g_autoptr() with virDomainDeviceDefPtr qemu_driver.c: remove unneeded 'cleanup' labels qemu_snapshot.c: remove uneeded 'cleanup' label in qemuSnapshotDelete() qemu_domain.c: use g_autoptr() with virDomainDef pointers qemu_domain.c: remove unneeded cleanup labels qemu_domain.c: modernize qemuDomainFixupCPUs() qemu_domain.c: modernize qemuDomainWriteMasterKeyFile() qemu_domain.c: modernize qemuMonitorGetCpuHalted()
src/qemu/qemu_domain.c | 100 ++++++------------ src/qemu/qemu_driver.c | 219 +++++++++++++++------------------------ src/qemu/qemu_snapshot.c | 3 +- 3 files changed, 119 insertions(+), 203 deletions(-)
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Pushed. Thanks! DHB
participants (3)
-
Daniel Henrique Barboza -
John Ferlan -
Jonathon Jongsma