diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-10-03 16:39:46 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-11-03 19:36:19 +0100 |
| commit | 179b9f40f2582de75bd63a11040ae8f7437096b6 (patch) | |
| tree | 6eb08b24c5634b6ce2d487c3aa92d656a9ea7c7d /hw/i386/pc_q35.c | |
| parent | 7135781f65f1267a72bf554ee2b7bd605f9e59aa (diff) | |
| download | qemu-179b9f40f2582de75bd63a11040ae8f7437096b6.zip qemu-179b9f40f2582de75bd63a11040ae8f7437096b6.tar.gz qemu-179b9f40f2582de75bd63a11040ae8f7437096b6.tar.bz2 | |
pc: Create pc_compat_2_1() functions
We will need new compat code for the 2.1 machine-types.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4d9e3cd..bdb1a37 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -281,8 +281,13 @@ static void pc_q35_init(MachineState *machine) } } +static void pc_compat_2_1(MachineState *machine) +{ +} + static void pc_compat_2_0(MachineState *machine) { + pc_compat_2_1(machine); smbios_legacy_mode = true; has_reserved_memory = false; pc_set_legacy_acpi_data_size(); @@ -316,6 +321,12 @@ static void pc_compat_1_4(MachineState *machine) x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); } +static void pc_q35_init_2_1(MachineState *machine) +{ + pc_compat_2_1(machine); + pc_q35_init(machine); +} + static void pc_q35_init_2_0(MachineState *machine) { pc_compat_2_0(machine); @@ -368,7 +379,7 @@ static QEMUMachine pc_q35_machine_v2_2 = { static QEMUMachine pc_q35_machine_v2_1 = { PC_Q35_2_1_MACHINE_OPTIONS, .name = "pc-q35-2.1", - .init = pc_q35_init, + .init = pc_q35_init_2_1, .compat_props = (GlobalProperty[]) { PC_COMPAT_2_1, { /* end of list */ } |