david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc: add 2.11 machine types

Browse Source 
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2017-09-06 17:26:57 +03:00 committed by Michael S. Tsirkin
parent ee4c112846
commit a6fd5b0e05
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/i386/pc_piix.c
View File

@ -436,21 +436,30 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_display = "std"; m->default_display = "std";
} }
static void pc_i440fx_2_10_machine_options(MachineClass *m) static void pc_i440fx_2_11_machine_options(MachineClass *m)
{ {
pc_i440fx_machine_options(m); pc_i440fx_machine_options(m);
m->alias = "pc"; m->alias = "pc";
m->is_default = 1; m->is_default = 1;
} }
DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
pc_i440fx_2_11_machine_options);
static void pc_i440fx_2_10_machine_options(MachineClass *m)
{
pc_i440fx_2_11_machine_options(m);
m->is_default = 0;
m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);
}
DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
pc_i440fx_2_10_machine_options); pc_i440fx_2_10_machine_options);
static void pc_i440fx_2_9_machine_options(MachineClass *m) static void pc_i440fx_2_9_machine_options(MachineClass *m)
{ {
pc_i440fx_2_10_machine_options(m); pc_i440fx_2_10_machine_options(m);
m->is_default = 0;
m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
} }

13
hw/i386/pc_q35.c
View File

@ -302,10 +302,20 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288; m->max_cpus = 288;
} }
static void pc_q35_2_10_machine_options(MachineClass *m) static void pc_q35_2_11_machine_options(MachineClass *m)
{ {
pc_q35_machine_options(m); pc_q35_machine_options(m);
m->alias = "q35"; m->alias = "q35";
}
DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
pc_q35_2_11_machine_options);
static void pc_q35_2_10_machine_options(MachineClass *m)
{
pc_q35_2_11_machine_options(m);
m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
} }
@ -315,7 +325,6 @@ DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
static void pc_q35_2_9_machine_options(MachineClass *m) static void pc_q35_2_9_machine_options(MachineClass *m)
{ {
pc_q35_2_10_machine_options(m); pc_q35_2_10_machine_options(m);
m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
} }

3
include/hw/i386/pc.h
View File

@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
int e820_get_num_entries(void); int e820_get_num_entries(void);
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
#define PC_COMPAT_2_10 \
HW_COMPAT_2_10 \
#define PC_COMPAT_2_9 \ #define PC_COMPAT_2_9 \
HW_COMPAT_2_9 \ HW_COMPAT_2_9 \
{\ {\