External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 07:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbox_common: Use automatic mutex management

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-03-24 13:20:50 +01:00
parent a38f4d53f8
commit 61d51f2d15
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/vbox/vbox_common.c
View File

@ -602,11 +602,10 @@ vboxDomainSave(virDomainPtr dom, const char *path G_GNUC_UNUSED)
static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version)
{ {
struct _vboxDriver *data = conn->privateData; struct _vboxDriver *data = conn->privateData;
VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name); VIR_LOCK_GUARD lock = virObjectLockGuard(data);
virObjectLock(data); VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name);
*version = data->version; *version = data->version;
virObjectUnlock(data);
return 0; return 0;
} }
@ -664,16 +663,12 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED)
static char *vboxConnectGetCapabilities(virConnectPtr conn) static char *vboxConnectGetCapabilities(virConnectPtr conn)
{ {
struct _vboxDriver *data = conn->privateData; struct _vboxDriver *data = conn->privateData;
char *ret = NULL; VIR_LOCK_GUARD lock = virObjectLockGuard(data);
if (!data->vboxObj) if (!data->vboxObj)
return ret; return NULL;
virObjectLock(data); return virCapabilitiesFormatXML(data->caps);
ret = virCapabilitiesFormatXML(data->caps);
virObjectUnlock(data);
return ret;
} }
static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids)
@ -7568,13 +7563,13 @@ vboxNodeGetFreePages(virConnectPtr conn,
unsigned int flags) unsigned int flags)
{ {
struct _vboxDriver *driver = conn->privateData; struct _vboxDriver *driver = conn->privateData;
int lastCell; int lastCell = -1;
virCheckFlags(0, -1); virCheckFlags(0, -1);
virObjectLock(driver); VIR_WITH_OBJECT_LOCK_GUARD(driver) {
lastCell = virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa); lastCell = virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa);
virObjectUnlock(driver); }
return virHostMemGetFreePages(npages, pages, startCell, return virHostMemGetFreePages(npages, pages, startCell,
cellCount, lastCell, counts); cellCount, lastCell, counts);
@ -7590,14 +7585,14 @@ vboxNodeAllocPages(virConnectPtr conn G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
struct _vboxDriver *driver = conn->privateData; struct _vboxDriver *driver = conn->privateData;
int lastCell; int lastCell = -1;
bool add = !(flags & VIR_NODE_ALLOC_PAGES_SET); bool add = !(flags & VIR_NODE_ALLOC_PAGES_SET);
virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1);
virObjectLock(driver); VIR_WITH_OBJECT_LOCK_GUARD(driver) {
lastCell = virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa); lastCell = virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa);
virObjectUnlock(driver); }
return virHostMemAllocPages(npages, pageSizes, pageCounts, return virHostMemAllocPages(npages, pageSizes, pageCounts,
startCell, cellCount, lastCell, add); startCell, cellCount, lastCell, add);