From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXP9-0005Ig-6q for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:44:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXP2-0006Mh-WB for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:44:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXP2-0006Md-NS for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:44:44 -0400 From: Eduardo Habkost Date: Fri, 13 Jun 2014 16:43:42 -0300 Message-Id: <1402688658-22333-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> References: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC v2 03/39] 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, "Michael S. Tsirkin" Cc: Marcel Apfelbaum , Alexander Graf , Don Slutz , Gerd Hoffmann , Anthony Liguori , 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 e9f32ab..ad0a9c8 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -685,6 +685,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 \ @@ -697,10 +701,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.0