Re: [Qemu-ppc] [RFC 4/9] Move SET_MACHINE_COMPAT macro to boards.h

[Thomas Huth]

On 30/11/15 09:51, David Gibson wrote:
> 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>
> ---
>  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

Reviewed-by: Thomas Huth <address@hidden>