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

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

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 71764554eb11c4443faf689dfb9baf99ce229910..3c23441969497d6eb1ceb48748d679cb2ae2d45c 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -33,7 +33,7 @@
 VIR_LOG_INIT("bhyve.bhyve_domain");
 
 static void *
-bhyveDomainObjPrivateAlloc(void)
+bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
 {
     bhyveDomainObjPrivatePtr priv;
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 02373c7c7c0803631ea1eaf1e67cb19d5b408861..b07b553ca03f90e91afdb02a8a03c73d32df8756 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3032,7 +3032,8 @@ virDomainObjNew(virDomainXMLOptionPtr xmlopt)
     }
 
     if (xmlopt->privateData.alloc) {
-        if (!(domain->privateData = (xmlopt->privateData.alloc)()))
+        domain->privateData = (xmlopt->privateData.alloc)(xmlopt->config.priv);
+        if (!domain->privateData)
             goto error;
         domain->privateDataFreeFunc = xmlopt->privateData.free;
     }

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a2e8f67658c87939171ca7b329316847fb8f8dc3..e1586fdfba41827ee933ac2282061368c2141002 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2562,7 +2562,7 @@ struct _virDomainDefParserConfig {
     unsigned char macPrefix[VIR_MAC_PREFIX_BUFLEN];
 };
 
-typedef void *(*virDomainXMLPrivateDataAllocFunc)(void);
+typedef void *(*virDomainXMLPrivateDataAllocFunc)(void *);
 typedef void (*virDomainXMLPrivateDataFreeFunc)(void *);
 typedef virObjectPtr (*virDomainXMLPrivateDataNewFunc)(void);
 typedef int (*virDomainXMLPrivateDataFormatFunc)(virBufferPtr,

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 68a501cf166419e6803915be713fe9ab3c483efe..7caa6747494aac637eb6d5ad7961f30c27953001 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -206,7 +206,7 @@ libxlDomainJobUpdateTime(struct libxlDomainJobObj *job)
 }
 
 static void *
-libxlDomainObjPrivateAlloc(void)
+libxlDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
 {
     libxlDomainObjPrivatePtr priv;
 

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 3a7404f407c9da34fe50f6bf3a791c84bae3dd7b..7c1386e40c823915f6c1738ff008824794f1a77d 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -150,7 +150,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED,
 
 
 static void *
-virLXCDomainObjPrivateAlloc(void)
+virLXCDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
 {
     virLXCDomainObjPrivatePtr priv;
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3d7976543119dc61b258b35f6302630bf128ac26..8e4061c7eb27bae03320db36bd537cea6dad7e35 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1662,7 +1662,7 @@ qemuDomainClearPrivatePaths(virDomainObjPtr vm)
 
 
 static void *
-qemuDomainObjPrivateAlloc(void)
+qemuDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
 {
     qemuDomainObjPrivatePtr priv;
 

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 224b71984250e045da1ce83f33e346608ebcc8f3..1846835cc659de6c791d3efca71d881adc7b452d 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -90,7 +90,7 @@ static int umlProcessAutoDestroyRemove(struct uml_driver *driver,
 
 static int umlStateCleanup(void);
 
-static void *umlDomainObjPrivateAlloc(void)
+static void *umlDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
 {
     umlDomainObjPrivatePtr priv;
 

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 0ee1c5bb983b12c5919413620335adbe2786deb3..8b487c4a7ce034c433b2544aced5d19c93280f66 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -60,7 +60,7 @@ vmwareDriverUnlock(struct vmware_driver *driver)
 }
 
 static void *
-vmwareDataAllocFunc(void)
+vmwareDataAllocFunc(void *opaque ATTRIBUTE_UNUSED)
 {
     vmwareDomainPtr dom;
 

diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c
index a6d7b93cbc508efdded59d1852b0ed994d61fb6d..770b499c9286321b4f034742f9a11aa3d578d276 100644 (file)
--- a/src/vz/vz_utils.c
+++ b/src/vz/vz_utils.c
@@ -581,7 +581,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr)
 }
 
 void*
-vzDomObjAlloc(void)
+vzDomObjAlloc(void *opaque ATTRIBUTE_UNUSED)
 {
     vzDomObjPtr pdom = NULL;