From nobody Sun May 5 14:27:34 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549025274458217.35362193209176; Fri, 1 Feb 2019 04:47:54 -0800 (PST) Received: from localhost ([127.0.0.1]:53092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYET-0002yW-Hl for importer@patchew.org; Fri, 01 Feb 2019 07:47:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYCc-000206-Mr for qemu-devel@nongnu.org; Fri, 01 Feb 2019 07:45:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYCb-0003mj-R9 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 07:45:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58190) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpYCb-0003mP-LV; Fri, 01 Feb 2019 07:45:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD059D7929; Fri, 1 Feb 2019 12:45:48 +0000 (UTC) Received: from localhost (ovpn-117-104.ams2.redhat.com [10.36.117.104]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36E791019627; Fri, 1 Feb 2019 12:45:46 +0000 (UTC) From: Cornelia Huck To: Collin Walling Date: Fri, 1 Feb 2019 13:45:43 +0100 Message-Id: <20190201124543.5945-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 01 Feb 2019 12:45:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] s390x/pci: mark zpci devices as unmigratable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Pierre Morel , David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We currently don't migrate any state for zpci devices, which are coupled with standard pci devices. This means funny things happen when we e.g. try to migrate with a virtio-pci device but the s390x- specific zpci state is not migrated (vfio-pci is not affected, as it is not migratable anyway.) Until this is fixed, mark zpci devices as unmigratable. Reported-by: David Hildenbrand Signed-off-by: Cornelia Huck Reviewed-by: Collin Walling Reviewed-by: David Hildenbrand --- This is just a stop-gap measure to give us time to implement the needed migration code properly. --- hw/s390x/s390-pci-bus.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index c96a7cba34..96c7c18f3f 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1253,6 +1253,15 @@ static Property s390_pci_device_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static const VMStateDescription s390_pci_device_vmstate =3D { + .name =3D TYPE_S390_PCI_DEVICE, + /* + * TODO: add state handling here, so migration works at least with + * emulated pci devices on s390x + */ + .unmigratable =3D 1, +}; + static void s390_pci_device_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -1263,6 +1272,7 @@ static void s390_pci_device_class_init(ObjectClass *k= lass, void *data) dc->bus_type =3D TYPE_S390_PCI_BUS; dc->realize =3D s390_pci_device_realize; dc->props =3D s390_pci_device_properties; + dc->vmsd =3D &s390_pci_device_vmstate; } =20 static const TypeInfo s390_pci_device_info =3D { --=20 2.17.2