From nobody Thu Apr 18 09:24:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1578937631; cv=none; d=zohomail.com; s=zohoarc; b=C46TMwh2jcaWPsfxiSbreUyXNN8fCWO9zvdJPYj3U5qGXRxtZF1U716/jgD7ANyZ1PkouuewIaaCOC0GNny+lBxA0N5LIVmrd3lP9jtMTZyaal/YYvBUCUTo7BV3STtPuULsSw5VMdb1Z8KVdOhceWtVK7A/Qqv9FLuwgcBu26s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578937631; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9fY/ucFujhzjLW+hZylxEQIseW+7N0PYF0kuon6fQCs=; b=Mbsl+Kimfh9SedtvhYvwehR0eviJpywMT6iLBftlR+AvR8mUhY57kaOIeblpN/2y48e6pT7M5/B7hryQZRnv6JFoB0FtqzwYvbRMsRdz+Ernj1Z1Jh9UGEta0Z8Q31pidE73t1JxdNlRssgfI5wQvJUPFotdFv69H3qsrw8CFMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578937631354262.30965821429845; Mon, 13 Jan 2020 09:47:11 -0800 (PST) Received: from localhost ([::1]:53790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ir3nx-0007jy-To for importer@patchew.org; Mon, 13 Jan 2020 12:47:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44102) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ir3mX-0006Rg-Rh for qemu-devel@nongnu.org; Mon, 13 Jan 2020 12:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ir3mW-0004t7-QA for qemu-devel@nongnu.org; Mon, 13 Jan 2020 12:45:41 -0500 Received: from mo6-p01-ob.smtp.rzone.de ([2a01:238:20a:202:5301::6]:17447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ir3mV-0004mE-Vw for qemu-devel@nongnu.org; Mon, 13 Jan 2020 12:45:40 -0500 Received: from sender by smtp.strato.de (RZmta 46.1.4 DYNA|AUTH) with ESMTPSA id j08473w0DHjYHAf (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 13 Jan 2020 18:45:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1578937535; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=9fY/ucFujhzjLW+hZylxEQIseW+7N0PYF0kuon6fQCs=; b=o+5eMcjYhUM3UpItHBRtSdwE2k2HcCojBNE8cXGvreQHexfTz5Z4JkCoscZEOWa/NW hcsJawkj5y6cf49WDnedvOcDxoa7mzatLaplve+2GiV3znZbqb7miLs/sTHSlcydxzGB lRD27i4a4ED0tfYIWxxjIsay90UiyXklwctBoluXdXD9xpboso2LgXke41CIMjVdtMj3 G5Be3aVArHrO3NedG3on925vxMDONEH/Zbysme3HAxxGoPF79wVv39kk30j1Wwx0K+mq Pl9LAG6s7iZ+4s4tcKS8HewoNuxOGYgUintyq3ZvvGM2y+CRLFzmjvSrCoBwTZ1TkSN5 OgeA== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS32xLjw==" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-devel@nongnu.org (open list:All patches CC here) Subject: [PATCH v1] hw/i386: disable smbus migration for xenpv Date: Mon, 13 Jan 2020 18:45:21 +0100 Message-Id: <20200113174521.3336-1-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:238:20a:202:5301::6 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" With commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea a new member smbus_no_migration_support was added, and enabled in two places. With commit 4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new elements, which are conditionally filled. As a result, an incoming migration expected smbus related data unless smbus migration was disabled for a given MachineClass. Since commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea forgot to handle xenpv, live migration to receiving hosts using qemu-4.0 and later is broken. Therefore this patch must be applied to stable-4.x as well. Signed-off-by: Olaf Hering --- hw/i386/pc_piix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index fa12203079..e19716d0d3 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -952,6 +952,7 @@ static void xenfv_machine_options(MachineClass *m) m->desc =3D "Xen Fully-virtualized PC"; m->max_cpus =3D HVM_MAX_VCPUS; m->default_machine_opts =3D "accel=3Dxen"; + m->smbus_no_migration_support =3D true; } =20 DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,