From cf198684a8e389be015d93a887357064f45ba993 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 23 Sep 2016 11:04:39 +0200
Subject: [PATCH] conf: Extend virDomainDefAssignAddressesCallback for
 parseOpaque

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/domain_conf.c | 3 ++-
 src/conf/domain_conf.h | 8 ++++++--
 src/qemu/qemu_domain.c | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d2052222de..b11a2965ae 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4604,7 +4604,8 @@ virDomainDefPostParse(virDomainDefPtr def,
 
     if (xmlopt->config.assignAddressesCallback) {
         ret = xmlopt->config.assignAddressesCallback(def, caps, parseFlags,
-                                                     xmlopt->config.priv);
+                                                     xmlopt->config.priv,
+                                                     parseOpaque);
         if (ret < 0)
             return ret;
     }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4ad370e0fd..7a2d62825d 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2382,11 +2382,15 @@ typedef int (*virDomainDeviceDefPostParseCallback)(virDomainDeviceDefPtr dev,
                                                    void *opaque,
                                                    void *parseOpaque);
 /* Drive callback for assigning device addresses, called at the end
- * of parsing, after all defaults and implicit devices have been added.  */
+ * of parsing, after all defaults and implicit devices have been added.
+ * @parseOpaque is opaque data passed by virDomainDefParse* caller,
+ * @opaque is opaque data set by driver (usually pointer to driver
+ * private data). */
 typedef int (*virDomainDefAssignAddressesCallback)(virDomainDef *def,
                                                    virCapsPtr caps,
                                                    unsigned int parseFlags,
-                                                   void *opaque);
+                                                   void *opaque,
+                                                   void *parseOpaque);
 
 /* Called in appropriate places where the domain conf parser can return failure
  * for configurations that were previously accepted. This shall not modify the
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e74ae07dce..6ffec55267 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2765,7 +2765,8 @@ static int
 qemuDomainDefAssignAddresses(virDomainDef *def,
                              virCapsPtr caps,
                              unsigned int parseFlags ATTRIBUTE_UNUSED,
-                             void *opaque)
+                             void *opaque,
+                             void *parseOpaque ATTRIBUTE_UNUSED)
 {
     virQEMUDriverPtr driver = opaque;
     virQEMUCapsPtr qemuCaps = NULL;
-- 
GitLab