Commit d41e0bed authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging 



X86 fixes

# gpg: Signature made Mon 14 Mar 2016 20:26:25 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/x86-pull-request:
  kvm: Remove x2apic feature from CPU model when kernel_irqchip is off
  hyperv: cpu hotplug fix with HyperV enabled

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9828f9b6 492a4c94

target-i386/cpu.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

    }

target-i386/kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }