[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 11/13] piix: Move pc-0.13 virtio-9p-pci compat to P
From: |
Eduardo Habkost |
Subject: |
[Qemu-ppc] [PATCH v2 11/13] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13 |
Date: |
Thu, 14 May 2015 15:53:08 -0300 |
The compat property was added by commit
9dbcca5aa13cb9ab40788ac4c56bc227d94ca920, and the pc-0.12 and older
machine-types were not changed because virtio-9p-pci was introduced on QEMU
0.13 (commit 9f10751365b26b13b8a9b67e0e90536ae3d282df). The only problem is
that this breaks the PC_COMPAT_* nesting pattern we currently use.
So, move the property to PC_COMPAT_0_13. This make pc-0.12 and older inherit
it, but that shouldn't be an issue as QEMU 0.12 didn't have virtio-9p-pci.
Cc: Gerd Hoffmann <address@hidden>
Cc: Aneesh Kumar K.V <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_piix.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index eb0c11f..9d12c93 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -838,6 +838,10 @@ static QEMUMachine pc_machine_v0_14 = {
.driver = "AC97",\
.property = "use_broken_id",\
.value = stringify(1),\
+ },{\
+ .driver = "virtio-9p-pci",\
+ .property = "vectors",\
+ .value = stringify(0),\
},
#define PC_I440FX_0_13_MACHINE_OPTIONS \
@@ -850,10 +854,6 @@ static QEMUMachine pc_machine_v0_13 = {
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_13
{
- .driver = "virtio-9p-pci",
- .property = "vectors",
- .value = stringify(0),
- },{
.driver = "VGA",
.property = "rombar",
.value = stringify(0),
--
2.1.0
- [Qemu-ppc] [PATCH v2 03/13] pc: Move commas inside PC_COMPAT_* macros, (continued)
- [Qemu-ppc] [PATCH v2 03/13] pc: Move commas inside PC_COMPAT_* macros, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 05/13] hw: Define empty HW_COMPAT_2_[23] macros, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 04/13] spapr: Move commas inside SPAPR_COMPAT_* macros, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 07/13] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 06/13] pc: Define PC_COMPAT_2_[123] macros, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 08/13] spapr: define SPAPR_COMPAT_2_3, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 09/13] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 10/13] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 11/13] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13,
Eduardo Habkost <=
- [Qemu-ppc] [PATCH v2 12/13] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2015/05/14
- [Qemu-ppc] [PATCH v2 13/13] piix: Define PC_COMPAT_0_10, Eduardo Habkost, 2015/05/14