Message ID | 1365710844-30453-2-git-send-email-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
On Thu, 11 Apr 2013 17:07:23 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > * Add braces to 'if' statements; > * Remove last TAB character from the source. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index f1ccc72..c2e02fe 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1870,12 +1870,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t > index, uint32_t count, if (env->cpuid_ext2_features & CPUID_EXT2_LM) { > /* 64 bit processor */ > /* XXX: The physical address space is limited to 42 bits in exec.c. */ > - *eax = 0x00003028; /* 48 bits virtual, 40 bits physical > */ > + *eax = 0x00003028; /* 48 bits virtual, 40 bits physical */ ^^ 2 spaces when in other places only one > } else { > - if (env->cpuid_features & CPUID_PSE36) > + if (env->cpuid_features & CPUID_PSE36) { > *eax = 0x00000024; /* 36 bits physical */ > - else > + } else { > *eax = 0x00000020; /* 32 bits physical */ > + } > } > *ebx = 0; > *ecx = 0; with fix above Reviewed-By: Igor Mammedov <imammedo@redhat.com>
Am 15.04.2013 10:27, schrieb Igor Mammedov: > On Thu, 11 Apr 2013 17:07:23 -0300 > Eduardo Habkost <ehabkost@redhat.com> wrote: > >> * Add braces to 'if' statements; >> * Remove last TAB character from the source. >> >> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> >> --- >> target-i386/cpu.c | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/target-i386/cpu.c b/target-i386/cpu.c >> index f1ccc72..c2e02fe 100644 >> --- a/target-i386/cpu.c >> +++ b/target-i386/cpu.c >> @@ -1870,12 +1870,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t >> index, uint32_t count, if (env->cpuid_ext2_features & CPUID_EXT2_LM) { >> /* 64 bit processor */ >> /* XXX: The physical address space is limited to 42 bits in exec.c. */ >> - *eax = 0x00003028; /* 48 bits virtual, 40 bits physical >> */ >> + *eax = 0x00003028; /* 48 bits virtual, 40 bits physical */ > ^^ 2 spaces when in other places only one > >> } else { >> - if (env->cpuid_features & CPUID_PSE36) >> + if (env->cpuid_features & CPUID_PSE36) { >> *eax = 0x00000024; /* 36 bits physical */ >> - else >> + } else { >> *eax = 0x00000020; /* 32 bits physical */ >> + } >> } >> *ebx = 0; >> *ecx = 0; > > with fix above Reviewed-By: Igor Mammedov <imammedo@redhat.com> Thanks, applied to qom-cpu (with suggested change to spare resends): https://github.com/afaerber/qemu-cpu/commits/qom-cpu Andreas
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f1ccc72..c2e02fe 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1870,12 +1870,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, if (env->cpuid_ext2_features & CPUID_EXT2_LM) { /* 64 bit processor */ /* XXX: The physical address space is limited to 42 bits in exec.c. */ - *eax = 0x00003028; /* 48 bits virtual, 40 bits physical */ + *eax = 0x00003028; /* 48 bits virtual, 40 bits physical */ } else { - if (env->cpuid_features & CPUID_PSE36) + if (env->cpuid_features & CPUID_PSE36) { *eax = 0x00000024; /* 36 bits physical */ - else + } else { *eax = 0x00000020; /* 32 bits physical */ + } } *ebx = 0; *ecx = 0;
* Add braces to 'if' statements; * Remove last TAB character from the source. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)