]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Fix crash on incoming migration
authorJiri Denemark <jdenemar@redhat.com>
Tue, 13 Aug 2019 15:02:32 +0000 (17:02 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 14 Aug 2019 07:28:22 +0000 (09:28 +0200)
In the first stage of incoming migration (qemuMigrationDstPrepareAny) we
call qemuMigrationEatCookie when there's no vm object created yet and
thus we don't have any private data to pass.

Broken by me in commit v5.6.0-109-gbf15b145ec.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/qemu/qemu_migration_cookie.c

index da5bc8d05f7a7001fb3656c66a3dff42393db1d5..25d3fecd74b54cc417f9a3feded08cfcb397eebd 100644 (file)
@@ -1507,7 +1507,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver,
     if (cookiein && cookieinlen &&
         qemuMigrationCookieXMLParseStr(mig,
                                        driver,
-                                       priv->qemuCaps,
+                                       priv ? priv->qemuCaps : NULL,
                                        cookiein,
                                        flags) < 0)
         goto error;