qemu: Replace priv with qemuCaps in qemuMigrationCookieParse

QEMU capabilities is the only thing we use from priv so we can just pass
that directly.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 64c656ef2fb7101602003241145788df994e5630..49bde48c01f36f20c4b0bba804b6008120b14522 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3935,7 +3935,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver,
     if (qemuMigrationJobStartPhase(vm, phase) < 0)
         return -1;
 
-    if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv,
+    if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
+                                         priv->qemuCaps,
                                          cookiein, cookieinlen,
                                          QEMU_MIGRATION_COOKIE_STATS)))
         return -1;
@@ -4768,7 +4769,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
         }
     }
 
-    mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv,
+    mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
+                                   priv->qemuCaps,
                                    cookiein, cookieinlen,
                                    cookieFlags |
                                    QEMU_MIGRATION_COOKIE_GRAPHICS |
@@ -5058,7 +5060,8 @@ qemuMigrationSrcResume(virDomainObj *vm,
 
     VIR_DEBUG("vm=%p", vm);
 
-    mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv,
+    mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
+                                   priv->qemuCaps,
                                    cookiein, cookieinlen,
                                    QEMU_MIGRATION_COOKIE_CAPS);
     if (!mig)
@@ -6456,7 +6459,8 @@ qemuMigrationDstFinishOffline(virQEMUDriver *driver,
     qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(qemuMigrationCookie) mig = NULL;
 
-    if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv,
+    if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
+                                         priv->qemuCaps,
                                          cookiein, cookieinlen, cookie_flags)))
         return NULL;
 
@@ -6652,7 +6656,8 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
     VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d",
               vm, flags, retcode);
 
-    if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, priv,
+    if (!(mig = qemuMigrationCookieParse(driver, vm, vm->def, priv->origname,
+                                         priv->qemuCaps,
                                          cookiein, cookieinlen, cookie_flags)))
         goto error;
 

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index da12f58bda04f24d69b038e71df6241fce95041b..e151f33e991c2837150dd26b9803f1cebb3cd280 100644 (file)
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -1493,7 +1493,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver,
                          virDomainObj *vm,
                          const virDomainDef *def,
                          const char *origname,
-                         qemuDomainObjPrivate *priv,
+                         virQEMUCaps *qemuCaps,
                          const char *cookiein,
                          int cookieinlen,
                          unsigned int flags)
@@ -1514,11 +1514,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver,
         return NULL;
 
     if (cookiein && cookieinlen &&
-        qemuMigrationCookieXMLParseStr(mig,
-                                       driver,
-                                       priv ? priv->qemuCaps : NULL,
-                                       cookiein,
-                                       flags) < 0)
+        qemuMigrationCookieXMLParseStr(mig, driver, qemuCaps, cookiein, flags) < 0)
         return NULL;
 
     if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT &&

diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h
index f9927175fa8e83d9f205d40dcb6a672ba234f18b..0fc406761b5afaab75e60f86a60c779e78254a7d 100644 (file)
--- a/src/qemu/qemu_migration_cookie.h
+++ b/src/qemu/qemu_migration_cookie.h
@@ -192,7 +192,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver,
                          virDomainObj *vm,
                         const virDomainDef *def,
                         const char *origname,
-                        qemuDomainObjPrivate *priv,
+                         virQEMUCaps *qemuCaps,
                         const char *cookiein,
                         int cookieinlen,
                         unsigned int flags);

diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookiexmltest.c
index bb19baad5426ab94c0d13932bc27ca7df42d10b0..0e5f956a2a7f2da8d9a4edcac10fc099f7a67a68 100644 (file)
--- a/tests/qemumigrationcookiexmltest.c
+++ b/tests/qemumigrationcookiexmltest.c
@@ -144,7 +144,7 @@ testQemuMigrationCookieParse(const void *opaque)
                                                   data->vm,
                                                   data->vm->def,
                                                   NULL,
-                                                  priv,
+                                                  priv->qemuCaps,
                                                   data->xmlstr,
                                                   data->xmlstrlen,
                                                   data->cookieParseFlags))) {