From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fZ-0000ag-Lm for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI0fT-0006We-I4 for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fT-0006Vv-8T for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:35 -0400 From: Eduardo Habkost Date: Thu, 14 Aug 2014 16:25:35 -0300 Message-Id: <1408044362-11621-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> References: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v4 06/33] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14 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?= Those properties were introduced by commit 3827cdb1c3aa17a792d1658161195b9d7173c26b. They were not duplicated into pc-0.13 and older because 0.14 was the first QEMU version supporting qxl. The only problem is that this breaks the PC_COMPAT_* nesting pattern we currently use. So, move the properties to PC_COMPAT_0_14. This makes pc-0.13 and older inherit them, but that shouldn't be an issue as QEMU 0.13 didn't support qxl. Signed-off-by: Eduardo Habkost Cc: Gerd Hoffmann --- hw/i386/pc_piix.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ff75ca1..c895dc9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -702,6 +702,14 @@ static QEMUMachine pc_machine_v0_15 = { .driver = "virtio-balloon-pci",\ .property = "event_idx",\ .value = "off",\ + },{\ + .driver = "qxl",\ + .property = "revision",\ + .value = stringify(2),\ + },{\ + .driver = "qxl-vga",\ + .property = "revision",\ + .value = stringify(2),\ } static QEMUMachine pc_machine_v0_14 = { @@ -709,15 +717,6 @@ static QEMUMachine pc_machine_v0_14 = { .name = "pc-0.14", .compat_props = (GlobalProperty[]) { PC_COMPAT_0_14, - { - .driver = "qxl", - .property = "revision", - .value = stringify(2), - },{ - .driver = "qxl-vga", - .property = "revision", - .value = stringify(2), - }, { /* end of list */ } }, .hw_version = "0.14", -- 1.9.3