[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h |
Date: |
Mon, 11 Jan 2016 15:37:30 +1100 |
pc.h defines a SET_MACHINE_COMPAT macro to make setting up compat_props
for the various PC machine versions less verbose. There's nothing
inherently PC specific about it, though, so move it to boards.h where other
versioned machine types (like pseries-*) can use it.
While we're doing that, change it's indentation to be a bit more regular.
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>
---
include/hw/boards.h | 9 +++++++++
include/hw/i386/pc.h | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 051db5e..0f30959 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -157,4 +157,13 @@ struct MachineState {
} \
machine_init(machine_initfn##_register_types)
+#define SET_MACHINE_COMPAT(m, COMPAT) \
+ do { \
+ static GlobalProperty props[] = { \
+ COMPAT \
+ { /* end of list */ } \
+ }; \
+ (m)->compat_props = props; \
+ } while (0)
+
#endif
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b0d6283..2e0d05e 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -855,13 +855,5 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
} \
machine_init(pc_machine_init_##suffix)
-#define SET_MACHINE_COMPAT(m, COMPAT) do { \
- static GlobalProperty props[] = { \
- COMPAT \
- { /* end of list */ } \
- }; \
- (m)->compat_props = props; \
-} while (0)
-
extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t
gpu_dev_id);
#endif
--
2.5.0
- [Qemu-ppc] [PULL 09/16] pseries: Use SET_MACHINE_COMPAT, (continued)
- [Qemu-ppc] [PULL 09/16] pseries: Use SET_MACHINE_COMPAT, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 12/16] pseries: Improve setting of default machine version, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 15/16] spapr vio: fix to incomplete QOMify, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 04/16] pseries: Remove redundant setting of mc->name for pseries-2.5 machine, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 13/16] pseries: Add pseries-2.6 machine type, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 01/16] hw/ppc/spapr_rtc: Remove bad class_size value, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 02/16] target-ppc: Define kvmppc_read_int_dt(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 03/16] spapr: Add /system-id, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 07/16] pseries: Remove versions from mc->desc, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h,
David Gibson <=
- [Qemu-ppc] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 11/16] pseries: Restructure class_options functions, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 05/16] pseries: Rearrange versioned machine type code, David Gibson, 2016/01/10
- Re: [Qemu-ppc] [PULL 00/16] ppc-for-2.6 queue 20160111, Peter Maydell, 2016/01/11