[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/57] piix: Move pc-0.14 qxl compat properties to PC
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/57] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14 |
Date: |
Sun, 31 May 2015 20:35:04 +0200 |
From: Eduardo Habkost <address@hidden>
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 <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
- [Qemu-devel] [PULL 02/57] hw/virtio/virtio-pci: use alias property for virtio-balloon-pci, (continued)
- [Qemu-devel] [PULL 02/57] hw/virtio/virtio-pci: use alias property for virtio-balloon-pci, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 03/57] hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 04/57] pc: Replace tab with spaces, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 05/57] hw: Move commas inside HW_COMPAT_2_1 macro, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 06/57] pc: Move commas inside PC_COMPAT_* macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 07/57] spapr: Move commas inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 08/57] hw: Define empty HW_COMPAT_2_[23] macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 09/57] pc: Define PC_COMPAT_2_[123] macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 10/57] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 11/57] spapr: define SPAPR_COMPAT_2_3, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 12/57] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 13/57] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 14/57] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 15/57] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 16/57] piix: Define PC_COMPAT_0_10, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 17/57] pc: Define MACHINE_OPTIONS macros consistently for all machines, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 18/57] pc: Define machines using a DEFINE_PC_MACHINE macro, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 19/57] pc: Convert *_MACHINE_OPTIONS macros into functions, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 20/57] pc: Move compat_props setting inside *_machine_options() functions, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 21/57] pc: Don't use QEMUMachine anymore, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 22/57] pc: Remove qemu_register_pc_machine() function, Michael S. Tsirkin, 2015/05/31