From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkT-0006Vf-4N for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOkO-0007Uj-W1 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkN-0007Ua-6X for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:16 -0400 Date: Mon, 1 Jun 2015 14:23:11 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-16-git-send-email-mst@redhat.com> References: <1433161230-29421-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433161230-29421-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 15/60] 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: Peter Maydell , Eduardo Habkost , Stefan Weil , Gerd Hoffmann , Paolo Bonzini , Richard Henderson From: Eduardo Habkost 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 9d12c93..ac98af1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -842,6 +842,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 \ @@ -853,15 +861,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", @@ -896,15 +895,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", -- MST