Commit 9d054ea5 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging 



QOM CPUState refactorings

* Fix X86CPU Westmere CPUID for pc-*-1.4 and older

* afaerber/tags/qom-cpu-for-anthony:
  pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older

Conflicts:
	hw/i386/pc_piix.c
	hw/i386/pc_q35.c

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 9fb7aaaf 56383703

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ static void pc_init_pci_1_5(QEMUMachineInitArgs *args) 
static void pc_init_pci_1_4(QEMUMachineInitArgs *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);

    has_pci_info = false;

    pc_init_pci(args);

}

hw/i386/pc_q35.c

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static void pc_q35_init_1_5(QEMUMachineInitArgs *args) 
static void pc_q35_init_1_4(QEMUMachineInitArgs *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);

    has_pci_info = false;

    pc_q35_init(args);

}