From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 19 Jan 2018 09:32:44 +0000 (+0100)
Subject: qemu: Fix crash in offline migration
X-Git-Tag: v4.0.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc5710708ec90146b71bdb00d8705cb4a9e0088;p=thirdparty%2Flibvirt.git

qemu: Fix crash in offline migration

When migrating a shutoff domain (i.e., offline migration), we have no
statistics to report and thus jobInfo will be NULL in
qemuMigrationFinish.

Broken by me in v3.10.0-183-ge8784e7868.

https://bugzilla.redhat.com/show_bug.cgi?id=1536351

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a56bc596ff..1854900c9a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5481,8 +5481,10 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
     }
 
     if (dom) {
-        VIR_STEAL_PTR(priv->job.completed, jobInfo);
-        priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED;
+        if (jobInfo) {
+            VIR_STEAL_PTR(priv->job.completed, jobInfo);
+            priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED;
+        }
 
         if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen,
                                     QEMU_MIGRATION_COOKIE_STATS) < 0)