[Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Radim Krčmář]

Previous patch changed xlevel and missed the compatibility code.

Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 include/hw/i386/pc.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index c4165740cf1c..954203d227e4 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -351,6 +351,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
             .property = "xlevel",\
             .value    = stringify(0x8000000a),\
         },{\
+            .driver   = "IvyBridge" "-" TYPE_X86_CPU,\
+            .property = "xlevel",\
+            .value    = stringify(0x8000000a),\
+        },{\
             .driver   = "Haswell" "-" TYPE_X86_CPU,\
             .property = "xlevel",\
             .value    = stringify(0x8000000a),\
-- 
2.5.0

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Andreas Färber]

Am 04.08.2015 um 16:17 schrieb Radim Krčmář:
> Previous patch changed xlevel and missed the compatibility code.
> 
> Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> ---
>  include/hw/i386/pc.h | 4 ++++
>  1 file changed, 4 insertions(+)

Looks okay,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu, Graham Norton; HRB
21284 (AG Nürnberg)

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Michael S. Tsirkin]

On Tue, Aug 04, 2015 at 04:27:53PM +0200, Andreas Färber wrote:
> Am 04.08.2015 um 16:17 schrieb Radim Krčmář:
> > Previous patch changed xlevel and missed the compatibility code.
> > 
> > Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
> > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> > ---
> >  include/hw/i386/pc.h | 4 ++++
> >  1 file changed, 4 insertions(+)
> 
> Looks okay,
> 
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> 
> Andreas

Acked-by: Michael S. Tsirkin <mst@redhat.com>

Please merge through the CPU tree.

> -- 
> SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu, Graham Norton; HRB
> 21284 (AG Nürnberg)

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Peter Maydell]

On 4 August 2015 at 16:10, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Tue, Aug 04, 2015 at 04:27:53PM +0200, Andreas Färber wrote:
>> Am 04.08.2015 um 16:17 schrieb Radim Krčmář:
>> > Previous patch changed xlevel and missed the compatibility code.
>> >
>> > Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
>> > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
>> > ---
>> >  include/hw/i386/pc.h | 4 ++++
>> >  1 file changed, 4 insertions(+)
>>
>> Looks okay,
>>
>> Reviewed-by: Andreas Färber <afaerber@suse.de>
>>
>> Andreas
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>
> Please merge through the CPU tree.

Do you object if I just apply it to master? I'd like to get
the next rc out today or tomorrow and I'm not sure we have
any other outstanding for-2.4 fixes...

-- PMM

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Michael S. Tsirkin]

On Tue, Aug 04, 2015 at 04:41:44PM +0100, Peter Maydell wrote:
> On 4 August 2015 at 16:10, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Tue, Aug 04, 2015 at 04:27:53PM +0200, Andreas Färber wrote:
> >> Am 04.08.2015 um 16:17 schrieb Radim Krčmář:
> >> > Previous patch changed xlevel and missed the compatibility code.
> >> >
> >> > Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
> >> > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> >> > ---
> >> >  include/hw/i386/pc.h | 4 ++++
> >> >  1 file changed, 4 insertions(+)
> >>
> >> Looks okay,
> >>
> >> Reviewed-by: Andreas Färber <afaerber@suse.de>
> >>
> >> Andreas
> >
> > Acked-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > Please merge through the CPU tree.
> 
> Do you object if I just apply it to master? I'd like to get
> the next rc out today or tomorrow and I'm not sure we have
> any other outstanding for-2.4 fixes...
> 
> -- PMM

I don't object.

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Eduardo Habkost]

On Tue, Aug 04, 2015 at 04:41:44PM +0100, Peter Maydell wrote:
> On 4 August 2015 at 16:10, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Tue, Aug 04, 2015 at 04:27:53PM +0200, Andreas Färber wrote:
> >> Am 04.08.2015 um 16:17 schrieb Radim Krčmář:
> >> > Previous patch changed xlevel and missed the compatibility code.
> >> >
> >> > Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
> >> > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> >> > ---
> >> >  include/hw/i386/pc.h | 4 ++++
> >> >  1 file changed, 4 insertions(+)
> >>
> >> Looks okay,
> >>
> >> Reviewed-by: Andreas Färber <afaerber@suse.de>
> >>
> >> Andreas
> >
> > Acked-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > Please merge through the CPU tree.
> 
> Do you object if I just apply it to master? I'd like to get
> the next rc out today or tomorrow and I'm not sure we have
> any other outstanding for-2.4 fixes...

No problem. If you want to, I have just published a signed tag ready for
pulling:

---------------------

The following changes since commit 426d0e7b7e031a1592292b3eb275483b341a2f28:

  Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150804' into staging (2015-08-04 12:57:06 +0100)

are available in the git repository at:

  git://github.com/ehabkost/qemu.git tags/x86-pull-request

for you to fetch changes up to 27751aabd1e0359d84314bc230beccdef2168d1f:

  target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3 (2015-08-04 12:49:32 -0300)

----------------------------------------------------------------
X86 queue, 2015-08-04

----------------------------------------------------------------

Radim Krčmář (1):
  target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

 include/hw/i386/pc.h | 4 ++++
 1 file changed, 4 insertions(+)


-- 
Eduardo

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Peter Maydell]

On 4 August 2015 at 16:50, Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Tue, Aug 04, 2015 at 04:41:44PM +0100, Peter Maydell wrote:
>> On 4 August 2015 at 16:10, Michael S. Tsirkin <mst@redhat.com> wrote:
>> > On Tue, Aug 04, 2015 at 04:27:53PM +0200, Andreas Färber wrote:
>> >> Am 04.08.2015 um 16:17 schrieb Radim Krčmář:
>> >> > Previous patch changed xlevel and missed the compatibility code.
>> >> >
>> >> > Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
>> >> > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
>> >> > ---
>> >> >  include/hw/i386/pc.h | 4 ++++
>> >> >  1 file changed, 4 insertions(+)
>> >>
>> >> Looks okay,
>> >>
>> >> Reviewed-by: Andreas Färber <afaerber@suse.de>
>> >>
>> >> Andreas
>> >
>> > Acked-by: Michael S. Tsirkin <mst@redhat.com>
>> >
>> > Please merge through the CPU tree.
>>
>> Do you object if I just apply it to master? I'd like to get
>> the next rc out today or tomorrow and I'm not sure we have
>> any other outstanding for-2.4 fixes...
>
> No problem. If you want to, I have just published a signed tag ready for
> pulling:

Great, I'll use that.

-- PMM

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Peter Maydell]

On 4 August 2015 at 16:53, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 4 August 2015 at 16:50, Eduardo Habkost <ehabkost@redhat.com> wrote:
>> No problem. If you want to, I have just published a signed tag ready for
>> pulling:
>
> Great, I'll use that.

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Eric Blake]

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

On 08/04/2015 09:41 AM, Peter Maydell wrote:
> Do you object if I just apply it to master? I'd like to get
> the next rc out today or tomorrow and I'm not sure we have
> any other outstanding for-2.4 fixes...

https://lists.gnu.org/archive/html/qemu-devel/2015-08/msg00412.html
looks like a regression in 2.4 that might be worth including in the rc...

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


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

Re: [Qemu-devel] [PATCH for-2.4] target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3

[Eduardo Habkost]

On Tue, Aug 04, 2015 at 04:17:21PM +0200, Radim Krčmář wrote:
> Previous patch changed xlevel and missed the compatibility code.
> 
> Fixes: 3046bb5debc8 ("target-i386: emulate CPUID level of real hardware")
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

Applied to the x86 tree. Thanks!

-- 
Eduardo