Am 12.03.2014 16:42, schrieb Eduardo Habkost:
> On Wed, Mar 12, 2014 at 03:36:02PM +0100, Andreas Färber wrote:
> [...]
>> [snip]
>>
>> Needed rebase:
>>
>> diff --cc hw/i386/pc_piix.c
>> index 5011c3a,ebd442e..0000000
>> --- a/hw/i386/pc_piix.c
>> +++ b/hw/i386/pc_piix.c
>> @@@ -266,7 -266,7 +266,8 @@@ static void pc_compat_1_7(QEMUMachineIn
>> {
>> smbios_type1_defaults = false;
>> gigabyte_align = false;
>> + option_rom_has_mr = true;
>> + x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);
>> }
>>
>> static void pc_compat_1_6(QEMUMachineInitArgs *args)
>> diff --cc hw/i386/pc_q35.c
>> index 4b0456a,71b05f1..0000000
>> --- a/hw/i386/pc_q35.c
>> +++ b/hw/i386/pc_q35.c
>> @@@ -244,7 -244,8 +244,8 @@@ static void pc_compat_1_7(QEMUMachineIn
>> {
>> smbios_type1_defaults = false;
>> gigabyte_align = false;
>> + option_rom_has_mr = true;
>> + x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);
>> -
>> }
>>
>> static void pc_compat_1_6(QEMUMachineInitArgs *args)
>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
>
> (I am guessing there's no need to resubmit. That's right?)
Right, just FYI that there's changes happening on my branch and that
things are still being prepared and retested for submission.
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
