From nobody Sat Apr 20 04:31:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565711442; cv=none; d=zoho.com; s=zohoarc; b=ZfUJKaYfAPIeC2pVTChRUKT7zUi/c784qpLpmtqZdfhcuVJX1eI/9g3WVtzsZxjvMzH00u61zFwIcwCwcx/JxF5pnUZSXMHIE5IQ5+7VsFa7Oatl1b+ZhD04+29aL552dCCfYiEYQ2A+NLL21LkAKooMtAEGjR+Y4qAJzTua0YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565711442; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=uy3FRJN0qtyeW+yBIfGRQ01ZXrFejOq//egq54U8vIw=; b=HcPw90e6pT2Y/VYAR3YKnCzVVS3ZfvMSsUx9aTkXeDPTUbSyO2xnYWDS7qlm2/Xz44Vjca96p2Ht8vVmbQ/YfD655kx8E5dILHwJg8xA+1Az1qzHPqhiqW7cFUv61w8W3VLan2pN7s1gxifubMIYpyC8ClEX/9NoWygVJ9ibU6U= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565711442253107.60692916423818; Tue, 13 Aug 2019 08:50:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1001DEC556; Tue, 13 Aug 2019 15:50:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D427F271A6; Tue, 13 Aug 2019 15:50:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 87E9E24F31; Tue, 13 Aug 2019 15:50:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DFocXt010909 for ; Tue, 13 Aug 2019 11:50:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE3A46E08D; Tue, 13 Aug 2019 15:50:38 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92D3E6E0B5 for ; Tue, 13 Aug 2019 15:50:35 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 4833D103011; Tue, 13 Aug 2019 17:50:34 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:50:32 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] qemu: Fix crash on incoming migration X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 13 Aug 2019 15:50:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Erik Skultety --- src/qemu/qemu_migration_cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index da5bc8d05f..25d3fecd74 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1507,7 +1507,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, if (cookiein && cookieinlen && qemuMigrationCookieXMLParseStr(mig, driver, - priv->qemuCaps, + priv ? priv->qemuCaps : NULL, cookiein, flags) < 0) goto error; --=20 2.22.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list