]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: Pass the whole device info struct to virDomainDeviceBootParseXML
authorPeter Krempa <pkrempa@redhat.com>
Tue, 29 Mar 2016 10:01:39 +0000 (12:01 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 6 Apr 2016 07:27:23 +0000 (09:27 +0200)
No need to extract the single element.

src/conf/domain_conf.c

index d4c78fdb9fbb3d7c491dd9f2e413db97a8ee4730..3dd81197b7f5c0f2674abc1bddb061cca8605d25 100644 (file)
@@ -4816,7 +4816,7 @@ virDomainDeviceUSBMasterParseXML(xmlNodePtr node,
 
 static int
 virDomainDeviceBootParseXML(xmlNodePtr node,
-                            int *bootIndex,
+                            virDomainDeviceInfoPtr info,
                             virHashTablePtr bootHash)
 {
     char *order;
@@ -4848,7 +4848,7 @@ virDomainDeviceBootParseXML(xmlNodePtr node,
             goto cleanup;
     }
 
-    *bootIndex = boot;
+    info->bootIndex = boot;
     ret = 0;
 
  cleanup:
@@ -4981,7 +4981,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node,
     }
 
     if (boot) {
-        if (virDomainDeviceBootParseXML(boot, &info->bootIndex, bootHash))
+        if (virDomainDeviceBootParseXML(boot, info, bootHash))
             goto cleanup;
     }