[Qemu-devel] [PULL stable-1.5 0/1] QOM CPUState stable patch queue 2013-08-13

[Qemu-devel] [PULL stable-1.5 0/1] QOM CPUState stable patch queue 2013-08-13

[Andreas Färber]

Hello Michael,

The following changes since commit 58ef8c530ca5d265f575ef88e93c0214d5740b0a:

  vhost: clear signalled_used_valid on vhost stop (2013-08-13 10:04:40 -0500)

are available in the git repository at:

  git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-1.5

for you to fetch changes up to 9975e9916e70933315441616860a4b555b825e0d:

  pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older (2013-08-13 19:18:02 +0200)

----------------------------------------------------------------
QOM CPUState and X86CPU for stable-1.5

* Fix X86CPU Westmere CPUID for pc-*-1.4 and older

----------------------------------------------------------------
Eduardo Habkost (1):
      pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older

 hw/i386/pc_piix.c | 1 +
 hw/i386/pc_q35.c  | 1 +
 2 files changed, 2 insertions(+)

[Qemu-devel] [PULL stable-1.5 1/1] pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older

[Andreas Färber]

From: Eduardo Habkost <ehabkost@redhat.com>

Commit 41cb383f42d0cb51d8e3e25e3ecebc954dd4196f made a guest-visible
change by adding the PCLMULQDQ bit to Westmere without adding
compatibility code to keep the ABI for older machine-types.
Fix it by adding the missing compat code.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
(cherry picked from commit 56383703c060777fd01aaf8d63d5f46d660e9fb9)

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/i386/pc_piix.c | 1 +
 hw/i386/pc_q35.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 06416ce..aa03436 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -250,6 +250,7 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
 {
     has_pvpanic = false;
     x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
+    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
     pc_init_pci(args);
 }
 
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 7888dfe..1cceeb0 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -212,6 +212,7 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
 {
     has_pvpanic = false;
     x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
+    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
     pc_q35_init(args);
 }
 
-- 
1.8.1.4

Re: [Qemu-devel] [PULL stable-1.5 0/1] QOM CPUState stable patch queue 2013-08-13

[Michael Roth]

Quoting Andreas Färber (2013-08-13 12:30:48)
> Hello Michael,
> 
> The following changes since commit 58ef8c530ca5d265f575ef88e93c0214d5740b0a:
> 
>   vhost: clear signalled_used_valid on vhost stop (2013-08-13 10:04:40 -0500)
> 
> are available in the git repository at:
> 
>   git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-1.5
> 
> for you to fetch changes up to 9975e9916e70933315441616860a4b555b825e0d:
> 
>   pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older (2013-08-13 19:18:02 +0200)

Pulled, thanks.

> 
> ----------------------------------------------------------------
> QOM CPUState and X86CPU for stable-1.5
> 
> * Fix X86CPU Westmere CPUID for pc-*-1.4 and older
> 
> ----------------------------------------------------------------
> Eduardo Habkost (1):
>       pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older
> 
>  hw/i386/pc_piix.c | 1 +
>  hw/i386/pc_q35.c  | 1 +
>  2 files changed, 2 insertions(+)