kvm: Move x86-specific functions into target-i386/kvm.c
The functions for checking xcrs, xsave and pit_state2 are only used on x86, so they should reside in target-i386/kvm.c. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <1444933820-6968-1-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
dc9f06ca81
commit
28143b409f
|
@ -191,8 +191,6 @@ int kvm_has_sync_mmu(void);
|
||||||
int kvm_has_vcpu_events(void);
|
int kvm_has_vcpu_events(void);
|
||||||
int kvm_has_robust_singlestep(void);
|
int kvm_has_robust_singlestep(void);
|
||||||
int kvm_has_debugregs(void);
|
int kvm_has_debugregs(void);
|
||||||
int kvm_has_xsave(void);
|
|
||||||
int kvm_has_xcrs(void);
|
|
||||||
int kvm_has_pit_state2(void);
|
int kvm_has_pit_state2(void);
|
||||||
int kvm_has_many_ioeventfds(void);
|
int kvm_has_many_ioeventfds(void);
|
||||||
int kvm_has_gsi_routing(void);
|
int kvm_has_gsi_routing(void);
|
||||||
|
|
29
kvm-all.c
29
kvm-all.c
|
@ -77,8 +77,6 @@ struct KVMState
|
||||||
#ifdef KVM_CAP_SET_GUEST_DEBUG
|
#ifdef KVM_CAP_SET_GUEST_DEBUG
|
||||||
struct kvm_sw_breakpoint_head kvm_sw_breakpoints;
|
struct kvm_sw_breakpoint_head kvm_sw_breakpoints;
|
||||||
#endif
|
#endif
|
||||||
int pit_state2;
|
|
||||||
int xsave, xcrs;
|
|
||||||
int many_ioeventfds;
|
int many_ioeventfds;
|
||||||
int intx_set_mask;
|
int intx_set_mask;
|
||||||
/* The man page (and posix) say ioctl numbers are signed int, but
|
/* The man page (and posix) say ioctl numbers are signed int, but
|
||||||
|
@ -1586,18 +1584,6 @@ static int kvm_init(MachineState *ms)
|
||||||
s->debugregs = kvm_check_extension(s, KVM_CAP_DEBUGREGS);
|
s->debugregs = kvm_check_extension(s, KVM_CAP_DEBUGREGS);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef KVM_CAP_XSAVE
|
|
||||||
s->xsave = kvm_check_extension(s, KVM_CAP_XSAVE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef KVM_CAP_XCRS
|
|
||||||
s->xcrs = kvm_check_extension(s, KVM_CAP_XCRS);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef KVM_CAP_PIT_STATE2
|
|
||||||
s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef KVM_CAP_IRQ_ROUTING
|
#ifdef KVM_CAP_IRQ_ROUTING
|
||||||
kvm_direct_msi_allowed = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0);
|
kvm_direct_msi_allowed = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0);
|
||||||
#endif
|
#endif
|
||||||
|
@ -2063,21 +2049,6 @@ int kvm_has_debugregs(void)
|
||||||
return kvm_state->debugregs;
|
return kvm_state->debugregs;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_has_xsave(void)
|
|
||||||
{
|
|
||||||
return kvm_state->xsave;
|
|
||||||
}
|
|
||||||
|
|
||||||
int kvm_has_xcrs(void)
|
|
||||||
{
|
|
||||||
return kvm_state->xcrs;
|
|
||||||
}
|
|
||||||
|
|
||||||
int kvm_has_pit_state2(void)
|
|
||||||
{
|
|
||||||
return kvm_state->pit_state2;
|
|
||||||
}
|
|
||||||
|
|
||||||
int kvm_has_many_ioeventfds(void)
|
int kvm_has_many_ioeventfds(void)
|
||||||
{
|
{
|
||||||
if (!kvm_enabled()) {
|
if (!kvm_enabled()) {
|
||||||
|
|
|
@ -67,11 +67,6 @@ int kvm_has_many_ioeventfds(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_has_pit_state2(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void kvm_setup_guest_memory(void *start, size_t size)
|
void kvm_setup_guest_memory(void *start, size_t size)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,6 +91,15 @@ static bool has_msr_xss;
|
||||||
static bool has_msr_architectural_pmu;
|
static bool has_msr_architectural_pmu;
|
||||||
static uint32_t num_architectural_pmu_counters;
|
static uint32_t num_architectural_pmu_counters;
|
||||||
|
|
||||||
|
static int has_xsave;
|
||||||
|
static int has_xcrs;
|
||||||
|
static int has_pit_state2;
|
||||||
|
|
||||||
|
int kvm_has_pit_state2(void)
|
||||||
|
{
|
||||||
|
return has_pit_state2;
|
||||||
|
}
|
||||||
|
|
||||||
bool kvm_has_smm(void)
|
bool kvm_has_smm(void)
|
||||||
{
|
{
|
||||||
return kvm_check_extension(kvm_state, KVM_CAP_X86_SMM);
|
return kvm_check_extension(kvm_state, KVM_CAP_X86_SMM);
|
||||||
|
@ -766,7 +775,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (kvm_has_xsave()) {
|
if (has_xsave) {
|
||||||
env->kvm_xsave_buf = qemu_memalign(4096, sizeof(struct kvm_xsave));
|
env->kvm_xsave_buf = qemu_memalign(4096, sizeof(struct kvm_xsave));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -934,6 +943,18 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
|
||||||
int ret;
|
int ret;
|
||||||
struct utsname utsname;
|
struct utsname utsname;
|
||||||
|
|
||||||
|
#ifdef KVM_CAP_XSAVE
|
||||||
|
has_xsave = kvm_check_extension(s, KVM_CAP_XSAVE);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef KVM_CAP_XCRS
|
||||||
|
has_xcrs = kvm_check_extension(s, KVM_CAP_XCRS);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef KVM_CAP_PIT_STATE2
|
||||||
|
has_pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);
|
||||||
|
#endif
|
||||||
|
|
||||||
ret = kvm_get_supported_msrs(s);
|
ret = kvm_get_supported_msrs(s);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1142,7 +1163,7 @@ static int kvm_put_xsave(X86CPU *cpu)
|
||||||
uint8_t *xmm, *ymmh, *zmmh;
|
uint8_t *xmm, *ymmh, *zmmh;
|
||||||
int i, r;
|
int i, r;
|
||||||
|
|
||||||
if (!kvm_has_xsave()) {
|
if (!has_xsave) {
|
||||||
return kvm_put_fpu(cpu);
|
return kvm_put_fpu(cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1196,7 +1217,7 @@ static int kvm_put_xcrs(X86CPU *cpu)
|
||||||
CPUX86State *env = &cpu->env;
|
CPUX86State *env = &cpu->env;
|
||||||
struct kvm_xcrs xcrs = {};
|
struct kvm_xcrs xcrs = {};
|
||||||
|
|
||||||
if (!kvm_has_xcrs()) {
|
if (!has_xcrs) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1525,7 +1546,7 @@ static int kvm_get_xsave(X86CPU *cpu)
|
||||||
const uint8_t *xmm, *ymmh, *zmmh;
|
const uint8_t *xmm, *ymmh, *zmmh;
|
||||||
uint16_t cwd, swd, twd;
|
uint16_t cwd, swd, twd;
|
||||||
|
|
||||||
if (!kvm_has_xsave()) {
|
if (!has_xsave) {
|
||||||
return kvm_get_fpu(cpu);
|
return kvm_get_fpu(cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1584,7 +1605,7 @@ static int kvm_get_xcrs(X86CPU *cpu)
|
||||||
int i, ret;
|
int i, ret;
|
||||||
struct kvm_xcrs xcrs;
|
struct kvm_xcrs xcrs;
|
||||||
|
|
||||||
if (!kvm_has_xcrs()) {
|
if (!has_xcrs) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue