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

pc: Create pc_compat_*() functions

Browse Source 
Making the older compat functions call the newer compat functions at the
beginning allows the older functions undo what's done by newer compat
functions. e.g.: pc_compat_1_4() will be able to call pc_compat_1_5()
and then set has_pvpanic=false.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eduardo Habkost 2013-08-21 15:14:43 -03:00 committed by Michael S. Tsirkin
parent 43a52ce657
commit 89b439f313
2 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/i386/pc_piix.c
View File

@ -236,38 +236,68 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
pc_init1(args, get_system_memory(), get_system_io(), 1, 1); pc_init1(args, get_system_memory(), get_system_io(), 1, 1);
} }
static void pc_init_pci_1_6(QEMUMachineInitArgs *args) static void pc_compat_1_6(QEMUMachineInitArgs *args)
{ {
has_pci_info = false; has_pci_info = false;
rom_file_in_ram = false; rom_file_in_ram = false;
}
static void pc_compat_1_5(QEMUMachineInitArgs *args)
{
pc_compat_1_6(args);
has_pvpanic = true;
}
static void pc_compat_1_4(QEMUMachineInitArgs *args)
{
/* 1.5 was special - it enabled pvpanic in builtin machine */
pc_compat_1_6(args);
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
}
static void pc_compat_1_3(QEMUMachineInitArgs *args)
{
pc_compat_1_4(args);
enable_compat_apic_id_mode();
}
/* PC compat function for pc-0.14 to pc-1.2 */
static void pc_compat_1_2(QEMUMachineInitArgs *args)
{
pc_compat_1_3(args);
disable_kvm_pv_eoi();
}
static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
{
pc_compat_1_6(args);
pc_init_pci(args); pc_init_pci(args);
} }
static void pc_init_pci_1_5(QEMUMachineInitArgs *args) static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
{ {
has_pvpanic = true; pc_compat_1_5(args);
pc_init_pci_1_6(args); pc_init_pci(args);
} }
static void pc_init_pci_1_4(QEMUMachineInitArgs *args) static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
{ {
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); pc_compat_1_4(args);
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); pc_init_pci(args);
/* 1.5 was special - it enabled pvpanic in builtin machine */
pc_init_pci_1_6(args);
} }
static void pc_init_pci_1_3(QEMUMachineInitArgs *args) static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
{ {
enable_compat_apic_id_mode(); pc_compat_1_3(args);
pc_init_pci_1_4(args); pc_init_pci(args);
} }
/* PC machine init function for pc-0.14 to pc-1.2 */ /* PC machine init function for pc-0.14 to pc-1.2 */
static void pc_init_pci_1_2(QEMUMachineInitArgs *args) static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
{ {
disable_kvm_pv_eoi(); pc_compat_1_2(args);
pc_init_pci_1_3(args); pc_init_pci(args);
} }
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */ /* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */

31
hw/i386/pc_q35.c
View File

@ -215,25 +215,42 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
} }
} }
static void pc_q35_init_1_6(QEMUMachineInitArgs *args) static void pc_compat_1_6(QEMUMachineInitArgs *args)
{ {
has_pci_info = false; has_pci_info = false;
rom_file_in_ram = false; rom_file_in_ram = false;
}
static void pc_compat_1_5(QEMUMachineInitArgs *args)
{
pc_compat_1_6(args);
has_pvpanic = true;
}
static void pc_compat_1_4(QEMUMachineInitArgs *args)
{
/* 1.5 was special - it enabled pvpanic in builtin machine */
pc_compat_1_6(args);
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
}
static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
{
pc_compat_1_6(args);
pc_q35_init(args); pc_q35_init(args);
} }
static void pc_q35_init_1_5(QEMUMachineInitArgs *args) static void pc_q35_init_1_5(QEMUMachineInitArgs *args)
{ {
has_pvpanic = true; pc_compat_1_5(args);
pc_q35_init_1_6(args); pc_q35_init(args);
} }
static void pc_q35_init_1_4(QEMUMachineInitArgs *args) static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
{ {
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); pc_compat_1_4(args);
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); pc_q35_init(args);
/* 1.5 was special - it enabled pvpanic in builtin machine */
pc_q35_init_1_6(args);
} }
static QEMUMachine pc_q35_machine_v1_6 = { static QEMUMachine pc_q35_machine_v1_6 = {