diff options
author | Haozhong Zhang | 2017-12-19 04:37:29 +0100 |
---|---|---|
committer | Eduardo Habkost | 2018-01-18 02:04:31 +0100 |
commit | df47ce8af4a5595b1f2088cf62bf33acbc3c7c32 (patch) | |
tree | 01f5c257602c7f6c699f5eec5faef691cb20fabd /hw/i386/pc_piix.c | |
parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging (diff) | |
download | qemu-df47ce8af4a5595b1f2088cf62bf33acbc3c7c32.tar.gz qemu-df47ce8af4a5595b1f2088cf62bf33acbc3c7c32.tar.xz qemu-df47ce8af4a5595b1f2088cf62bf33acbc3c7c32.zip |
pc: add 2.12 machine types
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Message-Id: <20171219033730.12748-2-haozhong.zhang@intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
-rw-r--r-- | hw/i386/pc_piix.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2febd0e136..a25619dfbf 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -426,21 +426,30 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display = "std"; } -static void pc_i440fx_2_11_machine_options(MachineClass *m) +static void pc_i440fx_2_12_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; } +DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL, + pc_i440fx_2_12_machine_options); + +static void pc_i440fx_2_11_machine_options(MachineClass *m) +{ + pc_i440fx_2_12_machine_options(m); + m->is_default = 0; + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_11); +} + 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); m->auto_enable_numa_with_memhp = false; } |