shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-08-27 21:50:11 +03:00
Code Releases Activity

conf: Pass config.priv to xmlopt->privateData.alloc

Browse Source 
This will help us to get to some data more easily.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander
2017-07-21 15:29:00 +02:00
parent 867bcc9c78
commit 6e6faf6d62
9 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_domain.c
View File

@ -33,7 +33,7 @@
VIR_LOG_INIT("bhyve.bhyve_domain"); VIR_LOG_INIT("bhyve.bhyve_domain");
static void * static void *
bhyveDomainObjPrivateAlloc(void) bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
bhyveDomainObjPrivatePtr priv; bhyveDomainObjPrivatePtr priv;

3
src/conf/domain_conf.c
View File

@ -3032,7 +3032,8 @@ virDomainObjNew(virDomainXMLOptionPtr xmlopt)
} }
if (xmlopt->privateData.alloc) { if (xmlopt->privateData.alloc) {
if (!(domain->privateData = (xmlopt->privateData.alloc)())) domain->privateData = (xmlopt->privateData.alloc)(xmlopt->config.priv);
if (!domain->privateData)
goto error; goto error;
domain->privateDataFreeFunc = xmlopt->privateData.free; domain->privateDataFreeFunc = xmlopt->privateData.free;
} }

2
src/conf/domain_conf.h
View File

@ -2562,7 +2562,7 @@ struct _virDomainDefParserConfig {
unsigned char macPrefix[VIR_MAC_PREFIX_BUFLEN]; unsigned char macPrefix[VIR_MAC_PREFIX_BUFLEN];
}; };
typedef void *(*virDomainXMLPrivateDataAllocFunc)(void); typedef void *(*virDomainXMLPrivateDataAllocFunc)(void *);
typedef void (*virDomainXMLPrivateDataFreeFunc)(void *); typedef void (*virDomainXMLPrivateDataFreeFunc)(void *);
typedef virObjectPtr (*virDomainXMLPrivateDataNewFunc)(void); typedef virObjectPtr (*virDomainXMLPrivateDataNewFunc)(void);
typedef int (*virDomainXMLPrivateDataFormatFunc)(virBufferPtr, typedef int (*virDomainXMLPrivateDataFormatFunc)(virBufferPtr,

2
src/libxl/libxl_domain.c
View File

@ -206,7 +206,7 @@ libxlDomainJobUpdateTime(struct libxlDomainJobObj *job)
} }
static void * static void *
libxlDomainObjPrivateAlloc(void) libxlDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
libxlDomainObjPrivatePtr priv; libxlDomainObjPrivatePtr priv;

2
src/lxc/lxc_domain.c
View File

@ -150,7 +150,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
static void * static void *
virLXCDomainObjPrivateAlloc(void) virLXCDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
virLXCDomainObjPrivatePtr priv; virLXCDomainObjPrivatePtr priv;

2
src/qemu/qemu_domain.c
View File

@ -1662,7 +1662,7 @@ qemuDomainClearPrivatePaths(virDomainObjPtr vm)
static void * static void *
qemuDomainObjPrivateAlloc(void) qemuDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;

2
src/uml/uml_driver.c
View File

@ -90,7 +90,7 @@ static int umlProcessAutoDestroyRemove(struct uml_driver *driver,
static int umlStateCleanup(void); static int umlStateCleanup(void);
static void *umlDomainObjPrivateAlloc(void) static void *umlDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
umlDomainObjPrivatePtr priv; umlDomainObjPrivatePtr priv;

2
src/vmware/vmware_driver.c
View File

@ -60,7 +60,7 @@ vmwareDriverUnlock(struct vmware_driver *driver)
} }
static void * static void *
vmwareDataAllocFunc(void) vmwareDataAllocFunc(void *opaque ATTRIBUTE_UNUSED)
{ {
vmwareDomainPtr dom; vmwareDomainPtr dom;

2
src/vz/vz_utils.c
View File

@ -581,7 +581,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr)
} }
void* void*
vzDomObjAlloc(void) vzDomObjAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
vzDomObjPtr pdom = NULL; vzDomObjPtr pdom = NULL;