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

vbox: Remove old unflexible macros

Browse Source 
The VBOX_SESSION_OPEN/CLOSE macros are only called in
_vboxDomainSnapshotRestore and they are unflexible because:

* assume the caller will have variable named "data"
* can only create Write lock type

As per above, it's not that hard to simply use the VBOX API directly.
This commit is contained in:
Dawid Zamirski 2017-10-24 17:09:15 -04:00 committed by John Ferlan
parent f4973d1ea8
commit 32845fd656
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vbox/vbox_tmpl.c
View File

@ -144,12 +144,6 @@ if (strUtf16) {\
(unsigned)(iid)->m3[7]);\
}\
#define VBOX_SESSION_OPEN(/* unused */ iid_value, /* in */ machine) \
machine->vtbl->LockMachine(machine, data->vboxSession, LockType_Write)
#define VBOX_SESSION_CLOSE() \
data->vboxSession->vtbl->UnlockMachine(data->vboxSession)
#define VBOX_IID_INITIALIZER { NULL, true }
static void
@ -323,7 +317,7 @@ _vboxDomainSnapshotRestore(virDomainPtr dom,
goto cleanup;
}
rc = VBOX_SESSION_OPEN(domiid.value, machine);
rc = machine->vtbl->LockMachine(machine, data->vboxSession, LockType_Write);
#if VBOX_API_VERSION < 5000000
if (NS_SUCCEEDED(rc))
rc = data->vboxSession->vtbl->GetConsole(data->vboxSession, &console);
@ -368,7 +362,7 @@ _vboxDomainSnapshotRestore(virDomainPtr dom,
#if VBOX_API_VERSION < 5000000
VBOX_RELEASE(console);
#endif /*VBOX_API_VERSION < 5000000*/
VBOX_SESSION_CLOSE();
data->vboxSession->vtbl->UnlockMachine(data->vboxSession);
vboxIIDUnalloc(&domiid);
return ret;
}