pc: Add 2.9 machine-types
Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Laszlo Ersek <lersek@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Gabriel Somlo <somlo@cmu.edu> Tested-by: Gabriel Somlo <somlo@cmu.edu> Cc: Gabriel Somlo <somlo@cmu.edu> Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
e12f3a13e2
commit
d580bd4b73
|
@ -437,13 +437,24 @@ static void pc_i440fx_machine_options(MachineClass *m)
|
|||
m->default_display = "std";
|
||||
}
|
||||
|
||||
static void pc_i440fx_2_8_machine_options(MachineClass *m)
|
||||
static void pc_i440fx_2_9_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_machine_options(m);
|
||||
m->alias = "pc";
|
||||
m->is_default = 1;
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
|
||||
pc_i440fx_2_9_machine_options);
|
||||
|
||||
static void pc_i440fx_2_8_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_2_9_machine_options(m);
|
||||
m->is_default = 0;
|
||||
m->alias = NULL;
|
||||
SET_MACHINE_COMPAT(m, PC_COMPAT_2_8);
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
|
||||
pc_i440fx_2_8_machine_options);
|
||||
|
||||
|
@ -451,8 +462,6 @@ DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
|
|||
static void pc_i440fx_2_7_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_2_8_machine_options(m);
|
||||
m->is_default = 0;
|
||||
m->alias = NULL;
|
||||
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
|
||||
}
|
||||
|
||||
|
|
|
@ -301,19 +301,28 @@ static void pc_q35_machine_options(MachineClass *m)
|
|||
m->max_cpus = 288;
|
||||
}
|
||||
|
||||
static void pc_q35_2_8_machine_options(MachineClass *m)
|
||||
static void pc_q35_2_9_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_machine_options(m);
|
||||
m->alias = "q35";
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
|
||||
pc_q35_2_9_machine_options);
|
||||
|
||||
static void pc_q35_2_8_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_2_9_machine_options(m);
|
||||
m->alias = NULL;
|
||||
SET_MACHINE_COMPAT(m, PC_COMPAT_2_8);
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
|
||||
pc_q35_2_8_machine_options);
|
||||
|
||||
static void pc_q35_2_7_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_2_8_machine_options(m);
|
||||
m->alias = NULL;
|
||||
m->max_cpus = 255;
|
||||
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
|
||||
}
|
||||
|
|
|
@ -375,6 +375,8 @@ int e820_get_num_entries(void);
|
|||
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
|
||||
|
||||
#define PC_COMPAT_2_8 \
|
||||
HW_COMPAT_2_8 \
|
||||
|
||||
|
||||
#define PC_COMPAT_2_7 \
|
||||
HW_COMPAT_2_7 \
|
||||
|
|
Loading…
Reference in a new issue