8:27 p.m.
Background is here:
https://www.redhat.com/archives/libvir-list/2014-May/msg00613.html
Roman Bogorodskiy (12):
Add explicit non-NULL check for virObjectUnlock()
qemu: virObjectUnlock usage cleanup
bhyve: virObjectUnlock usage cleanup
libxl: virObjectUnlock usage cleanup
lxc: virObjectUnlock usage cleanup
openvz: virObjectUnlock usage cleanup
parallels: virObjectUnlock usage cleanup
test: virObjectUnlock usage cleanup
uml: virObjectUnlock usage cleanup
vmware: virObjectUnlock usage cleanup
util: virObjectUnlock usage cleanup
maint: add virObjectUnlock to useless_free_options
cfg.mk | 1 +
src/bhyve/bhyve_driver.c | 9 +-
src/libxl/libxl_domain.c | 3 +-
src/libxl/libxl_driver.c | 124 +++++----------
src/lxc/lxc_driver.c | 129 ++++++----------
src/lxc/lxc_process.c | 3 +-
src/openvz/openvz_driver.c | 69 +++------
src/parallels/parallels_driver.c | 30 ++--
src/qemu/qemu_capabilities.c | 3 +-
src/qemu/qemu_driver.c | 324 +++++++++++++--------------------------
src/qemu/qemu_migration.c | 12 +-
src/qemu/qemu_process.c | 6 +-
src/test/test_driver.c | 156 +++++++------------
src/uml/uml_driver.c | 81 ++++------
src/util/virclosecallbacks.c | 3 +-
src/util/virobject.c | 3 +
src/vmware/vmware_driver.c | 51 ++----
17 files changed, 338 insertions(+), 669 deletions(-)
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 01/12] Add explicit non-NULL check for virObjectUnlock()
A lot of users of virObjectUnlock() use it this way:
if (obj)
virObjectUnlock(obj);
And while passing NULL is not harmless, it generates a warning like
virObjectUnlock:340 : Object 0x0 ((unknown)) is not a virObjectLockable instance
To make this function usage simplier, check if argument is not NULL
before calling virObjectIsClass() and allow caller not to care about
that.
---
src/util/virobject.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/util/virobject.c b/src/util/virobject.c
index 6cb84b4..19e1268 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -335,6 +335,9 @@ void virObjectUnlock(void *anyobj)
{
virObjectLockablePtr obj = anyobj;
+ if (!obj)
+ return;
+
if (!virObjectIsClass(obj, virObjectLockableClass)) {
VIR_WARN("Object %p (%s) is not a virObjectLockable instance",
obj, obj ? obj->parent.klass->name : "(unknown)");
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 02/12] qemu: virObjectUnlock usage cleanup
---
src/qemu/qemu_capabilities.c | 3 +-
src/qemu/qemu_driver.c | 324 +++++++++++++++----------------------------
src/qemu/qemu_migration.c | 12 +-
src/qemu/qemu_process.c | 6 +-
4 files changed, 115 insertions(+), 230 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 03d8842..e62fb35 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3229,8 +3229,7 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
ret = 0;
cleanup:
- if (mon)
- virObjectUnlock(mon);
+ virObjectUnlock(mon);
qemuMonitorClose(mon);
virCommandAbort(cmd);
virCommandFree(cmd);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cab653b..f8edb41 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -300,8 +300,7 @@ qemuAutostartDomain(virDomainObjPtr vm,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -1353,8 +1352,7 @@ static virDomainPtr qemuDomainLookupByID(virConnectPtr conn,
if (dom) dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -1382,8 +1380,7 @@ static virDomainPtr qemuDomainLookupByUUID(virConnectPtr conn,
if (dom) dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -1409,8 +1406,7 @@ static virDomainPtr qemuDomainLookupByName(virConnectPtr conn,
if (dom) dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -1429,8 +1425,7 @@ static int qemuDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1448,8 +1443,7 @@ static int qemuDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1467,8 +1461,7 @@ static int qemuDomainIsUpdated(virDomainPtr dom)
ret = obj->updated;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1652,8 +1645,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
cleanup:
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event) {
qemuDomainEventQueue(driver, event);
if (event2)
@@ -1738,8 +1730,7 @@ static int qemuDomainSuspend(virDomainPtr dom)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
@@ -1804,8 +1795,7 @@ static int qemuDomainResume(virDomainPtr dom)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
virObjectUnref(caps);
@@ -1887,8 +1877,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int
flags)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1987,8 +1976,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2030,8 +2018,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2123,8 +2110,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
return ret;
@@ -2149,8 +2135,7 @@ static char *qemuDomainGetOSType(virDomainPtr dom) {
ignore_value(VIR_STRDUP(type, vm->def->os.type));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return type;
}
@@ -2170,8 +2155,7 @@ qemuDomainGetMaxMemory(virDomainPtr dom)
ret = vm->def->mem.max_balloon;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2277,8 +2261,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long
newmem,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -2351,8 +2334,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int
period,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -2399,8 +2381,7 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int
flags)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2463,8 +2444,7 @@ static int qemuDomainSendKey(virDomainPtr domain,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2543,8 +2523,7 @@ static int qemuDomainGetInfo(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2569,8 +2548,7 @@ qemuDomainGetState(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2622,8 +2600,7 @@ qemuDomainGetControlInfo(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3138,8 +3115,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
VIR_FREE(xml);
if (event)
qemuDomainEventQueue(driver, event);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -3208,8 +3184,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char
*dxml,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3295,8 +3270,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
VIR_FREE(name);
virObjectUnref(cfg);
@@ -3639,8 +3613,7 @@ static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
return ret;
@@ -3739,8 +3712,7 @@ qemuDomainScreenshot(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -4302,8 +4274,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
VIR_FREE(cpuinfo);
virObjectUnref(cfg);
@@ -4477,8 +4448,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
cleanup:
if (cgroup_vcpu)
virCgroupFree(&cgroup_vcpu);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virBitmapFree(pcpumap);
virObjectUnref(caps);
virObjectUnref(cfg);
@@ -4578,8 +4548,7 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
ret = ncpumaps;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -4739,8 +4708,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
virCgroupFree(&cgroup_emulator);
virBitmapFree(pcpumap);
virObjectUnref(caps);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -4814,8 +4782,7 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
ret = 1;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -4909,8 +4876,7 @@ qemuDomainGetVcpus(virDomainPtr dom,
ret = maxinfo;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5002,8 +4968,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
VIR_FREE(cpuinfo);
return ret;
@@ -5063,8 +5028,7 @@ static int qemuDomainGetSecurityLabel(virDomainPtr dom,
virSecurityLabelPtr secl
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5129,8 +5093,7 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5533,8 +5496,7 @@ qemuDomainRestoreFlags(virConnectPtr conn,
virDomainDefFree(def);
VIR_FORCE_CLOSE(fd);
virFileWrapperFdFree(wrapperFd);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5760,8 +5722,7 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom,
ret = qemuDomainFormatXML(driver, vm, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -6156,8 +6117,7 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virNWFilterUnlockFilterUpdates();
return ret;
}
@@ -6252,8 +6212,7 @@ static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const
char *xml)
cleanup:
virDomainDefFree(oldDef);
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
virObjectUnref(qemuCaps);
@@ -6348,8 +6307,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
cleanup:
VIR_FREE(name);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
virObjectUnref(cfg);
@@ -7040,8 +6998,7 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char
*xml,
if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -7186,8 +7143,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -7327,8 +7283,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char
*xml,
if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -7356,8 +7311,7 @@ static int qemuDomainGetAutostart(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -7422,8 +7376,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom,
cleanup:
VIR_FREE(configFile);
VIR_FREE(autostartLink);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -7477,8 +7430,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom,
ignore_value(VIR_STRDUP(ret, "posix"));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -7859,8 +7811,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -8291,8 +8242,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -8587,8 +8537,7 @@ qemuDomainGetMemoryParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -8793,8 +8742,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -8896,8 +8844,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
cleanup:
VIR_FREE(nodeset);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -9145,8 +9092,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
cleanup:
virDomainDefFree(vmdef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -9381,8 +9327,7 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -9485,8 +9430,7 @@ qemuDomainBlockResize(virDomainPtr dom,
cleanup:
VIR_FREE(device);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -9561,8 +9505,7 @@ qemuDomainBlockStats(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -9735,8 +9678,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -9778,8 +9720,7 @@ qemuDomainInterfaceStats(virDomainPtr dom,
_("invalid path, '%s' is not a known
interface"), path);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
#else
@@ -9963,8 +9904,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
cleanup:
virNetDevBandwidthFree(bandwidth);
virNetDevBandwidthFree(newBandwidth);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -10083,8 +10023,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -10137,8 +10076,7 @@ qemuDomainMemoryStats(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -10195,8 +10133,7 @@ qemuDomainBlockPeek(virDomainPtr dom,
cleanup:
VIR_FORCE_CLOSE(fd);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -10284,8 +10221,7 @@ qemuDomainMemoryPeek(virDomainPtr dom,
if (tmp)
unlink(tmp);
VIR_FREE(tmp);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -10460,8 +10396,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
_("domain is not running"));
ret = -1;
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -11555,8 +11490,7 @@ static int qemuDomainGetJobInfo(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -11696,8 +11630,7 @@ qemuDomainGetJobStats(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (ret < 0)
virTypedParamsFree(par, npar);
return ret;
@@ -11750,8 +11683,7 @@ static int qemuDomainAbortJob(virDomainPtr dom)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -11801,8 +11733,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -11856,8 +11787,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -11912,8 +11842,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -11971,8 +11900,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -11999,8 +11927,7 @@ qemuDomainMigrateGetMaxSpeed(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -13584,8 +13511,7 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char
**names,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -13607,8 +13533,7 @@ static int qemuDomainSnapshotNum(virDomainPtr domain,
n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -13631,8 +13556,7 @@ qemuDomainListAllSnapshots(virDomainPtr domain,
virDomainSnapshotPtr **snaps,
n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -13662,8 +13586,7 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr
snapshot,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -13690,8 +13613,7 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot,
n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -13720,8 +13642,7 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -13747,8 +13668,7 @@ static virDomainSnapshotPtr
qemuDomainSnapshotLookupByName(virDomainPtr domain,
snapshot = virGetDomainSnapshot(domain, snap->def->name);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return snapshot;
}
@@ -13769,8 +13689,7 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain,
ret = (vm->current_snapshot != NULL);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -13803,8 +13722,7 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot,
parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return parent;
}
@@ -13831,8 +13749,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr
domain,
snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return snapshot;
}
@@ -13860,8 +13777,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr
snapshot,
xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return xml;
}
@@ -13888,8 +13804,7 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot,
STREQ(snapshot->name, vm->current_snapshot->def->name));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -13919,8 +13834,7 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot,
ret = 1;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -14268,8 +14182,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr
snapshot,
if (event2)
qemuDomainEventQueue(driver, event2);
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
@@ -14420,8 +14333,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr
snapshot,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -14474,8 +14386,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const
char *cmd,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -14570,8 +14481,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn,
cleanup:
virDomainDefFree(def);
virDomainChrSourceDefFree(monConfig);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
VIR_FREE(pidfile);
virObjectUnref(caps);
virObjectUnref(qemuCaps);
@@ -14656,8 +14566,7 @@ qemuDomainOpenConsole(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -14731,8 +14640,7 @@ qemuDomainOpenChannel(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -15073,8 +14981,7 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm,
cleanup:
VIR_FREE(device);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
return ret;
@@ -15297,8 +15204,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm,
cleanup:
VIR_FREE(device);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -15489,8 +15395,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
cleanup:
VIR_FREE(device);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -15555,8 +15460,7 @@ qemuDomainOpenGraphics(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -15738,8 +15642,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
cleanup:
VIR_FREE(device);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -15882,8 +15785,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
cleanup:
VIR_FREE(device);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -15956,8 +15858,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virHashFree(table);
if (ret < 0) {
for (i = 0; i < n; i++)
@@ -16076,8 +15977,7 @@ qemuDomainGetCPUStats(virDomainPtr domain,
ret = virCgroupGetPercpuStats(priv->cgroup, params, nparams,
start_cpu, ncpus, priv->nvcpupids);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16170,8 +16070,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16219,8 +16118,7 @@ qemuDomainPMWakeup(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16295,8 +16193,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return result;
}
@@ -16404,8 +16301,7 @@ qemuDomainFSTrim(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16584,8 +16480,7 @@ qemuDomainGetTime(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16638,8 +16533,7 @@ qemuDomainSetTime(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16682,8 +16576,7 @@ qemuDomainFSFreeze(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -16728,8 +16621,7 @@ qemuDomainFSThaw(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index f0df1a6..9d655a9 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2210,8 +2210,7 @@ qemuMigrationBegin(virConnectPtr conn,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return xml;
endjob:
@@ -2915,8 +2914,7 @@ qemuMigrationConfirm(virConnectPtr conn,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -4254,8 +4252,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
virObjectUnref(cfg);
@@ -4326,8 +4323,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
qemuDomainEventQueue(driver, event);
return ret;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index a83780f..c5fc99a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -926,8 +926,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
}
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (watchdogEvent)
qemuDomainEventQueue(driver, watchdogEvent);
if (lifecycleEvent)
@@ -1355,8 +1354,7 @@ qemuProcessHandleGuestPanic(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return 0;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 03/12] bhyve: virObjectUnlock usage cleanup
---
src/bhyve/bhyve_driver.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 580b124..af10ad3 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -522,8 +522,7 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml)
virObjectUnref(caps);
virDomainDefFree(def);
virDomainDefFree(oldDef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -883,8 +882,7 @@ bhyveDomainCreateXML(virConnectPtr conn,
cleanup:
virObjectUnref(caps);
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -916,8 +914,7 @@ bhyveDomainDestroy(virDomainPtr dom)
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 04/12] libxl: virObjectUnlock usage cleanup
---
src/libxl/libxl_domain.c | 3 +-
src/libxl/libxl_driver.c | 124 ++++++++++++++++-------------------------------
2 files changed, 42 insertions(+), 85 deletions(-)
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 80d5280..efcdca7 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -602,8 +602,7 @@ libxlDomainShutdownThread(void *opaque)
libxlDomainStart(driver, vm, 0, -1);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (dom_event)
libxlDomainEventQueue(driver, dom_event);
libxl_event_free(ctx, ev);
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index df7d510..3792515 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -664,8 +664,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml,
cleanup:
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return dom;
}
@@ -691,8 +690,7 @@ libxlDomainLookupByID(virConnectPtr conn, int id)
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -717,8 +715,7 @@ libxlDomainLookupByUUID(virConnectPtr conn, const unsigned char
*uuid)
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -743,8 +740,7 @@ libxlDomainLookupByName(virConnectPtr conn, const char *name)
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -798,8 +794,7 @@ libxlDomainSuspend(virDomainPtr dom)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
libxlDomainEventQueue(driver, event);
virObjectUnref(cfg);
@@ -858,8 +853,7 @@ libxlDomainResume(virDomainPtr dom)
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
libxlDomainEventQueue(driver, event);
virObjectUnref(cfg);
@@ -920,8 +914,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -968,8 +961,7 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags)
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1017,7 +1009,6 @@ libxlDomainDestroyFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
virObjectUnlock(vm);
if (event)
libxlDomainEventQueue(driver, event);
@@ -1046,8 +1037,7 @@ libxlDomainGetOSType(virDomainPtr dom)
goto cleanup;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return type;
}
@@ -1066,8 +1056,7 @@ libxlDomainGetMaxMemory(virDomainPtr dom)
ret = vm->def->mem.max_balloon;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1193,8 +1182,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -1247,8 +1235,7 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1273,8 +1260,7 @@ libxlDomainGetState(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1410,8 +1396,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char
*dxml,
virDomainObjListRemove(driver->domains, vm);
vm = NULL;
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1466,8 +1451,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
if (VIR_CLOSE(fd) < 0)
virReportSystemError(errno, "%s", _("cannot close file"));
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
@@ -1573,8 +1557,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int
flags)
virDomainObjListRemove(driver->domains, vm);
vm = NULL;
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
libxlDomainEventQueue(driver, event);
return ret;
@@ -1633,8 +1616,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags)
virDomainObjListRemove(driver->domains, vm);
vm = NULL;
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
VIR_FREE(name);
return ret;
}
@@ -1678,8 +1660,7 @@ libxlDomainHasManagedSaveImage(virDomainPtr dom, unsigned int
flags)
ret = vm->hasManagedSave;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1708,8 +1689,7 @@ libxlDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
cleanup:
VIR_FREE(name);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1846,8 +1826,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
cleanup:
VIR_FREE(bitmask);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -1909,8 +1888,7 @@ libxlDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
ret = (flags & VIR_DOMAIN_VCPU_MAXIMUM) ? def->maxvcpus : def->vcpus;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2007,8 +1985,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virBitmapFree(pcpumap);
virObjectUnref(cfg);
return ret;
@@ -2094,8 +2071,7 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps,
ret = ncpumaps;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -2158,8 +2134,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int
maxinfo,
ret = maxinfo;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2180,8 +2155,7 @@ libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
ret = virDomainDefFormat(vm->def, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2343,8 +2317,7 @@ libxlDomainCreateWithFlags(virDomainPtr dom,
ret = libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0, -1);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2404,8 +2377,7 @@ libxlDomainDefineXML(virConnectPtr conn, const char *xml)
cleanup:
virDomainDefFree(def);
virDomainDefFree(oldDef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
libxlDomainEventQueue(driver, event);
virObjectUnref(cfg);
@@ -2477,8 +2449,7 @@ libxlDomainUndefineFlags(virDomainPtr dom,
cleanup:
VIR_FREE(name);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
libxlDomainEventQueue(driver, event);
virObjectUnref(cfg);
@@ -3167,8 +3138,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
cleanup:
virDomainDefFree(vmdef);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3278,8 +3248,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
cleanup:
virDomainDefFree(vmdef);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3382,8 +3351,7 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
cleanup:
virDomainDefFree(vmdef);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3513,8 +3481,7 @@ libxlDomainGetAutostart(virDomainPtr dom, int *autostart)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3584,8 +3551,7 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart)
cleanup:
VIR_FREE(configFile);
VIR_FREE(autostartLink);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3640,8 +3606,7 @@ libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams)
ignore_value(VIR_STRDUP(ret, name));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3706,8 +3671,7 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3795,8 +3759,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom,
vm = NULL;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3880,8 +3843,7 @@ libxlDomainOpenConsole(virDomainPtr dom,
cleanup:
VIR_FREE(console);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -4017,8 +3979,7 @@ libxlDomainGetNumaParameters(virDomainPtr dom,
VIR_FREE(nodeset);
virBitmapFree(nodes);
libxl_bitmap_dispose(&nodemap);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
#endif
@@ -4038,8 +3999,7 @@ libxlDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -4058,8 +4018,7 @@ libxlDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -4078,8 +4037,7 @@ libxlDomainIsUpdated(virDomainPtr dom)
ret = vm->updated;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 05/12] lxc: virObjectUnlock usage cleanup
---
src/lxc/lxc_driver.c | 129 +++++++++++++++++---------------------------------
src/lxc/lxc_process.c | 3 +-
2 files changed, 44 insertions(+), 88 deletions(-)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 1086289..76ff824 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -263,8 +263,7 @@ static virDomainPtr lxcDomainLookupByID(virConnectPtr conn,
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -293,8 +292,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn,
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -320,8 +318,7 @@ static virDomainPtr lxcDomainLookupByName(virConnectPtr conn,
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -340,8 +337,7 @@ static int lxcDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -360,8 +356,7 @@ static int lxcDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -379,8 +374,7 @@ static int lxcDomainIsUpdated(virDomainPtr dom)
ret = obj->updated;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -502,8 +496,7 @@ static virDomainPtr lxcDomainDefineXML(virConnectPtr conn, const char
*xml)
cleanup:
virDomainDefFree(def);
virDomainDefFree(oldDef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(caps);
@@ -553,8 +546,7 @@ static int lxcDomainUndefineFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(cfg);
@@ -609,8 +601,7 @@ static int lxcDomainGetInfo(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -635,8 +626,7 @@ lxcDomainGetState(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -655,8 +645,7 @@ static char *lxcDomainGetOSType(virDomainPtr dom)
goto cleanup;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -676,8 +665,7 @@ lxcDomainGetMaxMemory(virDomainPtr dom)
ret = vm->def->mem.max_balloon;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -702,8 +690,7 @@ static int lxcDomainSetMaxMemory(virDomainPtr dom, unsigned long
newmax)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -742,8 +729,7 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -872,8 +858,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -969,8 +954,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -994,8 +978,7 @@ static char *lxcDomainGetXMLDesc(virDomainPtr dom,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1085,8 +1068,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(cfg);
@@ -1199,8 +1181,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
cleanup:
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(caps);
@@ -1274,8 +1255,7 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom,
virSecurityLabelPtr secla
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1449,8 +1429,7 @@ lxcDomainDestroyFlags(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
return ret;
@@ -1776,8 +1755,7 @@ static char *lxcDomainGetSchedulerType(virDomainPtr dom,
ignore_value(VIR_STRDUP(ret, "posix"));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1958,8 +1936,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom,
cleanup:
virDomainDefFree(vmdef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -2066,8 +2043,7 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -2306,8 +2282,7 @@ lxcDomainBlockStats(virDomainPtr dom,
&stats->rd_req,
&stats->wr_req);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2432,8 +2407,7 @@ lxcDomainBlockStatsFlags(virDomainPtr dom,
*nparams = tmp;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2639,8 +2613,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -3055,8 +3028,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
return ret;
}
@@ -3100,8 +3072,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
_("Invalid path, '%s' is not a known
interface"), path);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
#else
@@ -3131,8 +3102,7 @@ static int lxcDomainGetAutostart(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3202,8 +3172,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom,
cleanup:
VIR_FREE(configFile);
VIR_FREE(autostartLink);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3334,8 +3303,7 @@ static int lxcDomainSuspend(virDomainPtr dom)
cleanup:
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3384,8 +3352,7 @@ static int lxcDomainResume(virDomainPtr dom)
cleanup:
if (event)
virObjectEventStateQueue(driver->domainEventState, event);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(cfg);
return ret;
}
@@ -3449,8 +3416,7 @@ lxcDomainOpenConsole(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3522,8 +3488,7 @@ lxcDomainSendProcessSignal(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3621,8 +3586,7 @@ lxcDomainShutdownFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -3698,8 +3662,7 @@ lxcDomainReboot(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5036,8 +4999,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -5158,8 +5120,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom,
if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -5278,8 +5239,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom,
if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
@@ -5331,8 +5291,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom,
ret = nfds;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5427,8 +5386,7 @@ lxcDomainMemoryStats(virDomainPtr dom,
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -5645,8 +5603,7 @@ lxcDomainGetCPUStats(virDomainPtr dom,
ret = virCgroupGetPercpuStats(priv->cgroup, params,
nparams, start_cpu, ncpus, 0);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 0aef13a..115d6d7 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -516,8 +516,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon,
}
}
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event) {
virObjectEventStateQueue(driver->domainEventState, event);
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 06/12] openvz: virObjectUnlock usage cleanup
---
src/openvz/openvz_driver.c | 69 ++++++++++++++++------------------------------
1 file changed, 23 insertions(+), 46 deletions(-)
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 87df2a7..2f410c3 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -288,8 +288,7 @@ openvzDomainGetHostname(virDomainPtr dom, unsigned int flags)
}
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return hostname;
error:
@@ -319,8 +318,7 @@ static virDomainPtr openvzDomainLookupByID(virConnectPtr conn,
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -358,8 +356,7 @@ static char *openvzDomainGetOSType(virDomainPtr dom)
ignore_value(VIR_STRDUP(ret, vm->def->os.type));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -385,8 +382,7 @@ static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn,
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -411,8 +407,7 @@ static virDomainPtr openvzDomainLookupByName(virConnectPtr conn,
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -454,8 +449,7 @@ static int openvzDomainGetInfo(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -485,8 +479,7 @@ openvzDomainGetState(virDomainPtr dom,
ret = openvzGetVEStatus(vm, state, reason);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -507,8 +500,7 @@ static int openvzDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -529,8 +521,7 @@ static int openvzDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -559,8 +550,7 @@ static char *openvzDomainGetXMLDesc(virDomainPtr dom, unsigned int
flags) {
ret = virDomainDefFormat(vm->def, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -618,8 +608,7 @@ static int openvzDomainSuspend(virDomainPtr dom)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -657,8 +646,7 @@ static int openvzDomainResume(virDomainPtr dom)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -703,8 +691,7 @@ openvzDomainShutdownFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -764,8 +751,7 @@ static int openvzDomainReboot(virDomainPtr dom,
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1037,8 +1023,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
cleanup:
virDomainDefFree(vmdef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
openvzDriverUnlock(driver);
return dom;
}
@@ -1125,8 +1110,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
cleanup:
virDomainDefFree(vmdef);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
openvzDriverUnlock(driver);
return dom;
}
@@ -1173,8 +1157,7 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1222,8 +1205,7 @@ openvzDomainUndefineFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
openvzDriverUnlock(driver);
return ret;
}
@@ -1260,8 +1242,7 @@ openvzDomainSetAutostart(virDomainPtr dom, int autostart)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1297,8 +1278,7 @@ openvzDomainGetAutostart(virDomainPtr dom, int *autostart)
cleanup:
VIR_FREE(value);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1393,8 +1373,7 @@ static int openvzDomainSetVcpusFlags(virDomainPtr dom, unsigned int
nvcpus,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2006,8 +1985,7 @@ openvzDomainInterfaceStats(virDomainPtr dom,
_("invalid path, '%s' is not a known
interface"), path);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2112,8 +2090,7 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
cleanup:
openvzDriverUnlock(driver);
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 07/12] parallels: virObjectUnlock usage cleanup
---
src/parallels/parallels_driver.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index ab59599..5e17bc5 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -1117,8 +1117,7 @@ parallelsDomainLookupByID(virConnectPtr conn, int id)
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1146,8 +1145,7 @@ parallelsDomainLookupByUUID(virConnectPtr conn, const unsigned char
*uuid)
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1173,8 +1171,7 @@ parallelsDomainLookupByName(virConnectPtr conn, const char *name)
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1202,8 +1199,7 @@ parallelsDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -1225,8 +1221,7 @@ parallelsDomainGetOSType(virDomainPtr domain)
ignore_value(VIR_STRDUP(ret, privdom->def->os.type));
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
parallelsDriverUnlock(privconn);
return ret;
}
@@ -1248,8 +1243,7 @@ parallelsDomainIsPersistent(virDomainPtr domain)
ret = 1;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
parallelsDriverUnlock(privconn);
return ret;
}
@@ -1276,8 +1270,7 @@ parallelsDomainGetState(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -1306,8 +1299,7 @@ parallelsDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
ret = virDomainDefFormat(def, flags);
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -1331,8 +1323,7 @@ parallelsDomainGetAutostart(virDomainPtr domain, int *autostart)
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -1374,8 +1365,7 @@ parallelsDomainChangeState(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 08/12] test: virObjectUnlock usage cleanup
---
src/test/test_driver.c | 156 +++++++++++++++++--------------------------------
1 file changed, 52 insertions(+), 104 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 37756e7..b7d1153 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1710,8 +1710,7 @@ static int testDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1731,8 +1730,7 @@ static int testDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1781,8 +1779,7 @@ testDomainCreateXML(virConnectPtr conn, const char *xml,
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
if (event)
testObjectEventQueue(privconn, event);
virDomainDefFree(def);
@@ -1812,8 +1809,7 @@ static virDomainPtr testDomainLookupByID(virConnectPtr conn,
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1838,8 +1834,7 @@ static virDomainPtr testDomainLookupByUUID(virConnectPtr conn,
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1864,8 +1859,7 @@ static virDomainPtr testDomainLookupByName(virConnectPtr conn,
ret->id = dom->def->id;
cleanup:
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1912,8 +1906,7 @@ static int testDomainDestroy(virDomainPtr domain)
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -1951,8 +1944,7 @@ static int testDomainResume(virDomainPtr domain)
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event) {
testDriverLock(privconn);
testObjectEventQueue(privconn, event);
@@ -1993,8 +1985,7 @@ static int testDomainSuspend(virDomainPtr domain)
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event) {
testDriverLock(privconn);
@@ -2042,8 +2033,7 @@ static int testDomainShutdownFlags(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -2118,8 +2108,7 @@ static int testDomainReboot(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -2158,8 +2147,7 @@ static int testDomainGetInfo(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2189,8 +2177,7 @@ testDomainGetState(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2290,8 +2277,7 @@ testDomainSaveFlags(virDomainPtr domain, const char *path,
VIR_FORCE_CLOSE(fd);
unlink(path);
}
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -2396,8 +2382,7 @@ testDomainRestoreFlags(virConnectPtr conn,
virDomainDefFree(def);
VIR_FREE(xml);
VIR_FORCE_CLOSE(fd);
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -2474,8 +2459,7 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
ret = 0;
cleanup:
VIR_FORCE_CLOSE(fd);
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -2523,8 +2507,7 @@ testDomainGetMaxMemory(virDomainPtr domain)
ret = privdom->def->mem.max_balloon;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2550,8 +2533,7 @@ static int testDomainSetMaxMemory(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2581,8 +2563,7 @@ static int testDomainSetMemory(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2620,8 +2601,7 @@ testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
ret = (flags & VIR_DOMAIN_VCPU_MAXIMUM) ? def->maxvcpus : def->vcpus;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2719,8 +2699,7 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus,
}
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2814,8 +2793,7 @@ static int testDomainGetVcpus(virDomainPtr domain,
ret = maxinfo;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2872,8 +2850,7 @@ static int testDomainPinVcpu(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2903,8 +2880,7 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int
flags)
flags);
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -2977,8 +2953,7 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn,
cleanup:
virDomainDefFree(def);
virDomainDefFree(oldDef);
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -3011,8 +2986,7 @@ static char *testDomainGetMetadata(virDomainPtr dom,
privconn->xmlopt, flags);
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3045,8 +3019,7 @@ static int testDomainSetMetadata(virDomainPtr dom,
NULL, flags);
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3115,8 +3088,7 @@ static int testDomainCreateWithFlags(virDomainPtr domain, unsigned
int flags)
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -3191,8 +3163,7 @@ static int testDomainUndefineFlags(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
if (event)
testObjectEventQueue(privconn, event);
testDriverUnlock(privconn);
@@ -3225,8 +3196,7 @@ static int testDomainGetAutostart(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3252,8 +3222,7 @@ static int testDomainSetAutostart(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3302,8 +3271,7 @@ testDomainGetSchedulerParametersFlags(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3353,8 +3321,7 @@ testDomainSetSchedulerParametersFlags(virDomainPtr domain,
ret = 0;
cleanup:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3414,8 +3381,7 @@ static int testDomainBlockStats(virDomainPtr domain,
ret = 0;
error:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -3473,8 +3439,7 @@ static int testDomainInterfaceStats(virDomainPtr domain,
ret = 0;
error:
- if (privdom)
- virObjectUnlock(privdom);
+ virObjectUnlock(privdom);
return ret;
}
@@ -6442,8 +6407,7 @@ testDomainManagedSave(virDomainPtr dom, unsigned int flags)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event) {
testDriverLock(privconn);
testObjectEventQueue(privconn, event);
@@ -6473,8 +6437,7 @@ testDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
ret = vm->hasManagedSave;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
testDriverUnlock(privconn);
return ret;
}
@@ -6499,8 +6462,7 @@ testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
vm->hasManagedSave = false;
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
testDriverUnlock(privconn);
return ret;
}
@@ -6551,8 +6513,7 @@ testDomainSnapshotNum(virDomainPtr domain, unsigned int flags)
n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -6575,8 +6536,7 @@ testDomainSnapshotListNames(virDomainPtr domain,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -6597,8 +6557,7 @@ testDomainListAllSnapshots(virDomainPtr domain,
n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -6625,8 +6584,7 @@ testDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -6650,8 +6608,7 @@ testDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot,
n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -6677,8 +6634,7 @@ testDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return n;
}
@@ -6702,8 +6658,7 @@ testDomainSnapshotLookupByName(virDomainPtr domain,
snapshot = virGetDomainSnapshot(domain, snap->def->name);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return snapshot;
}
@@ -6722,8 +6677,7 @@ testDomainHasCurrentSnapshot(virDomainPtr domain,
ret = (vm->current_snapshot != NULL);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -6753,8 +6707,7 @@ testDomainSnapshotGetParent(virDomainSnapshotPtr snapshot,
parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return parent;
}
@@ -6779,8 +6732,7 @@ testDomainSnapshotCurrent(virDomainPtr domain,
snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return snapshot;
}
@@ -6806,8 +6758,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return xml;
}
@@ -6827,8 +6778,7 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot,
STREQ(snapshot->name, vm->current_snapshot->def->name));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -6851,8 +6801,7 @@ testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot,
ret = 1;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -7133,8 +7082,7 @@ testDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 09/12] uml: virObjectUnlock usage cleanup
---
src/uml/uml_driver.c | 81 ++++++++++++++++++----------------------------------
1 file changed, 27 insertions(+), 54 deletions(-)
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 1e0ec0e..3befd12 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -406,8 +406,7 @@ umlInotifyEvent(int watch,
}
}
}
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
if (event) {
umlDomainEventQueue(driver, event);
event = NULL;
@@ -748,8 +747,7 @@ static void umlProcessAutoDestroyDom(void *payload,
if (dom && !dom->persistent)
virDomainObjListRemove(data->driver->domains, dom);
- if (dom)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
if (event)
umlDomainEventQueue(data->driver, event);
virHashRemoveEntry(data->driver->autodestroy, uuidstr);
@@ -1372,8 +1370,7 @@ static virDomainPtr umlDomainLookupByID(virConnectPtr conn,
if (dom) dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -1400,8 +1397,7 @@ static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn,
if (dom) dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -1428,8 +1424,7 @@ static virDomainPtr umlDomainLookupByName(virConnectPtr conn,
if (dom) dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -1454,8 +1449,7 @@ static int umlDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1480,8 +1474,7 @@ static int umlDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1505,8 +1498,7 @@ static int umlDomainIsUpdated(virDomainPtr dom)
ret = obj->updated;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -1625,8 +1617,7 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const
char *xml,
cleanup:
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
umlDomainEventQueue(driver, event);
umlDriverUnlock(driver);
@@ -1668,8 +1659,7 @@ static int umlDomainShutdownFlags(virDomainPtr dom,
cleanup:
VIR_FREE(info);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1714,8 +1704,7 @@ umlDomainDestroyFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
umlDomainEventQueue(driver, event);
umlDriverUnlock(driver);
@@ -1750,8 +1739,7 @@ static char *umlDomainGetOSType(virDomainPtr dom) {
goto cleanup;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return type;
}
@@ -1782,8 +1770,7 @@ umlDomainGetMaxMemory(virDomainPtr dom)
ret = vm->def->mem.max_balloon;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1819,8 +1806,7 @@ static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long
newmax)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1862,8 +1848,7 @@ static int umlDomainSetMemory(virDomainPtr dom, unsigned long
newmem)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1905,8 +1890,7 @@ static int umlDomainGetInfo(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1940,8 +1924,7 @@ umlDomainGetState(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1973,8 +1956,7 @@ static char *umlDomainGetXMLDesc(virDomainPtr dom,
flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2043,8 +2025,7 @@ static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int
flags)
VIR_DOMAIN_EVENT_STARTED_BOOTED);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
if (event)
umlDomainEventQueue(driver, event);
umlDriverUnlock(driver);
@@ -2093,8 +2074,7 @@ static virDomainPtr umlDomainDefineXML(virConnectPtr conn, const
char *xml)
cleanup:
virDomainDefFree(def);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return dom;
}
@@ -2138,8 +2118,7 @@ static int umlDomainUndefineFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return ret;
}
@@ -2251,8 +2230,7 @@ static int umlDomainAttachDevice(virDomainPtr dom, const char *xml)
cleanup:
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return ret;
}
@@ -2366,8 +2344,7 @@ static int umlDomainDetachDevice(virDomainPtr dom, const char *xml)
cleanup:
virDomainDeviceDefFree(dev);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return ret;
}
@@ -2413,8 +2390,7 @@ static int umlDomainGetAutostart(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return ret;
}
@@ -2483,8 +2459,7 @@ static int umlDomainSetAutostart(virDomainPtr dom,
cleanup:
VIR_FREE(configFile);
VIR_FREE(autostartLink);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return ret;
}
@@ -2554,8 +2529,7 @@ umlDomainBlockPeek(virDomainPtr dom,
cleanup:
VIR_FORCE_CLOSE(fd);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -2627,8 +2601,7 @@ umlDomainOpenConsole(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
umlDriverUnlock(driver);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 10/12] vmware: virObjectUnlock usage cleanup
---
src/vmware/vmware_driver.c | 51 ++++++++++++++++------------------------------
1 file changed, 17 insertions(+), 34 deletions(-)
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 6edc0bc..4d8bf3c 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -401,8 +401,7 @@ vmwareDomainDefineXML(virConnectPtr conn, const char *xml)
VIR_FREE(directoryName);
VIR_FREE(fileName);
VIR_FREE(vmxPath);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
vmwareDriverUnlock(driver);
return dom;
}
@@ -446,8 +445,7 @@ vmwareDomainShutdownFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
vmwareDriverUnlock(driver);
return ret;
}
@@ -515,8 +513,7 @@ vmwareDomainSuspend(virDomainPtr dom)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -564,8 +561,7 @@ vmwareDomainResume(virDomainPtr dom)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -612,8 +608,7 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -685,8 +680,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml,
virDomainDefFree(vmdef);
VIR_FREE(vmx);
VIR_FREE(vmxPath);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
vmwareDriverUnlock(driver);
return dom;
}
@@ -723,8 +717,7 @@ vmwareDomainCreateWithFlags(virDomainPtr dom,
ret = vmwareStartVM(driver, vm);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
vmwareDriverUnlock(driver);
return ret;
}
@@ -776,8 +769,7 @@ vmwareDomainUndefineFlags(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
vmwareDriverUnlock(driver);
return ret;
}
@@ -809,8 +801,7 @@ vmwareDomainLookupByID(virConnectPtr conn, int id)
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -833,8 +824,7 @@ vmwareDomainGetOSType(virDomainPtr dom)
ignore_value(VIR_STRDUP(ret, vm->def->os.type));
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -860,8 +850,7 @@ vmwareDomainLookupByUUID(virConnectPtr conn, const unsigned char
*uuid)
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -886,8 +875,7 @@ vmwareDomainLookupByName(virConnectPtr conn, const char *name)
dom->id = vm->def->id;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return dom;
}
@@ -908,8 +896,7 @@ vmwareDomainIsActive(virDomainPtr dom)
ret = virDomainObjIsActive(obj);
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -931,8 +918,7 @@ vmwareDomainIsPersistent(virDomainPtr dom)
ret = obj->persistent;
cleanup:
- if (obj)
- virObjectUnlock(obj);
+ virObjectUnlock(obj);
return ret;
}
@@ -959,8 +945,7 @@ vmwareDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
ret = virDomainDefFormat(vm->def, flags);
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1095,8 +1080,7 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info)
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
@@ -1129,8 +1113,7 @@ vmwareDomainGetState(virDomainPtr dom,
ret = 0;
cleanup:
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
return ret;
}
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 11/12] util: virObjectUnlock usage cleanup
---
src/util/virclosecallbacks.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c
index 4f26172..b6eb5b5 100644
--- a/src/util/virclosecallbacks.c
+++ b/src/util/virclosecallbacks.c
@@ -343,8 +343,7 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks,
}
vm = list->entries[i].callback(vm, conn, opaque);
- if (vm)
- virObjectUnlock(vm);
+ virObjectUnlock(vm);
}
VIR_FREE(list->entries);
VIR_FREE(list);
--
1.9.0
8:27 p.m.
New subject: [libvirt] [PATCH 12/12] maint: add virObjectUnlock to useless_free_options
Add virObjectUnlock() to a list of functions
checking argument for NULL is useless for
---
cfg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/cfg.mk b/cfg.mk
index 5ff2721..3ac67a8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -163,6 +163,7 @@ useless_free_options = \
--name=virNetworkObjFree \
--name=virNodeDeviceDefFree \
--name=virNodeDeviceObjFree \
+ --name=virObjectUnlock \
--name=virObjectUnref \
--name=virObjectFreeCallback \
--name=virPCIDeviceFree \
--
1.9.0
12:20 a.m.
On Mon, May 19, 2014 at 10:27:29PM +0400, Roman Bogorodskiy wrote:
Background is here:
https://www.redhat.com/archives/libvir-list/2014-May/msg00613.html
See my reply there - I don't think we we should be allowing NULL to
be passed into the lock/unlock functions
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
3777
days inactive
3777
days old
13 comments
2 participants
participants (2)
-
Daniel P. Berrange -
Roman Bogorodskiy