Commit 106b552b authored by Avi Kivity's avatar Avi Kivity

KVM: Remove the 'emulated' field from the userspace interface

We no longer emulate single instructions in userspace.  Instead, we service
mmio or pio requests.
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 06465c5a
...@@ -1588,11 +1588,6 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) ...@@ -1588,11 +1588,6 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
/* re-sync apic's tpr */ /* re-sync apic's tpr */
vcpu->cr8 = kvm_run->cr8; vcpu->cr8 = kvm_run->cr8;
if (kvm_run->emulated) {
kvm_arch_ops->skip_emulated_instruction(vcpu);
kvm_run->emulated = 0;
}
if (kvm_run->io_completed) { if (kvm_run->io_completed) {
if (vcpu->pio_pending) if (vcpu->pio_pending)
complete_pio(vcpu); complete_pio(vcpu);
......
...@@ -51,10 +51,9 @@ enum kvm_exit_reason { ...@@ -51,10 +51,9 @@ enum kvm_exit_reason {
/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
struct kvm_run { struct kvm_run {
/* in */ /* in */
__u32 emulated; /* skip current instruction */
__u32 io_completed; /* mmio/pio request completed */ __u32 io_completed; /* mmio/pio request completed */
__u8 request_interrupt_window; __u8 request_interrupt_window;
__u8 padding1[7]; __u8 padding1[3];
/* out */ /* out */
__u32 exit_type; __u32 exit_type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment