diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-03-01 15:20:40 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-05-03 09:52:23 +0200 |
| commit | 106b552b43beac2694df5fbafc8f125a72df5f65 (patch) | |
| tree | 3d26f1f7148eaa4cb6e6d882418db283d9f2d29f | |
| parent | KVM: Handle cpuid in the kernel instead of punting to userspace (diff) | |
| download | linux-106b552b43beac2694df5fbafc8f125a72df5f65.tar.xz linux-106b552b43beac2694df5fbafc8f125a72df5f65.zip | |
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: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/kvm_main.c | 5 | ||||
| -rw-r--r-- | include/linux/kvm.h | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index caec54fbf07f..5d24203afd20 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -1588,11 +1588,6 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) /* re-sync apic's tpr */ 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 (vcpu->pio_pending) complete_pio(vcpu); diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 15e23bc06e8b..c6dd4a79b74b 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -51,10 +51,9 @@ enum kvm_exit_reason { /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ struct kvm_run { /* in */ - __u32 emulated; /* skip current instruction */ __u32 io_completed; /* mmio/pio request completed */ __u8 request_interrupt_window; - __u8 padding1[7]; + __u8 padding1[3]; /* out */ __u32 exit_type; |