On Tue, Jul 25, 2017 at 08:01:12PM +0200, Greg Kurz wrote:
> Signed-off-by: Greg Kurz <groug@kaod.org>
Applied to ppc-for-2.11. Might as well get the new machine type
template ready.
> ---
> hw/ppc/spapr.c | 22 ++++++++++++++++++++--
> include/hw/compat.h | 3 +++
> 2 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 53969315ac24..277daa4f9645 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3533,18 +3533,36 @@ static const TypeInfo spapr_machine_info = {
> type_init(spapr_machine_register_##suffix)
>
> /*
> + * pseries-2.11
> + */
> +static void spapr_machine_2_11_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void spapr_machine_2_11_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(2_11, "2.11", true);
> +
> +/*
> * pseries-2.10
> */
> +#define SPAPR_COMPAT_2_10 \
> + HW_COMPAT_2_10 \
> +
> static void spapr_machine_2_10_instance_options(MachineState *machine)
> {
> }
>
> static void spapr_machine_2_10_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_2_11_class_options(mc);
> + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_10);
> }
>
> -DEFINE_SPAPR_MACHINE(2_10, "2.10", true);
> +DEFINE_SPAPR_MACHINE(2_10, "2.10", false);
>
> /*
> * pseries-2.9
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 08f36004dad7..3e101f8f6783 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
> #ifndef HW_COMPAT_H
> #define HW_COMPAT_H
>
> +#define HW_COMPAT_2_10 \
> + /* empty */
> +
> #define HW_COMPAT_2_9 \
> {\
> .driver = "pci-bridge",\
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson