From patchwork Fri Jan 4 03:22:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1020601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=208.118.235.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43W98d0wSGz9s7T for ; Fri, 4 Jan 2019 14:22:57 +1100 (AEDT) Received: from localhost ([127.0.0.1]:59403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfG4V-0005OX-1b for incoming@patchwork.ozlabs.org; Thu, 03 Jan 2019 22:22:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfG4C-0005OE-8j for qemu-devel@nongnu.org; Thu, 03 Jan 2019 22:22:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfG48-0007y0-7p for qemu-devel@nongnu.org; Thu, 03 Jan 2019 22:22:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gfG48-0007xX-0L for qemu-devel@nongnu.org; Thu, 03 Jan 2019 22:22:32 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63787C070E05 for ; Fri, 4 Jan 2019 03:22:31 +0000 (UTC) Received: from localhost (ovpn-116-79.gru2.redhat.com [10.97.116.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3185F5C224; Fri, 4 Jan 2019 03:22:28 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 4 Jan 2019 01:22:26 -0200 Message-Id: <20190104032226.21428-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 04 Jan 2019 03:22:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] compat: Use explicit type names on HW_COMPAT_2_6 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 , Cornelia Huck , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The virtio-pci entries in HW_COMPAT_2_6 had an implicit assumption: that all virtio-pci subclasses support the disable-legacy and disable-modern options. That assumption was broken by commit f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI devices"). This caused QEMU to crash if using the new -non-transitional or -transitional device types: $ qemu-system-x86_64 -machine pc-i440fx-2.6 \ -device virtio-net-pci-non-transitional Unexpected error in object_property_find() at qom/object.c:1092: qemu-system-x86_64: -device virtio-net-pci-non-transitional: can't apply \ global virtio-pci.disable-modern=on: Property '.disable-modern' not found Aborted (core dumped) Replace the virtio-pci.disable-legacy=off and virtio-pci.disable-modern=on entries on HW_COMPAT_2_6 with explicit entries for each generic virtio device type. The full list of generic virtio device types was extracted by just grepping for ".generic_name". Note that we don't need to worry about listing new virtio-pci devices in HW_COMPAT_2_6 in the future, because new devices won't require QEMU 2.6 compatibility. This makes the compat entries annoyingly verbose, but is simpler than the alternative of making the virtio-pci type inheritance rules even more complex. Reported-by: Thomas Huth Signed-off-by: Eduardo Habkost Reviewed-by: Cornelia Huck --- --- include/hw/compat.h | 140 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 138 insertions(+), 2 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 3ca85b037c..fbb6c1138a 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -163,11 +163,147 @@ .property = "format_transport_address",\ .value = "off",\ },{\ - .driver = "virtio-pci",\ + .driver = "vhost-scsi-pci",\ .property = "disable-modern",\ .value = "on",\ },{\ - .driver = "virtio-pci",\ + .driver = "vhost-scsi-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "vhost-user-blk-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "vhost-user-blk-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "vhost-user-scsi-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "vhost-user-scsi-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "vhost-vsock-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "vhost-vsock-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-9p-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-9p-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-balloon-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-balloon-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-blk-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-blk-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-crypto-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-crypto-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-gpu-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-gpu-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-input-host-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-input-host-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-keyboard-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-keyboard-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-mouse-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-mouse-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-net-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-net-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-rng-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-rng-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-scsi-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-scsi-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-serial-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-serial-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-tablet-pci",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-tablet-pci",\ + .property = "disable-legacy",\ + .value = "off",\ + },{\ + .driver = "virtio-vga",\ + .property = "disable-modern",\ + .value = "on",\ + },{\ + .driver = "virtio-vga",\ .property = "disable-legacy",\ .value = "off",\ },