[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/33] piix: Move pc-0.1[23] rombar compat props
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v4 08/33] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13 |
Date: |
Thu, 14 Aug 2014 16:25:37 -0300 |
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.
Signed-off-by: Eduardo Habkost <address@hidden>
Cc: Stefan Weil <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
---
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 c11abc8..a7b0c34 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -736,6 +736,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 \
@@ -747,15 +755,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",
@@ -790,15 +789,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",
--
1.9.3
- [Qemu-devel] [PATCH v4 00/33] Convert PC machine-types to QOM classes, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 02/33] vl.c: Use qdev_prop_register_global() for single globals, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 01/33] pc: Replace tabs with spaces on pc.h, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 03/33] pc: Eliminate has_pci_info global variable, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 04/33] piix: Add kvmclock_enabled, pci_enabled globals, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 05/33] piix: Eliminate pc_init_pci(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 06/33] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 07/33] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 08/33] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v4 09/33] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 12/33] pc: Eliminate pc_common_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 11/33] pc: Register machine classes directly instead of using QEMUMachine, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 10/33] machine: Make compat_props a linked list, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 13/33] pc: Eliminate pc_default_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 14/33] piix: Eliminate pc_i440fx_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 16/33] q35: Eliminate pc_q35_1_4_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 17/33] pc: Eliminate all *_machine_options() functions, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 18/33] machine: Eliminate QEMUMachine.compat_props, Eduardo Habkost, 2014/08/14