Am 07.12.2012 18:57, schrieb Eduardo Habkost:
> On Thu, Dec 06, 2012 at 10:06:57AM +0100, Andreas Färber wrote:
> [...]
>> ---
>> target-i386/cpu.c | 3 ---
>> 1 Datei geändert, 3 Zeilen entfernt(-)
>>
>> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
>> index a631ae9..f56aa0d 100644
>> --- a/target-i386/cpu.c
>> +++ b/target-i386/cpu.c
>> @@ -1381,9 +1381,6 @@ static int cpu_x86_parse_featurestr(x86_def_t
>> *x86_cpu_def, char *features)
>> if (kvm_check_features_against_host(x86_cpu_def) && enforce_cpuid)
>> goto error;
>> }
>> - if (x86_cpu_def->cpuid_7_0_ebx_features && x86_cpu_def->level < 7) {
>> - x86_cpu_def->level = 7;
>> - }
>> return 0;
>>
>> error:
>
> NACK. A patch chunk is missing. I will resend the fixed version, just in
> case.
Uh, mismerge... thanks for noticing! Fixed.
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
