From 877f8931b99e2377a180fd43a1e5fc2b707e9c52 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 3 Dec 2015 17:34:38 +1100 Subject: Move SET_MACHINE_COMPAT macro to boards.h 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 Reviewed-by: Thomas Huth Reviewed-by: Eduardo Habkost Reviewed-by: Alexey Kardashevskiy --- 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 051db5ed25..0f30959e2e 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 b0d6283b25..2e0d05ec07 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 -- cgit v1.2.1