[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/49] target-i386/kvm: set Hyper-V features cpuid bi
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/49] target-i386/kvm: set Hyper-V features cpuid bit HV_X64_MSR_VP_INDEX_AVAILABLE |
Date: |
Fri, 16 Oct 2015 10:49:33 +0200 |
From: Andrey Smetanin <address@hidden>
Hyper-V features bit HV_X64_MSR_VP_INDEX_AVAILABLE value is
based on cpu option "hv-vpindex" and kernel support of
HV_X64_MSR_VP_INDEX.
Signed-off-by: Andrey Smetanin <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Richard Henderson <address@hidden>
CC: Eduardo Habkost <address@hidden>
CC: "Andreas Färber" <address@hidden>
CC: Marcelo Tosatti <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-i386/cpu-qom.h | 1 +
target-i386/cpu.c | 1 +
target-i386/kvm.c | 11 ++++++++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index ed8fd18..8b5439b 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -91,6 +91,7 @@ typedef struct X86CPU {
bool hyperv_time;
bool hyperv_crash;
bool hyperv_reset;
+ bool hyperv_vpindex;
bool check_cpuid;
bool enforce_cpuid;
bool expose_kvm;
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 230ecf4..741b94e 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3141,6 +3141,7 @@ static Property x86_cpu_properties[] = {
DEFINE_PROP_BOOL("hv-time", X86CPU, hyperv_time, false),
DEFINE_PROP_BOOL("hv-crash", X86CPU, hyperv_crash, false),
DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false),
+ DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false),
DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, false),
DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),
DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true),
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 401a2f3..4d5ff9a 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -83,6 +83,7 @@ static bool has_msr_hv_vapic;
static bool has_msr_hv_tsc;
static bool has_msr_hv_crash;
static bool has_msr_hv_reset;
+static bool has_msr_hv_vpindex;
static bool has_msr_mtrr;
static bool has_msr_xss;
@@ -462,7 +463,8 @@ static bool hyperv_enabled(X86CPU *cpu)
cpu->hyperv_time ||
cpu->hyperv_relaxed_timing ||
cpu->hyperv_crash ||
- cpu->hyperv_reset);
+ cpu->hyperv_reset ||
+ cpu->hyperv_vpindex);
}
static Error *invtsc_mig_blocker;
@@ -534,6 +536,9 @@ int kvm_arch_init_vcpu(CPUState *cs)
if (cpu->hyperv_reset && has_msr_hv_reset) {
c->eax |= HV_X64_MSR_RESET_AVAILABLE;
}
+ if (cpu->hyperv_vpindex && has_msr_hv_vpindex) {
+ c->eax |= HV_X64_MSR_VP_INDEX_AVAILABLE;
+ }
c = &cpuid_data.entries[cpuid_i++];
c->function = HYPERV_CPUID_ENLIGHTMENT_INFO;
if (cpu->hyperv_relaxed_timing) {
@@ -866,6 +871,10 @@ static int kvm_get_supported_msrs(KVMState *s)
has_msr_hv_reset = true;
continue;
}
+ if (kvm_msr_list->indices[i] == HV_X64_MSR_VP_INDEX) {
+ has_msr_hv_vpindex = true;
+ continue;
+ }
}
}
--
2.5.0
- [Qemu-devel] [PULL 01/49] nbd: switch from g_slice allocator to malloc, (continued)
- [Qemu-devel] [PULL 01/49] nbd: switch from g_slice allocator to malloc, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 02/49] scsi: switch from g_slice allocator to malloc, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 03/49] megasas: fix megasas_get_sata_addr, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 06/49] cpu-exec-common.c: Clarify comment about cpu_reload_memory_map()'s RCU operations, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 04/49] configure: Require Python 2.6, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 05/49] exec.c: Don't call cpu_reload_memory_map() from cpu_exec_init(), Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 07/49] exec.c: Collect AddressSpace related fields into a CPUAddressSpace struct, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 09/49] linux-headers: update from kvm/next, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 08/49] checkpatch: allow open braces on typedef lines, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 10/49] target-i386/kvm: Hyper-V HV_X64_MSR_RESET support, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 11/49] target-i386/kvm: set Hyper-V features cpuid bit HV_X64_MSR_VP_INDEX_AVAILABLE,
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/49] exec: remove non-TCG stuff from exec-all.h header., Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 12/49] target-i386/kvm: Hyper-V HV_X64_MSR_VP_RUNTIME support, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 14/49] kvm-all: Align to qemu_real_host_page_size in kvm_set_phys_mem, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 15/49] checkpatch: port fix from kernel "## is not a valid modifier", Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 16/49] MAINTAINERS: add two devices to the e500 section, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 18/49] MAINTAINERS: Add more pxa2xx files and boards, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 19/49] MAINTAINERS: Add maintainer for ARM PrimeCell and integrated devices, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 21/49] qemu-sockets: fix conversion of ipv4/ipv6 JSON to QemuOpts, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 20/49] MAINTAINERS: Add more devices to realview board, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 26/49] qemu-char: convert file backend to data-driven creation, Paolo Bonzini, 2015/10/16