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