conf: node_device: Add 'validate' argument to virNodeDeviceDefParse

Allow callers to request XML validation against the schema. All callers
for now pass 'false'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index bdfbbab4345c4231168c30647c0c343b502b4edd..f5283a77b3bb61b012d7bb305eff389015827f69 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -2479,14 +2479,15 @@ virNodeDeviceDefParse(const char *str,
                       int create,
                       const char *virt_type,
                       virNodeDeviceDefParserCallbacks *parserCallbacks,
-                      void *opaque)
+                      void *opaque,
+                      bool validate)
 {
     g_autoptr(xmlDoc) xml = NULL;
     g_autoptr(xmlXPathContext) ctxt = NULL;
     g_autoptr(virNodeDeviceDef) def = NULL;
 
     if (!(xml = virXMLParse(filename, str, _("(node_device_definition)"),
-                            "device", &ctxt, NULL, false)))
+                            "device", &ctxt, "nodedev.rng", validate)))
         return NULL;
 
     if (!(def = virNodeDeviceDefParseXML(ctxt, create, virt_type)))

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index a55635863247820202648f8e89941796eb9ff03b..2b2c8f797e2925c47e15dc3de3c09bbfeaac22ef 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -382,7 +382,8 @@ virNodeDeviceDefParse(const char *str,
                       int create,
                       const char *virt_type,
                       virNodeDeviceDefParserCallbacks *parserCallbacks,
-                      void *opaque);
+                      void *opaque,
+                      bool validate);
 
 virNodeDeviceDef *
 virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt,

diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index c154f00eea83d20cdfe2369df8d4bd52453edb27..d020b9492118974a21ba83c241ba87b219db11c0 100644 (file)
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -395,7 +395,7 @@ virDomainDriverNodeDeviceReset(virNodeDevicePtr dev,
     if (!xml)
         return -1;
 
-    def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL);
+    def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL, false);
     if (!def)
         return -1;
 
@@ -440,7 +440,7 @@ virDomainDriverNodeDeviceReAttach(virNodeDevicePtr dev,
     if (!xml)
         return -1;
 
-    def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL);
+    def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL, false);
     if (!def)
         return -1;
 
@@ -488,7 +488,7 @@ virDomainDriverNodeDeviceDetachFlags(virNodeDevicePtr dev,
     if (!xml)
         return -1;
 
-    def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL);
+    def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL, false);
     if (!def)
         return -1;
 

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 5bde05d5935744651d2bd87ce397d50ba02fd61a..73a7d641459dda716176dc1614ea105d4d21e3ce 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -888,7 +888,7 @@ nodeDeviceCreateXML(virConnectPtr conn,
     virt_type  = virConnectGetType(conn);
 
     if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, virt_type,
-                                      &driver->parserCallbacks, NULL)))
+                                      &driver->parserCallbacks, NULL, false)))
         return NULL;
 
     if (virNodeDeviceCreateXMLEnsureACL(conn, def) < 0)
@@ -1409,7 +1409,7 @@ nodeDeviceDefineXML(virConnect *conn,
     virt_type  = virConnectGetType(conn);
 
     if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, virt_type,
-                                      &driver->parserCallbacks, NULL)))
+                                      &driver->parserCallbacks, NULL, false)))
         return NULL;
 
     if (virNodeDeviceDefineXMLEnsureACL(conn, def) < 0)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 67c70de11d0c032c2f7be2aba8a6e0eda213e9e0..9b397e66b1460d633d2c0449323383d975b44055 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -7629,7 +7629,7 @@ testNodeDeviceMockCreateVport(testDriver *driver,
     if (!xml)
         goto cleanup;
 
-    if (!(def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL)))
+    if (!(def = virNodeDeviceDefParse(xml, NULL, EXISTING_DEVICE, NULL, NULL, NULL, false)))
         goto cleanup;
 
     VIR_FREE(def->name);
@@ -7691,7 +7691,7 @@ testNodeDeviceCreateXML(virConnectPtr conn,
 
     virCheckFlags(0, NULL);
 
-    if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, NULL, NULL, NULL)))
+    if (!(def = virNodeDeviceDefParse(xmlDesc, NULL, CREATE_DEVICE, NULL, NULL, NULL, false)))
         goto cleanup;
 
     /* We run this simply for validation - it essentially validates that

diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c
index 02e85d4779115dce27a4d5d6b0d014ad275cb9e0..4dc524b5a549b06adbf33100f4b65015a745e314 100644 (file)
--- a/tests/nodedevmdevctltest.c
+++ b/tests/nodedevmdevctltest.c
@@ -71,7 +71,7 @@ testMdevctlCmd(virMdevctlCommand cmd_type,
     }
 
     if (!(def = virNodeDeviceDefParse(NULL, mdevxml, create, VIRT_TYPE,
-                                      &parser_callbacks, NULL)))
+                                      &parser_callbacks, NULL, false)))
         return -1;
 
     /* this function will set a stdin buffer containing the json configuration
@@ -143,7 +143,7 @@ testMdevctlAutostart(const void *data G_GNUC_UNUSED)
     g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
 
     if (!(def = virNodeDeviceDefParse(NULL, mdevxml, CREATE_DEVICE, VIRT_TYPE,
-                                      &parser_callbacks, NULL)))
+                                      &parser_callbacks, NULL, false)))
         return -1;
 
     virCommandSetDryRun(dryRunToken, &buf, true, true, NULL, NULL);

diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index d1c0652e7df3f607191a334e317f06b67f3e4e53..068ec6876909200d056f52b3e66723fdffc5752d 100644 (file)
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -23,7 +23,8 @@ testCompareXMLToXMLFiles(const char *xml, const char *outfile)
     if (virTestLoadFile(xml, &xmlData) < 0)
         goto fail;
 
-    if (!(dev = virNodeDeviceDefParse(xmlData, NULL, EXISTING_DEVICE, NULL, NULL, NULL)))
+    if (!(dev = virNodeDeviceDefParse(xmlData, NULL, EXISTING_DEVICE, NULL,
+                                      NULL, NULL, false)))
         goto fail;
 
     /* Calculate some things that are not read in */