]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Fix crash in migration of graphics-less guests.
authorViktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Thu, 16 May 2013 12:41:29 +0000 (14:41 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Thu, 16 May 2013 13:48:34 +0000 (15:48 +0200)
Commit 7f15ebc7a2b599ab10dbc15bca6f823591213e67 introduced a bug
happening when guests without a <graphics> element are migrated.
The initialization of listenAddress happens unconditionally
from the cookie even if the cookie->graphics pointer was NULL.
Moved the initialization to where it is safe.

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
src/qemu/qemu_migration.c

index e38d99b586ee47137b8ce70fd8b4aa307f979a1f..e10127db8604adc6fc8a739d218ccfc138573b81 100644 (file)
@@ -1723,7 +1723,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver,
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     int ret;
-    char *listenAddress = cookie->graphics->listen;
+    char *listenAddress;
 
     if (!cookie)
         return 0;
@@ -1737,6 +1737,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver,
     if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE)
         return 0;
 
+    listenAddress = cookie->graphics->listen;
     if (!listenAddress ||
         STREQ(listenAddress, "0.0.0.0") ||
         STREQ(listenAddress, "::"))