]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Move SET_MACHINE_COMPAT macro to boards.h
authorDavid Gibson <david@gibson.dropbear.id.au>
Thu, 3 Dec 2015 06:34:38 +0000 (17:34 +1100)
committerDavid Gibson <david@gibson.dropbear.id.au>
Mon, 11 Jan 2016 04:29:05 +0000 (15:29 +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 <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
include/hw/boards.h
include/hw/i386/pc.h

index 051db5ed25c02253c33ccd8cfe4a8f7e861a3d27..0f30959e2e3b4d798cee69468c47eaa1d0723e3f 100644 (file)
@@ -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
index b0d6283b25c28217f208262bcbb59c7c03c1cdab..2e0d05ec07914630b7cf932eebfdf6affdb2910f 100644 (file)
@@ -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