| Submitter | Eduardo Habkost |
|---|---|
| Date | Dec. 12, 2012, 10:22 p.m. |
| Message ID | <1355350946-28010-3-git-send-email-ehabkost@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/205668/ |
| State | New |
| Headers | show |
Comments
On Wed, 12 Dec 2012 20:22:25 -0200 Eduardo Habkost <ehabkost@redhat.com> wrote: While at it, could you remove the last <TAB> as well? > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index a2ee8bb..25f7500 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1865,10 +1865,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > /* XXX: The physical address space is limited to 42 bits in exec.c. */ > *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; > -- > 1.7.11.7 >
On Thu, Dec 13, 2012 at 12:36:02AM +0100, Igor Mammedov wrote: > On Wed, 12 Dec 2012 20:22:25 -0200 > Eduardo Habkost <ehabkost@redhat.com> wrote: > > While at it, could you remove the last <TAB> as well? I didn't even notice it was there. I will do that in case I have to resubmit this series, or send a separate patch to qemu-trivial later, in case this version gets included. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > > --- > > target-i386/cpu.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > index a2ee8bb..25f7500 100644 > > --- a/target-i386/cpu.c > > +++ b/target-i386/cpu.c > > @@ -1865,10 +1865,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > > /* XXX: The physical address space is limited to 42 bits in exec.c. */ > > *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; > > -- > > 1.7.11.7 > > > > > -- > Regards, > Igor
Patch
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a2ee8bb..25f7500 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1865,10 +1865,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, /* XXX: The physical address space is limited to 42 bits in exec.c. */ *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;
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)