From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrukV-0004ua-W8 for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrukU-0005Ld-E5 for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrukU-0005LT-9I for qemu-devel@nongnu.org; Mon, 11 May 2015 16:56:26 -0400 From: Eduardo Habkost Date: Mon, 11 May 2015 17:55:52 -0300 Message-Id: <1431377756-19579-10-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 09/13] 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: Gerd Hoffmann , Alexander Graf , "Michael S. Tsirkin" 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. Cc: Gerd Hoffmann Signed-off-by: Eduardo Habkost --- 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 1d5b776..8a94dba 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -788,6 +788,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 = { @@ -795,15 +803,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", -- 2.1.0