[Qemu-devel] [PULL v2 0/2] X86 fixes

[Qemu-devel] [PULL v2 0/2] X86 fixes

[Eduardo Habkost]

Now with the submodule updates removed.

The following changes since commit 618a5a8bc52ba0f2ecbb3dffd01e657f4d841f75:

  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2016-03-14 16:22:17 +0000)

are available in the git repository at:

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

for you to fetch changes up to 492a4c94be8853aa378a5dd8a1f8e3181754aabd:

  kvm: Remove x2apic feature from CPU model when kernel_irqchip is off (2016-03-14 17:26:06 -0300)

----------------------------------------------------------------
X86 fixes

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

Denis V. Lunev (1):
  hyperv: cpu hotplug fix with HyperV enabled

Lan Tianyu (1):
  kvm: Remove x2apic feature from CPU model when kernel_irqchip is off

 target-i386/cpu.c | 4 ++++
 target-i386/kvm.c | 1 +
 2 files changed, 5 insertions(+)

-- 
2.1.0

[Qemu-devel] [PULL 1/2] hyperv: cpu hotplug fix with HyperV enabled

[Eduardo Habkost]

From: "Denis V. Lunev" <den@openvz.org>

With Hyper-V enabled CPU hotplug stops working. The CPU appears
in device manager on Windows but does not appear in peformance
monitor and control panel.

The root of the problem is the following. Windows checks
HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE bit in CPUID. The
presence of this bit is enough to cure the situation.

The bit should be set when CPU hotplug is allowed for HyperV VM.
The check that hot_add_cpu callback is defined is enough from the
protocol point of view. Though this callback is defined almost
always thus there is no need to export that knowledge in the
other way.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Roman Kagan <rkagan@virtuozzo.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Richard Henderson <rth@twiddle.net>
CC: Eduardo Habkost <ehabkost@redhat.com>
CC: "Andreas Färber" <afaerber@suse.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/kvm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7974acb..08d6444 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -639,6 +639,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
         if (cpu->hyperv_crash && has_msr_hv_crash) {
             c->edx |= HV_X64_GUEST_CRASH_MSR_AVAILABLE;
         }
+        c->edx |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
         if (cpu->hyperv_reset && has_msr_hv_reset) {
             c->eax |= HV_X64_MSR_RESET_AVAILABLE;
         }
-- 
2.1.0

[Qemu-devel] [PULL 2/2] kvm: Remove x2apic feature from CPU model when kernel_irqchip is off

[Eduardo Habkost]

From: Lan Tianyu <tianyu.lan@intel.com>

x2apic feature is in the kvm_default_props and automatically added to all
CPU models when KVM is enabled. But userspace devices don't support x2apic
which can't be enabled without the in-kernel irqchip. It will trigger
warning of "host doesn't support requested feature: CPUID.01H:ECX.x2apic
[bit 21]" when kernel_irqchip is off. This patch is to fix it via removing
x2apic feature when kernel_irqchip is off.

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/cpu.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 0f38d1e..3ea6b29 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2132,6 +2132,10 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp)
 
     /* Special cases not set in the X86CPUDefinition structs: */
     if (kvm_enabled()) {
+        if (!kvm_irqchip_in_kernel()) {
+            x86_cpu_change_kvm_default("x2apic", "off");
+        }
+
         x86_cpu_apply_props(cpu, kvm_default_props);
     }
 
-- 
2.1.0

Re: [Qemu-devel] [PULL v2 0/2] X86 fixes

[Peter Maydell]

On 14 March 2016 at 20:26, Eduardo Habkost <ehabkost@redhat.com> wrote:
> Now with the submodule updates removed.
>
> The following changes since commit 618a5a8bc52ba0f2ecbb3dffd01e657f4d841f75:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2016-03-14 16:22:17 +0000)
>
> are available in the git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/x86-pull-request
>
> for you to fetch changes up to 492a4c94be8853aa378a5dd8a1f8e3181754aabd:
>
>   kvm: Remove x2apic feature from CPU model when kernel_irqchip is off (2016-03-14 17:26:06 -0300)
>
> ----------------------------------------------------------------
> X86 fixes
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] X86 fixes

[Eduardo Habkost]

The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging (2016-03-10 02:51:14 +0000)

are available in the git repository at:

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

for you to fetch changes up to b04c3b6ad8b3e802fe7ad7a3ff5a9ab980d22578:

  kvm: Remove x2apic feature from CPU model when kernel_irqchip is off (2016-03-11 15:43:48 -0300)

----------------------------------------------------------------
X86 fixes

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

Denis V. Lunev (1):
  hyperv: cpu hotplug fix with HyperV enabled

Lan Tianyu (1):
  kvm: Remove x2apic feature from CPU model when kernel_irqchip is off

 roms/SLOF         | 2 +-
 roms/openbios     | 2 +-
 target-i386/cpu.c | 4 ++++
 target-i386/kvm.c | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.1.0

[Qemu-devel] [PULL 2/2] kvm: Remove x2apic feature from CPU model when kernel_irqchip is off

[Eduardo Habkost]

From: Lan Tianyu <tianyu.lan@intel.com>

x2apic feature is in the kvm_default_props and automatically added to all
CPU models when KVM is enabled. But userspace devices don't support x2apic
which can't be enabled without the in-kernel irqchip. It will trigger
warning of "host doesn't support requested feature: CPUID.01H:ECX.x2apic
[bit 21]" when kernel_irqchip is off. This patch is to fix it via removing
x2apic feature when kernel_irqchip is off.

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/cpu.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 0f38d1e..3ea6b29 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2132,6 +2132,10 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp)
 
     /* Special cases not set in the X86CPUDefinition structs: */
     if (kvm_enabled()) {
+        if (!kvm_irqchip_in_kernel()) {
+            x86_cpu_change_kvm_default("x2apic", "off");
+        }
+
         x86_cpu_apply_props(cpu, kvm_default_props);
     }
 
-- 
2.1.0