Implement empty post parse callbacks for all drivers

To allow easy implementation of a callback check this patch adds empty
post parse callbacks to drivers that were missing them.

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 7c7bec378d44a86d94920b7eef0da9ea79ed7da0..ecb1758fc3431bfef01dcf04c3bbc77ab34be96f 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -70,6 +70,16 @@ bhyveDomainDefPostParse(virDomainDefPtr def,
     return 0;
 }
 
+static int
+bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+                              const virDomainDef *def ATTRIBUTE_UNUSED,
+                              virCapsPtr caps ATTRIBUTE_UNUSED,
+                              void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
 virDomainDefParserConfig virBhyveDriverDomainDefParserConfig = {
+    .devicesPostParseCallback = bhyveDomainDeviceDefPostParse,
     .domainPostParseCallback = bhyveDomainDefPostParse,
 };

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 516a296eb62265dd4903a1dc6c521ef8ae6f0b27..04c4bb363ec4f9a3d05d1212e7ff2dd9dca7b7fe 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -915,8 +915,29 @@ parallelsLoadDomains(parallelsConnPtr privconn, const char *domain_name)
 }
 
 
+static int
+parallelsDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                            virCapsPtr caps ATTRIBUTE_UNUSED,
+                            void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
+static int
+parallelsDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+                                  const virDomainDef *def ATTRIBUTE_UNUSED,
+                                  virCapsPtr caps ATTRIBUTE_UNUSED,
+                                  void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
 virDomainDefParserConfig parallelsDomainDefParserConfig = {
     .macPrefix = {0x42, 0x1C, 0x00},
+    .devicesPostParseCallback = parallelsDomainDeviceDefPostParse,
+    .domainPostParseCallback = parallelsDomainDefPostParse,
 };
 
 

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 25f7f2d828f1b676b36e2f043c016bc71780b2d2..6a5a5607e2929bba692eec2a6b3798525ca3ec8e 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1054,6 +1054,32 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
     return session;
 }
 
+
+static int
+phypDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                       virCapsPtr caps ATTRIBUTE_UNUSED,
+                       void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
+static int
+phypDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+                             const virDomainDef *def ATTRIBUTE_UNUSED,
+                             virCapsPtr caps ATTRIBUTE_UNUSED,
+                             void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
+virDomainDefParserConfig virPhypDriverDomainDefParserConfig = {
+    .devicesPostParseCallback = phypDomainDeviceDefPostParse,
+    .domainPostParseCallback = phypDomainDefPostParse,
+};
+
+
 static virDrvOpenStatus
 phypConnectOpen(virConnectPtr conn,
                 virConnectAuthPtr auth, unsigned int flags)
@@ -1131,7 +1157,8 @@ phypConnectOpen(virConnectPtr conn,
     if ((phyp_driver->caps = phypCapsInit()) == NULL)
         goto failure;
 
-    if (!(phyp_driver->xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)))
+    if (!(phyp_driver->xmlopt = virDomainXMLOptionNew(&virPhypDriverDomainDefParserConfig,
+                                                      NULL, NULL)))
         goto failure;
 
     conn->privateData = phyp_driver;

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 2a401497bc40e5a507d523c40797d7b46fe0b61f..7e25861d21cd6bb5021a203369a1b5940385f4f6 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -444,8 +444,18 @@ umlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 }
 
 
+static int
+umlDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                      virCapsPtr caps ATTRIBUTE_UNUSED,
+                      void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
 virDomainDefParserConfig umlDriverDomainDefParserConfig = {
     .devicesPostParseCallback = umlDomainDeviceDefPostParse,
+    .domainPostParseCallback = umlDomainDefPostParse,
 };
 
 

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 44270ffcf988b0964aec24a8153483720d0ea946..2170dc128a3b53786372dc1464a565a3bd1ab08a 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -314,8 +314,27 @@ static char *vboxGenerateMediumName(PRUint32  storageBus,
     return name;
 }
 
+static int
+vboxDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                       virCapsPtr caps ATTRIBUTE_UNUSED,
+                       void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+static int
+vboxDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+                             const virDomainDef *def ATTRIBUTE_UNUSED,
+                             virCapsPtr caps ATTRIBUTE_UNUSED,
+                             void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
 static virDomainDefParserConfig vboxDomainDefParserConfig = {
     .macPrefix = { 0x08, 0x00, 0x27 },
+    .devicesPostParseCallback = vboxDomainDeviceDefPostParse,
+    .domainPostParseCallback = vboxDomainDefPostParse,
 };
 
 static virDomainXMLOptionPtr

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 6edc0bc63583e5cffb6588b249dd51d3fbd7902c..22ce3a3af94ba8aa9b5eaf711559c78c8ba5734d 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -82,13 +82,35 @@ vmwareDataFreeFunc(void *data)
     VIR_FREE(dom);
 }
 
+static int
+vmwareDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                         virCapsPtr caps ATTRIBUTE_UNUSED,
+                         void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+static int
+vmwareDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+                               const virDomainDef *def ATTRIBUTE_UNUSED,
+                               virCapsPtr caps ATTRIBUTE_UNUSED,
+                               void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+virDomainDefParserConfig vmwareDomainDefParserConfig = {
+    .devicesPostParseCallback = vmwareDomainDeviceDefPostParse,
+    .domainPostParseCallback = vmwareDomainDefPostParse,
+};
+
 static virDomainXMLOptionPtr
 vmwareDomainXMLConfigInit(void)
 {
     virDomainXMLPrivateDataCallbacks priv = { .alloc = vmwareDataAllocFunc,
                                               .free = vmwareDataFreeFunc };
 
-    return virDomainXMLOptionNew(NULL, &priv, NULL);
+    return virDomainXMLOptionNew(&vmwareDomainDefParserConfig, &priv, NULL);
 }
 
 static virDrvOpenStatus

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index cd6c51e7529c6061a747e6f3712dca9c702353de..389a01234fd6fc8ff223d4f6563231178d3b0761 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -523,10 +523,28 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Helpers
  */
+static int
+vmxDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                      virCapsPtr caps ATTRIBUTE_UNUSED,
+                      void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+static int
+vmxDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+                            const virDomainDef *def ATTRIBUTE_UNUSED,
+                            virCapsPtr caps ATTRIBUTE_UNUSED,
+                            void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
 
 virDomainDefParserConfig virVMXDomainDefParserConfig = {
     .hasWideSCSIBus = true,
     .macPrefix = {0x00, 0x0c, 0x29},
+    .devicesPostParseCallback = vmxDomainDeviceDefPostParse,
+    .domainPostParseCallback = vmxDomainDefPostParse,
 };
 
 

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index e4fa7cde68a94c7f1eeb6712b83c32fbf7669eee..a44834798b4c4fc67df62810484ff9a94f1efe01 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -69,8 +69,18 @@ xenapiDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 }
 
 
+static int
+xenapiDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED,
+                         virCapsPtr caps ATTRIBUTE_UNUSED,
+                         void *opaque ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
 virDomainDefParserConfig xenapiDomainDefParserConfig = {
     .devicesPostParseCallback = xenapiDomainDeviceDefPostParse,
+    .domainPostParseCallback = xenapiDomainDefPostParse,
 };