From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz84i-0005ij-QM for qemu-devel@nongnu.org; Sun, 31 May 2015 14:35:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yz84h-0004bU-T4 for qemu-devel@nongnu.org; Sun, 31 May 2015 14:35:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz84h-0004bO-OJ for qemu-devel@nongnu.org; Sun, 31 May 2015 14:35:07 -0400 Date: Sun, 31 May 2015 20:35:04 +0200 From: "Michael S. Tsirkin" Message-ID: <1433097192-8988-13-git-send-email-mst@redhat.com> References: <1433097192-8988-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433097192-8988-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 12/57] 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: Peter Maydell , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Gerd Hoffmann From: Eduardo Habkost 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 8796e60..1e12eff 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -808,6 +808,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 = { @@ -815,15 +823,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", -- MST