From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yruke-0005GD-U5 for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrukc-0005Q4-8L for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrukc-0005Q0-0s for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:34 -0400 From: Eduardo Habkost Date: Mon, 11 May 2015 17:55:55 -0300 Message-Id: <1431377756-19579-13-git-send-email-ehabkost@redhat.com> In-Reply-To: <1431377756-19579-1-git-send-email-ehabkost@redhat.com> References: <1431377756-19579-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 12/13] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , Gerd Hoffmann , Alexander Graf , "Michael S. Tsirkin" The VGA and vmware-svga rombar compat properties were added by commit 281a26b15b4adcecb8604216738975abd754bea8, but only to pc-0.13 and pc-0.12. This breaks the PC_COMPAT_* nesting pattern we currently follow. The new variables will now be inherited by pc-0.11 and older, but pc-0.11 and pc-0.10 already have PCI.rombar=0 on compat_props, so they shouldn't be affected at all. Cc: Stefan Weil Cc: Gerd Hoffmann Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d09f01b..5182a9e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -822,6 +822,14 @@ static QEMUMachine pc_machine_v0_14 = { .driver = "virtio-9p-pci",\ .property = "vectors",\ .value = stringify(0),\ + },{\ + .driver = "VGA",\ + .property = "rombar",\ + .value = stringify(0),\ + },{\ + .driver = "vmware-svga",\ + .property = "rombar",\ + .value = stringify(0),\ }, #define PC_I440FX_0_13_MACHINE_OPTIONS \ @@ -833,15 +841,6 @@ static QEMUMachine pc_machine_v0_13 = { .name = "pc-0.13", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13 - { - .driver = "VGA", - .property = "rombar", - .value = stringify(0), - },{ - .driver = "vmware-svga", - .property = "rombar", - .value = stringify(0), - }, { /* end of list */ } }, .hw_version = "0.13", @@ -876,15 +875,6 @@ static QEMUMachine pc_machine_v0_12 = { .name = "pc-0.12", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_12 - { - .driver = "VGA", - .property = "rombar", - .value = stringify(0), - },{ - .driver = "vmware-svga", - .property = "rombar", - .value = stringify(0), - }, { /* end of list */ } }, .hw_version = "0.12", -- 2.1.0