[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/13] pc_piix: Define PC_COMPAT_0_10
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 13/13] pc_piix: Define PC_COMPAT_0_10 |
Date: |
Mon, 11 May 2015 17:55:56 -0300 |
Move compat_props from pc-0.10 to the macro, to make it consistent with
the other machines.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_piix.c | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 5182a9e..6e30eee 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -910,32 +910,35 @@ static QEMUMachine pc_machine_v0_11 = {
.hw_version = "0.11",
};
+#define PC_COMPAT_0_10 \
+ PC_COMPAT_0_11 \
+ {\
+ .driver = "virtio-blk-pci",\
+ .property = "class",\
+ .value = stringify(PCI_CLASS_STORAGE_OTHER),\
+ },{\
+ .driver = "virtio-serial-pci",\
+ .property = "class",\
+ .value = stringify(PCI_CLASS_DISPLAY_OTHER),\
+ },{\
+ .driver = "virtio-net-pci",\
+ .property = "vectors",\
+ .value = stringify(0),\
+ },{\
+ .driver = "ide-drive",\
+ .property = "ver",\
+ .value = "0.10",\
+ },{\
+ .driver = "scsi-disk",\
+ .property = "ver",\
+ .value = "0.10",\
+ },
+
static QEMUMachine pc_machine_v0_10 = {
PC_I440FX_0_13_MACHINE_OPTIONS,
.name = "pc-0.10",
.compat_props = (GlobalProperty[]) {
- PC_COMPAT_0_11
- {
- .driver = "virtio-blk-pci",
- .property = "class",
- .value = stringify(PCI_CLASS_STORAGE_OTHER),
- },{
- .driver = "virtio-serial-pci",
- .property = "class",
- .value = stringify(PCI_CLASS_DISPLAY_OTHER),
- },{
- .driver = "virtio-net-pci",
- .property = "vectors",
- .value = stringify(0),
- },{
- .driver = "ide-drive",
- .property = "ver",
- .value = "0.10",
- },{
- .driver = "scsi-disk",
- .property = "ver",
- .value = "0.10",
- },
+ PC_COMPAT_0_10
{ /* end of list */ }
},
.hw_version = "0.10",
--
2.1.0
- [Qemu-devel] [PATCH 01/13] pc: Replace tab with spaces, (continued)
- [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, 2015/05/11
- [Qemu-devel] [PATCH 13/13] pc_piix: Define PC_COMPAT_0_10,
Eduardo Habkost <=
- [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