virDomainDefCopy: Introduce @parseOpaque argument

We want to pass the proper opaque pointer instead of NULL to
virDomainDefParseString.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6f5bf2eb08b4be9687555f61f0857cdca90ef743..1d8d7c17b028c47f1ad26995c0d62838e42825bc 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2973,7 +2973,7 @@ virDomainObjSetDefTransient(virCapsPtr caps,
     if (domain->newDef)
         return 0;
 
-    if (!(domain->newDef = virDomainDefCopy(domain->def, caps, xmlopt, false)))
+    if (!(domain->newDef = virDomainDefCopy(domain->def, caps, xmlopt, NULL, false)))
         goto out;
 
     ret = 0;
@@ -24661,6 +24661,7 @@ virDomainDefPtr
 virDomainDefCopy(virDomainDefPtr src,
                  virCapsPtr caps,
                  virDomainXMLOptionPtr xmlopt,
+                 void *parseOpaque,
                  bool migratable)
 {
     char *xml;
@@ -24676,7 +24677,7 @@ virDomainDefCopy(virDomainDefPtr src,
     if (!(xml = virDomainDefFormat(src, caps, format_flags)))
         return NULL;
 
-    ret = virDomainDefParseString(xml, caps, xmlopt, NULL, parse_flags);
+    ret = virDomainDefParseString(xml, caps, xmlopt, parseOpaque, parse_flags);
 
     VIR_FREE(xml);
     return ret;
@@ -24690,7 +24691,7 @@ virDomainObjCopyPersistentDef(virDomainObjPtr dom,
     virDomainDefPtr cur;
 
     cur = virDomainObjGetPersistentDef(caps, xmlopt, dom);
-    return virDomainDefCopy(cur, caps, xmlopt, false);
+    return virDomainDefCopy(cur, caps, xmlopt, NULL, false);
 }
 
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3acfc98e9923537824826ab14744f11803c1d082..1ea69d9e6d7c30a89752e80cc806a423bed01e59 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2604,6 +2604,7 @@ virDomainDefPtr virDomainObjGetOneDef(virDomainObjPtr vm, unsigned int flags);
 virDomainDefPtr virDomainDefCopy(virDomainDefPtr src,
                                  virCapsPtr caps,
                                  virDomainXMLOptionPtr xmlopt,
+                                 void *parseOpaque,
                                  bool migratable);
 virDomainDefPtr virDomainObjCopyPersistentDef(virDomainObjPtr dom,
                                               virCapsPtr caps,

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 50385fd978572f3b55f8688bf5bf2bb47a9b4d1e..fb63a035d85d0773038de57017bc1e78cff0c3fe 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -1365,8 +1365,8 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver,
     libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
     bool ret = false;
 
-    if (!(migratableDefSrc = virDomainDefCopy(src, cfg->caps, driver->xmlopt, true)) ||
-        !(migratableDefDst = virDomainDefCopy(dst, cfg->caps, driver->xmlopt, true)))
+    if (!(migratableDefSrc = virDomainDefCopy(src, cfg->caps, driver->xmlopt, NULL, true)) ||
+        !(migratableDefDst = virDomainDefCopy(dst, cfg->caps, driver->xmlopt, NULL, true)))
         goto cleanup;
 
     ret = virDomainDefCheckABIStability(migratableDefSrc, migratableDefDst);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9f67eaf283ccb4cdf00cf6ef076ea5341a28abc7..97f8993aa7f31935dafa91b6aa7941175de239e2 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3391,7 +3391,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
     if (!(flags & (VIR_DOMAIN_XML_UPDATE_CPU | VIR_DOMAIN_XML_MIGRATABLE)))
         goto format;
 
-    if (!(copy = virDomainDefCopy(def, caps, driver->xmlopt,
+    if (!(copy = virDomainDefCopy(def, caps, driver->xmlopt, NULL,
                                   flags & VIR_DOMAIN_XML_MIGRATABLE)))
         goto cleanup;
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8adf8804ab96df59362066595d12012a461a64a8..eaea96f8cb95a25d6abbc68be661b8c3ef9cfa56 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15232,7 +15232,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
      * than inactive xml?  */
     snap->def->current = true;
     if (snap->def->dom) {
-        config = virDomainDefCopy(snap->def->dom, caps, driver->xmlopt, true);
+        config = virDomainDefCopy(snap->def->dom, caps,
+                                  driver->xmlopt, NULL, true);
         if (!config)
             goto endjob;
     }

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index bf5c1b0294fe61ded0a3f3170f11bc2a038ce79f..a382d89a310a2faf1cdf65987f106d203417b7a4 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -6416,6 +6416,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
         if (!(def->dom = virDomainDefCopy(vm->def,
                                           privconn->caps,
                                           privconn->xmlopt,
+                                          NULL,
                                           true)))
             goto cleanup;
 
@@ -6670,8 +6671,8 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
     }
 
     snap->def->current = true;
-    config = virDomainDefCopy(snap->def->dom,
-                              privconn->caps, privconn->xmlopt, true);
+    config = virDomainDefCopy(snap->def->dom, privconn->caps,
+                              privconn->xmlopt, NULL, true);
     if (!config)
         goto cleanup;
 

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 8335078f309728d62a637c43240bc345c9403d14..10c9097d7794e29bb616e6afecf65dfd14a2a283 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -517,6 +517,7 @@ xenXMDomainGetXMLDesc(virConnectPtr conn,
     ret = virDomainDefCopy(entry->def,
                            priv->caps,
                            priv->xmlopt,
+                           NULL,
                            false);
 
  cleanup: