From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3DZG-0001hP-EZ for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X3DZA-00059i-8f for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3DZ9-00059c-VW for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:10:56 -0400 From: Eduardo Habkost Date: Fri, 4 Jul 2014 21:09:34 -0300 Message-Id: <1404519002-10224-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1404519002-10224-1-git-send-email-ehabkost@redhat.com> References: <1404519002-10224-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC v3 07/35] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Gerd Hoffmann , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Aneesh Kumar K.V" The compat property was added by commit 9dbcca5aa13cb9ab40788ac4c56bc227d94ca920, and the pc-0.12 and older machine-types were not changed because virtio-9p-pci was introduced on QEMU 0.13 (commit 9f10751365b26b13b8a9b67e0e90536ae3d282df). The only problem is that this breaks the PC_COMPAT_* nesting pattern we currently use. So, move the property to PC_COMPAT_0_13. This make pc-0.12 and older inherit it, but that shouldn't be an issue as QEMU 0.12 didn't have virtio-9p-pci. Signed-off-by: Eduardo Habkost Cc: Gerd Hoffmann Cc: Aneesh Kumar K.V --- hw/i386/pc_piix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 332aee1..cf3318d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -712,6 +712,10 @@ static QEMUMachine pc_machine_v0_14 = { .driver = "AC97",\ .property = "use_broken_id",\ .value = stringify(1),\ + },{\ + .driver = "virtio-9p-pci",\ + .property = "vectors",\ + .value = stringify(0),\ } #define PC_I440FX_0_13_MACHINE_OPTIONS \ @@ -724,10 +728,6 @@ static QEMUMachine pc_machine_v0_13 = { .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13, { - .driver = "virtio-9p-pci", - .property = "vectors", - .value = stringify(0), - },{ .driver = "VGA", .property = "rombar", .value = stringify(0), -- 1.9.3