]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: Honour flags in virDomainPanicDefParseXML
authorMartin Kletzander <mkletzan@redhat.com>
Thu, 13 Oct 2016 07:56:14 +0000 (09:56 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Fri, 14 Oct 2016 07:09:21 +0000 (09:09 +0200)
Without them we're keeping <alias/> even for inactive XML.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/conf/domain_conf.c

index 0deeb6d06cc3032a170cb705ad97e67517c4b04c..93b34e050a6741438773bfec3f336ef4dc040ec0 100644 (file)
@@ -10692,7 +10692,8 @@ virDomainTPMDefParseXML(xmlNodePtr node,
 }
 
 static virDomainPanicDefPtr
-virDomainPanicDefParseXML(xmlNodePtr node)
+virDomainPanicDefParseXML(xmlNodePtr node,
+                          unsigned int flags)
 {
     virDomainPanicDefPtr panic;
     char *model = NULL;
@@ -10700,7 +10701,7 @@ virDomainPanicDefParseXML(xmlNodePtr node)
     if (VIR_ALLOC(panic) < 0)
         return NULL;
 
-    if (virDomainDeviceInfoParseXML(node, NULL, &panic->info, 0) < 0)
+    if (virDomainDeviceInfoParseXML(node, NULL, &panic->info, flags) < 0)
         goto error;
 
     model = virXMLPropString(node, "model");
@@ -13592,7 +13593,7 @@ virDomainDeviceDefParse(const char *xmlStr,
             goto error;
         break;
     case VIR_DOMAIN_DEVICE_PANIC:
-        if (!(dev->data.panic = virDomainPanicDefParseXML(node)))
+        if (!(dev->data.panic = virDomainPanicDefParseXML(node, flags)))
             goto error;
         break;
     case VIR_DOMAIN_DEVICE_MEMORY:
@@ -17545,8 +17546,7 @@ virDomainDefParseXML(xmlDocPtr xml,
     if (n && VIR_ALLOC_N(def->panics, n) < 0)
         goto error;
     for (i = 0; i < n; i++) {
-        virDomainPanicDefPtr panic =
-            virDomainPanicDefParseXML(nodes[i]);
+        virDomainPanicDefPtr panic = virDomainPanicDefParseXML(nodes[i], flags);
         if (!panic)
             goto error;