Re: [Qemu-devel] [PATCH uq/master V2] kvm: Add CPUID support for VIA CPU

[Jan Kiszka <jan.kiszka@web.de>]

[-- Attachment #1: Type: text/plain, Size: 2211 bytes --]

On 2011-05-31 09:39, BrillyWu wrote:
> Hi, Jan
> 
>>> I am sure I have checked it with the scripts/checkpatch.pl, and it
>>> shows no error or warning. Maybe I should check whether my windows
>>> editor and  mail client can work well before sending it to
>> you. I 'm
>>> sorry.
>>
>> Sorry, you are right. Your patch revealed a bug in the checkpatch
>> script.
>>
>> Blue, this does not trigger the missing braces warning:
> 
> Do you mean the bug is that it can not trigger missing braces warining?

The script fails to detect missing braces as marked below.

> It seems that there is no missing braces in my patch, but some
> unnecessary braces.

There are no unnecessary braces according to QEMU coding style.

> 
>>
>> @@ -1035,8 +1052,17 @@ void cpu_x86_cpuid(CPUX86State *env, uin  {
>>      /* test if maximum index reached */
>>      if (index & 0x80000000) {
>> -        if (index > env->cpuid_xlevel)
>> -            index = env->cpuid_level;
>> +        if (index > env->cpuid_xlevel) {
>> +            if (env->cpuid_xlevel2 > 0) {
>> +                /* Handle the Centaur's CPUID instruction. */
>> +                if (index > env->cpuid_xlevel2) {
>> +                    index = env->cpuid_xlevel2;
>> +                } else if (index < 0xC0000000) {
>> +                    index = env->cpuid_xlevel;
>> +                }
>> +            } else
>> +                index =  env->cpuid_xlevel;

This should be:

    } else {
        index = ...
    }

>> +        }
>>      } else {
>>          if (index > env->cpuid_level)
>>              index = env->cpuid_level;
>>
>>
>>> OK, I will use the previous commit log, and send it to you
>> in the new thread.
>>
>> Thanks. I think it would be fair to fix up the braces on commit now.
> 
> It looks that there are some unnecessary braces, but if I remove them,
> the script/checkpatch.pl will report warnings. Could I ignore it?

Nope, see above.

> BTW, I have submited a patch v3 a few minutes before withou fixing up
> the braces, and I have tested it with my mail client this time, so it
> could be OK now.

Yes, your mail client works fine as far as I can see.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]