[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/13] piix: Move pc-0.11 drive version compat props
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 10/13] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11 |
Date: |
Mon, 11 May 2015 17:55:53 -0300 |
The current code setting ide-drive.ver and scsi-disk.ver on pc-0.11
breaks the PC_COMPAT_* nesting pattern we currently use.
As those variables are overwritten in pc-0.10 too, they can be inherited
by pc-0.10 with no side-effects at all.
Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Eduardo Habkost <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 8a94dba..69539ee 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -900,6 +900,14 @@ static QEMUMachine pc_machine_v0_12 = {
.driver = TYPE_PCI_DEVICE,\
.property = "rombar",\
.value = stringify(0),\
+ },{\
+ .driver = "ide-drive",\
+ .property = "ver",\
+ .value = "0.11",\
+ },{\
+ .driver = "scsi-disk",\
+ .property = "ver",\
+ .value = "0.11",\
},
static QEMUMachine pc_machine_v0_11 = {
@@ -907,15 +915,6 @@ static QEMUMachine pc_machine_v0_11 = {
.name = "pc-0.11",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_11
- {
- .driver = "ide-drive",
- .property = "ver",
- .value = "0.11",
- },{
- .driver = "scsi-disk",
- .property = "ver",
- .value = "0.11",
- },
{ /* end of list */ }
},
.hw_version = "0.11",
--
2.1.0
- [Qemu-devel] [PATCH 00/13] pc, hw, spapr: Cleanup of {HW, PC, SPAPR}_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 01/13] pc: Replace tab with spaces, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 02/13] hw: Move commas inside HW_COMPAT_2_1 macro, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 03/13] pc: Move commas inside PC_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 04/13] spapr: Move commas inside SPAPR_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 06/13] pc: Define PC_COMPAT_2_[123] macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 05/13] hw: Define empty HW_COMPAT_2_[23] macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 07/13] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 09/13] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 08/13] spapr: define SPAPR_COMPAT_2_3, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 10/13] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 13/13] pc_piix: Define PC_COMPAT_0_10, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 12/13] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 11/13] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Eduardo Habkost, 2015/05/11