diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-11-30 12:56:36 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-12-22 18:39:19 +0200 |
| commit | 240240d5da54eb13745285d02fd215683c8f03c9 (patch) | |
| tree | 0c3cb06a58782337eecb7f2ddccd4cdcd4cc5edc /hw/i386/pc_q35.c | |
| parent | 1e37b7149aa560959b7190924c87dad5d49d47a7 (diff) | |
| download | focaccia-qemu-240240d5da54eb13745285d02fd215683c8f03c9.tar.gz focaccia-qemu-240240d5da54eb13745285d02fd215683c8f03c9.zip | |
pc: Add pc-*-2.6 machine classes
Add pc-i440fx-2.6 and pc-q35-2.6 machine classes. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index f3a3595246..412b3cd375 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -349,12 +349,22 @@ static void pc_q35_machine_options(MachineClass *m) m->no_tco = 0; } -static void pc_q35_2_5_machine_options(MachineClass *m) +static void pc_q35_2_6_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; } +DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, + pc_q35_2_6_machine_options); + +static void pc_q35_2_5_machine_options(MachineClass *m) +{ + pc_q35_2_6_machine_options(m); + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); +} + DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, pc_q35_2_5_machine_options); @@ -363,7 +373,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_2_5_machine_options(m); m->hw_version = "2.4.0"; - m->alias = NULL; pcmc->broken_reserved_end = true; SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); } |