From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 29 Mar 2016 10:01:39 +0000 (+0200)
Subject: conf: Pass the whole device info struct to virDomainDeviceBootParseXML
X-Git-Tag: v1.3.4-rc1~347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=836bf4ba7c49ef57eef4263322499cc4a0e8d2f9;p=thirdparty%2Flibvirt.git

conf: Pass the whole device info struct to virDomainDeviceBootParseXML

No need to extract the single element.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d4c78fdb9f..3dd81197b7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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;
     }