q35/440fx/arm/spapr: Add QEMU 4.0 machine type

Including all machine types that might have a pcie-root-port.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Message-Id: <154394083644.28192.8501647946108201466.stgit@gimli.home>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
[ehabkost: fixed accidental recursion at spapr_machine_3_1_class_options()]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Alex Williamson 2018-12-04 09:27:16 -07:00 committed by Eduardo Habkost
parent ffa144b3af
commit 84e060bf90
6 changed files with 71 additions and 13 deletions

View file

@ -3956,19 +3956,38 @@ static const TypeInfo spapr_machine_info = {
} \
type_init(spapr_machine_register_##suffix)
/*
* pseries-3.1
/*
* pseries-4.0
*/
static void spapr_machine_3_1_instance_options(MachineState *machine)
static void spapr_machine_4_0_instance_options(MachineState *machine)
{
}
static void spapr_machine_3_1_class_options(MachineClass *mc)
static void spapr_machine_4_0_class_options(MachineClass *mc)
{
/* Defaults for the latest behaviour inherited from the base class */
}
DEFINE_SPAPR_MACHINE(3_1, "3.1", true);
DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
/*
* pseries-3.1
*/
#define SPAPR_COMPAT_3_1 \
HW_COMPAT_3_1
static void spapr_machine_3_1_instance_options(MachineState *machine)
{
spapr_machine_4_0_instance_options(machine);
}
static void spapr_machine_3_1_class_options(MachineClass *mc)
{
spapr_machine_4_0_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_1);
}
DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
/*
* pseries-3.0