From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5mZ1-00064S-4k for qemu-devel@nongnu.org; Sun, 06 Dec 2015 22:34:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a5mYz-0006JQ-4h for qemu-devel@nongnu.org; Sun, 06 Dec 2015 22:34:11 -0500 From: David Gibson Date: Mon, 7 Dec 2015 14:34:35 +1100 Message-Id: <1449459280-14983-6-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> References: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCHv2 05/10] Move SET_MACHINE_COMPAT macro to boards.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: ehabkost@redhat.com, agraf@suse.de, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson 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 --- 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 5da4fb0..9bf4ec8 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -153,4 +153,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 854c330..071a0d7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -795,13 +795,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