From 0fc1fde20b419a9fb31c4d94c006da4cb2a3271b Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 26 May 2016 17:43:33 +0200
Subject: [PATCH] conf: drop 'def' from struct
 virDomainDefPostParseDeviceIteratorData

It's passed to all places along with the structure.
---
 src/conf/domain_conf.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7a6c021073..1e8cffeb50 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4413,7 +4413,6 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 
 
 struct virDomainDefPostParseDeviceIteratorData {
-    virDomainDefPtr def;
     virCapsPtr caps;
     virDomainXMLOptionPtr xmlopt;
     unsigned int parseFlags;
@@ -4421,13 +4420,13 @@ struct virDomainDefPostParseDeviceIteratorData {
 
 
 static int
-virDomainDefPostParseDeviceIterator(virDomainDefPtr def ATTRIBUTE_UNUSED,
+virDomainDefPostParseDeviceIterator(virDomainDefPtr def,
                                     virDomainDeviceDefPtr dev,
                                     virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED,
                                     void *opaque)
 {
     struct virDomainDefPostParseDeviceIteratorData *data = opaque;
-    return virDomainDeviceDefPostParse(dev, data->def, data->caps,
+    return virDomainDeviceDefPostParse(dev, def, data->caps,
                                        data->parseFlags, data->xmlopt);
 }
 
@@ -4470,7 +4469,7 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
 
         /* videos[0] might have been added in AddImplicitDevices, after we've
          * done the per-device post-parse */
-        if (virDomainDefPostParseDeviceIterator(NULL, &device, NULL, data) < 0)
+        if (virDomainDefPostParseDeviceIterator(def, &device, NULL, data) < 0)
             return -1;
     }
 
@@ -4489,7 +4488,6 @@ virDomainDefPostParse(virDomainDefPtr def,
 {
     int ret;
     struct virDomainDefPostParseDeviceIteratorData data = {
-        .def = def,
         .caps = caps,
         .xmlopt = xmlopt,
         .parseFlags = parseFlags,