lkml.org 
[lkml]   [2007]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/15] KVM: Remove the 'emulated' field from the userspace interface
    Date
    We no longer emulate single instructions in userspace.  Instead, we service
    mmio or pio requests.

    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/kvm_main.c | 5 -----
    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 347467e..747966e 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 15e23bc..c6dd4a7 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;
    --
    1.5.0.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-11 14:59    [W:0.021 / U:126.544 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site