提交 6e6faf6d 编写于 作者: M Martin Kletzander

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

This will help us to get to some data more easily.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
上级 867bcc9c
...@@ -33,7 +33,7 @@ ...@@ -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;
......
...@@ -3032,7 +3032,8 @@ virDomainObjNew(virDomainXMLOptionPtr xmlopt) ...@@ -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;
} }
......
...@@ -2562,7 +2562,7 @@ struct _virDomainDefParserConfig { ...@@ -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,
......
...@@ -206,7 +206,7 @@ libxlDomainJobUpdateTime(struct libxlDomainJobObj *job) ...@@ -206,7 +206,7 @@ libxlDomainJobUpdateTime(struct libxlDomainJobObj *job)
} }
static void * static void *
libxlDomainObjPrivateAlloc(void) libxlDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
libxlDomainObjPrivatePtr priv; libxlDomainObjPrivatePtr priv;
......
...@@ -150,7 +150,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, ...@@ -150,7 +150,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
static void * static void *
virLXCDomainObjPrivateAlloc(void) virLXCDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
virLXCDomainObjPrivatePtr priv; virLXCDomainObjPrivatePtr priv;
......
...@@ -1662,7 +1662,7 @@ qemuDomainClearPrivatePaths(virDomainObjPtr vm) ...@@ -1662,7 +1662,7 @@ qemuDomainClearPrivatePaths(virDomainObjPtr vm)
static void * static void *
qemuDomainObjPrivateAlloc(void) qemuDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
......
...@@ -90,7 +90,7 @@ static int umlProcessAutoDestroyRemove(struct uml_driver *driver, ...@@ -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;
......
...@@ -60,7 +60,7 @@ vmwareDriverUnlock(struct vmware_driver *driver) ...@@ -60,7 +60,7 @@ vmwareDriverUnlock(struct vmware_driver *driver)
} }
static void * static void *
vmwareDataAllocFunc(void) vmwareDataAllocFunc(void *opaque ATTRIBUTE_UNUSED)
{ {
vmwareDomainPtr dom; vmwareDomainPtr dom;
......
...@@ -581,7 +581,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr) ...@@ -581,7 +581,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr)
} }
void* void*
vzDomObjAlloc(void) vzDomObjAlloc(void *opaque ATTRIBUTE_UNUSED)
{ {
vzDomObjPtr pdom = NULL; vzDomObjPtr pdom = NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册