Signed-off-by: Glauber Costa <glom...@redhat.com>
---
kvm-all.c | 3 ---
qemu-kvm-x86.c | 20 ++++++++++----------
qemu-kvm.c | 26 +++++++++++++-------------
qemu-kvm.h | 1 +
4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index 1356aa8..5ea999e 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -861,7 +861,6 @@ int kvm_vm_ioctl(KVMState *s, int type, ...)
return ret;
}
-#ifdef KVM_UPSTREAM
int kvm_vcpu_ioctl(CPUState *env, int type, ...)
{
int ret;
@@ -879,8 +878,6 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...)
return ret;
}
-#endif
-
int kvm_has_sync_mmu(void)
{
#ifdef KVM_CAP_SYNC_MMU
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 8c4140d..fd0e6a9 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -179,7 +179,7 @@ int kvm_enable_vapic(CPUState *env, uint64_t vapic)
.vapic_addr = vapic,
};
- r = ioctl(env->kvm_fd, KVM_SET_VAPIC_ADDR, &va);
+ r = kvm_vcpu_ioctl(env, KVM_SET_VAPIC_ADDR, &va);
if (r == -1) {
r = -errno;
perror("kvm_enable_vapic");
@@ -286,7 +286,7 @@ int kvm_get_lapic(CPUState *env, struct kvm_lapic_state *s)
int r;
if (!kvm_irqchip_in_kernel())
return 0;
- r = ioctl(env->kvm_fd, KVM_GET_LAPIC, s);
+ r = kvm_vcpu_ioctl(env, KVM_GET_LAPIC, s);
if (r == -1) {
r = -errno;
perror("kvm_get_lapic");
@@ -299,7 +299,7 @@ int kvm_set_lapic(CPUState *env, struct kvm_lapic_state *s)
int r;
if (!kvm_irqchip_in_kernel())
return 0;
- r = ioctl(env->kvm_fd, KVM_SET_LAPIC, s);
+ r = kvm_vcpu_ioctl(env, KVM_SET_LAPIC, s);
if (r == -1) {
r = -errno;
perror("kvm_set_lapic");
@@ -424,7 +424,7 @@ int kvm_get_msrs(CPUState *env, struct kvm_msr_entry *msrs,
int n)
kmsrs->nmsrs = n;
memcpy(kmsrs->entries, msrs, n * sizeof *msrs);
- r = ioctl(env->kvm_fd, KVM_GET_MSRS, kmsrs);
+ r = kvm_vcpu_ioctl(env, KVM_GET_MSRS, kmsrs);
e = errno;
memcpy(msrs, kmsrs->entries, n * sizeof *msrs);
free(kmsrs);
@@ -439,7 +439,7 @@ int kvm_set_msrs(CPUState *env, struct kvm_msr_entry *msrs,
int n)
kmsrs->nmsrs = n;
memcpy(kmsrs->entries, msrs, n * sizeof *msrs);
- r = ioctl(env->kvm_fd, KVM_SET_MSRS, kmsrs);
+ r = kvm_vcpu_ioctl(env, KVM_SET_MSRS, kmsrs);
e = errno;
free(kmsrs);
errno = e;
@@ -464,7 +464,7 @@ int kvm_get_mce_cap_supported(kvm_context_t kvm, uint64_t
*mce_cap,
int kvm_setup_mce(CPUState *env, uint64_t *mcg_cap)
{
#ifdef KVM_CAP_MCE
- return ioctl(env->kvm_fd, KVM_X86_SETUP_MCE, mcg_cap);
+ return kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, mcg_cap);
#else
return -ENOSYS;
#endif
@@ -473,7 +473,7 @@ int kvm_setup_mce(CPUState *env, uint64_t *mcg_cap)
int kvm_set_mce(CPUState *env, struct kvm_x86_mce *m)
{
#ifdef KVM_CAP_MCE
- return ioctl(env->kvm_fd, KVM_X86_SET_MCE, m);
+ return kvm_vcpu_ioctl(env, KVM_X86_SET_MCE, m);
#else
return -ENOSYS;
#endif
@@ -563,7 +563,7 @@ int kvm_setup_cpuid(CPUState *env, int nent,
cpuid->nent = nent;
memcpy(cpuid->entries, entries, nent * sizeof(*entries));
- r = ioctl(env->kvm_fd, KVM_SET_CPUID, cpuid);
+ r = kvm_vcpu_ioctl(env, KVM_SET_CPUID, cpuid);
free(cpuid);
return r;
@@ -579,7 +579,7 @@ int kvm_setup_cpuid2(CPUState *env, int nent,
cpuid->nent = nent;
memcpy(cpuid->entries, entries, nent * sizeof(*entries));
- r = ioctl(env->kvm_fd, KVM_SET_CPUID2, cpuid);
+ r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, cpuid);
if (r == -1) {
fprintf(stderr, "kvm_setup_cpuid2: %m\n");
r = -errno;
@@ -634,7 +634,7 @@ static int tpr_access_reporting(CPUState *env, int enabled)
r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_VAPIC);
if (r <= 0)
return -ENOSYS;
- r = ioctl(env->kvm_fd, KVM_TPR_ACCESS_REPORTING, &tac);
+ r = kvm_vcpu_ioctl(env, KVM_TPR_ACCESS_REPORTING, &tac);
if (r == -1) {
r = -errno;
perror("KVM_TPR_ACCESS_REPORTING");
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 7943281..5284426 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -816,32 +816,32 @@ static int handle_debug(CPUState *env)
int kvm_get_regs(CPUState *env, struct kvm_regs *regs)
{
- return ioctl(env->kvm_fd, KVM_GET_REGS, regs);
+ return kvm_vcpu_ioctl(env, KVM_GET_REGS, regs);
}
int kvm_set_regs(CPUState *env, struct kvm_regs *regs)
{
- return ioctl(env->kvm_fd, KVM_SET_REGS, regs);
+ return kvm_vcpu_ioctl(env, KVM_SET_REGS, regs);
}
int kvm_get_fpu(CPUState *env, struct kvm_fpu *fpu)
{
- return ioctl(env->kvm_fd, KVM_GET_FPU, fpu);
+ return kvm_vcpu_ioctl(env, KVM_GET_FPU, fpu);
}
int kvm_set_fpu(CPUState *env, struct kvm_fpu *fpu)
{
- return ioctl(env->kvm_fd, KVM_SET_FPU, fpu);
+ return kvm_vcpu_ioctl(env, KVM_SET_FPU, fpu);
}
int kvm_get_sregs(CPUState *env, struct kvm_sregs *sregs)
{
- return ioctl(env->kvm_fd, KVM_GET_SREGS, sregs);
+ return kvm_vcpu_ioctl(env, KVM_GET_SREGS, sregs);
}
int kvm_set_sregs(CPUState *env, struct kvm_sregs *sregs)
{
- return ioctl(env->kvm_fd, KVM_SET_SREGS, sregs);
+ return kvm_vcpu_ioctl(env, KVM_SET_SREGS, sregs);
}
#ifdef KVM_CAP_MP_STATE
@@ -851,7 +851,7 @@ int kvm_get_mpstate(CPUState *env, struct kvm_mp_state
*mp_state)
r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_MP_STATE);
if (r > 0)
- return ioctl(env->kvm_fd, KVM_GET_MP_STATE, mp_state);
+ return kvm_vcpu_ioctl(env, KVM_GET_MP_STATE, mp_state);
return -ENOSYS;
}
@@ -861,7 +861,7 @@ int kvm_set_mpstate(CPUState *env, struct kvm_mp_state
*mp_state)
r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_MP_STATE);
if (r > 0)
- return ioctl(env->kvm_fd, KVM_SET_MP_STATE, mp_state);
+ return kvm_vcpu_ioctl(env, KVM_SET_MP_STATE, mp_state);
return -ENOSYS;
}
#endif
@@ -1046,13 +1046,13 @@ int kvm_inject_irq(CPUState *env, unsigned irq)
struct kvm_interrupt intr;
intr.irq = irq;
- return ioctl(env->kvm_fd, KVM_INTERRUPT, &intr);
+ return kvm_vcpu_ioctl(env, KVM_INTERRUPT, &intr);
}
#ifdef KVM_CAP_SET_GUEST_DEBUG
int kvm_set_guest_debug(CPUState *env, struct kvm_guest_debug *dbg)
{
- return ioctl(env->kvm_fd, KVM_SET_GUEST_DEBUG, dbg);
+ return kvm_vcpu_ioctl(env, KVM_SET_GUEST_DEBUG, dbg);
}
#endif
@@ -1062,7 +1062,7 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t
*sigset)
int r;
if (!sigset) {
- r = ioctl(env->kvm_fd, KVM_SET_SIGNAL_MASK, NULL);
+ r = kvm_vcpu_ioctl(env, KVM_SET_SIGNAL_MASK, NULL);
if (r == -1)
r = -errno;
return r;
@@ -1071,7 +1071,7 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t
*sigset)
sigmask->len = 8;
memcpy(sigmask->sigset, sigset, sizeof(*sigset));
- r = ioctl(env->kvm_fd, KVM_SET_SIGNAL_MASK, sigmask);
+ r = kvm_vcpu_ioctl(env, KVM_SET_SIGNAL_MASK, sigmask);
if (r == -1)
r = -errno;
free(sigmask);
@@ -1086,7 +1086,7 @@ int kvm_pit_in_kernel(kvm_context_t kvm)
int kvm_inject_nmi(CPUState *env)
{
#ifdef KVM_CAP_USER_NMI
- return ioctl(env->kvm_fd, KVM_NMI);
+ return kvm_vcpu_ioctl(env, KVM_NMI);
#else
return -ENOSYS;
#endif
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 588bc80..06507a6 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -1181,6 +1181,7 @@ extern KVMState *kvm_state;
int kvm_ioctl(KVMState *s, int type, ...);
int kvm_vm_ioctl(KVMState *s, int type, ...);
+int kvm_vcpu_ioctl(CPUState *env, int type, ...);
int kvm_check_extension(KVMState *s, unsigned int ext);
#endif
--
1.6.2.5
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
