On 2011-05-31 03:25, BrillyWu wrote: > Hi, Jan > >> patch which has >>> been checked. It can be compiled without any error and work >> normally. >>> The patch v3 is here now. >> >> The above text can't be used as a commit log, so this needs to be >> fixed. >> Moreover, your patch still contains at least on style issues >> scripts/checkpatch.pl should have caught. Are you sure you ran it? >> > > 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:
@@ -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;
+ }
} 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.
Jan
signature.asc
Description: OpenPGP digital signature
