NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Rewrite vboxConnectClose

Browse Source
This commit is contained in:
Taowei 2014-08-11 18:06:05 +08:00 committed by Michal Privoznik
parent 7f0f415b87
commit c6084f19d0
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/vbox/vbox_common.c
View File

@ -289,3 +289,14 @@ virDrvOpenStatus vboxConnectOpen(virConnectPtr conn,
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
int vboxConnectClose(virConnectPtr conn)
{
vboxGlobalData *data = conn->privateData;
VIR_DEBUG("%s: in vboxClose", conn->driver->name);
vboxUninitialize(data);
conn->privateData = NULL;
return 0;
}

29
src/vbox/vbox_tmpl.c
View File

@ -834,35 +834,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
return result; return result;
} }
static void vboxUninitialize(vboxGlobalData *data)
{
if (!data)
return;
if (data->pFuncs)
data->pFuncs->pfnComUninitialize();
virObjectUnref(data->caps);
virObjectUnref(data->xmlopt);
#if VBOX_API_VERSION == 2002000
/* No domainEventCallbacks in 2.2.* version */
#else /* !(VBOX_API_VERSION == 2002000) */
virObjectEventStateFree(data->domainEvents);
#endif /* !(VBOX_API_VERSION == 2002000) */
VIR_FREE(data);
}
static int vboxConnectClose(virConnectPtr conn)
{
vboxGlobalData *data = conn->privateData;
VIR_DEBUG("%s: in vboxClose", conn->driver->name);
vboxUninitialize(data);
conn->privateData = NULL;
return 0;
}
static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version)
{ {
vboxGlobalData *data = conn->privateData; vboxGlobalData *data = conn->privateData;

1
src/vbox/vbox_uniformed_api.h
View File

@ -137,6 +137,7 @@ typedef struct {
virDrvOpenStatus vboxConnectOpen(virConnectPtr conn, virDrvOpenStatus vboxConnectOpen(virConnectPtr conn,
virConnectAuthPtr auth, virConnectAuthPtr auth,
unsigned int flags); unsigned int flags);
int vboxConnectClose(virConnectPtr conn);
/* Version specified functions for installing uniformed API */ /* Version specified functions for installing uniformed API */
void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);