Re: [Qemu-devel] [PATCH] Qemu: Fix eax for cpuid leaf 0x40000000

[Bandan Das]

Jidong Xiao <address@hidden> writes:

> On Wed, Jun 4, 2014 at 3:09 AM, Paolo Bonzini <address@hidden> wrote:
>> Il 04/06/2014 03:10, Jidong Xiao ha scritto:
>>
>>> diff --git a/qemu-2.0.0/target-i386/kvm.c.orig
>>> b/qemu-2.0.0/target-i386/kvm.c
>>> index 4389959..b8b282d 100644
>>> --- a/qemu-2.0.0/target-i386/kvm.c.orig
>>> +++ b/qemu-2.0.0/target-i386/kvm.c
>>> @@ -530,7 +530,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
>>>      memcpy(signature, "KVMKVMKVM\0\0\0", 12);
>>>      c = &cpuid_data.entries[cpuid_i++];
>>>      c->function = KVM_CPUID_SIGNATURE | kvm_base;
>>> -    c->eax = 0;
>>> +   c->eax = KVM_CPUID_FEATURES;
>>>      c->ebx = signature[0];
>>>      c->ecx = signature[1];
>>>      c->edx = signature[2];
>>
>>
>> This should actually be "KVM_CPUID_FEATURES | kvm_base", in case Hyper-V
>> leaves are available too.  But it is a good catch!
>>
>> Paolo
>>
> Thanks Paolo. I have just added that and resend the patch as following:
>
> -Jidong
>
> ===
> Signed-off-by: Jidong Xiao <address@hidden>

Did you mean to send this as the new version of your patch ?
Please send the revised version in a separate email and add 
"[PATCH v2]" to the subject.

> ---
> diff --git a/qemu-2.0.0/target-i386/kvm.c.orig b/qemu-2.0.0/target-i386/kvm.c
> index 4389959..fe49a75 100644
> --- a/qemu-2.0.0/target-i386/kvm.c.orig
> +++ b/qemu-2.0.0/target-i386/kvm.c
> @@ -530,7 +530,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
>      memcpy(signature, "KVMKVMKVM\0\0\0", 12);
>      c = &cpuid_data.entries[cpuid_i++];
>      c->function = KVM_CPUID_SIGNATURE | kvm_base;
> -    c->eax = 0;
> +   c->eax = KVM_CPUID_FEATURES | kvm_base;

Looks like this is not four spaces

>      c->ebx = signature[0];
>      c->ecx = signature[1];
>      c->edx = signature[2];