v3: use upstream kvm_vcpu_ioctl
PATCH 1/1 v3: use upstream kvm_vcpu_ioctl
[v2: we already return -errno, so fix testers ] [v3: keep error message for apic related failures ]
Signed-off-by Glauber Costa <[email protected]>
--- kvm-all.c | 3 -- qemu-kvm-x86.c | 90 +++++++++++++++++++++---------------------------------- qemu-kvm.c | 31 ++++++++----------- qemu-kvm.h | 1 + 4 files changed, 48 insertions(+), 77 deletions(-)
kvm-all.c +0 -3
@@ -863,7 +863,6 @@ int kvm_vm_ioctl(KVMState *s, int type, ...)return ret; } -#ifdef KVM_UPSTREAM int kvm_vcpu_ioctl (CPUState *env,int type, ...) {int ret;
@@ -881,8 +880,6 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...)return ret; } -#endif -int kvm_has_sync_mmu (void ) {#ifdef KVM_CAP_SYNC_MMU
qemu-kvm-x86.c +34 -56
195 lines not on this page · raw message
qemu-kvm.c +13 -18
@@ -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,18 +1062,13 @@ 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 ); -if (r ==-1 ) - r = -errno; -return r; +return kvm_vcpu_ioctl (env,KVM_SET_SIGNAL_MASK ,NULL ); } sigmask =qemu_malloc (sizeof (*sigmask) +sizeof (*sigset)); sigmask->len =8 ;memcpy (sigmask->sigset, sigset,sizeof (*sigset)); - r =ioctl (env->kvm_fd,KVM_SET_SIGNAL_MASK , sigmask); -if (r ==-1 ) - r = -errno; + r =kvm_vcpu_ioctl (env,KVM_SET_SIGNAL_MASK , sigmask);free (sigmask);return r; }
@@ -1086,7 +1081,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
qemu-kvm.h +1 -0
@@ -1168,6 +1168,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
Signature · 1 line
1.6.2.5
Marcelo Tosatti
AppliedQuoted 4 lines · Glauber Costa
[v2: we already return -errno, so fix testers ] [v3: keep error message for apic related failures ]
Signed-off-by Glauber Costa <[email protected]>
Applied, thanks.
Quoted 4 lines · Glauber Costa
[v2: we already return -errno, so fix testers ] [v3: keep error message for apic related failures ]
Signed-off-by Glauber Costa <[email protected]>
Dropped, does not compile.
Quoted 7 lines · Marcelo Tosatti
Quoted 4 lines · Glauber Costa
[v2: we already return -errno, so fix testers ] [v3: keep error message for apic related failures ]
Signed-off-by Glauber Costa <[email protected]>Dropped, does not compile.
sorry, my bad, silly mistake.
will send another