aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/kvm_main.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-03-04 07:17:08 -0500
committerAvi Kivity <avi@qumranet.com>2007-05-03 03:52:24 -0400
commit8eb7d334bd8e693340ee198280f7d45035cdab8c (patch)
tree438ec0b6b6c7714e436884576a3fdce84507813f /drivers/kvm/kvm_main.c
parentb4e63f560beb187cffdaf706e534a1e2f9effb66 (diff)
KVM: Fold kvm_run::exit_type into kvm_run::exit_reason
Currently, userspace is told about the nature of the last exit from the guest using two fields, exit_type and exit_reason, where exit_type has just two enumerations (and no need for more). So fold exit_type into exit_reason, reducing the complexity of determining what really happened. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
-rw-r--r--drivers/kvm/kvm_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index de93117f1e97..ac44df551aa8 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -1608,8 +1608,7 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
1608 1608
1609 vcpu->mmio_needed = 0; 1609 vcpu->mmio_needed = 0;
1610 1610
1611 if (kvm_run->exit_type == KVM_EXIT_TYPE_VM_EXIT 1611 if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) {
1612 && kvm_run->exit_reason == KVM_EXIT_HYPERCALL) {
1613 kvm_arch_ops->cache_regs(vcpu); 1612 kvm_arch_ops->cache_regs(vcpu);
1614 vcpu->regs[VCPU_REGS_RAX] = kvm_run->hypercall.ret; 1613 vcpu->regs[VCPU_REGS_RAX] = kvm_run->hypercall.ret;
1615 kvm_arch_ops->decache_regs(vcpu); 1614 kvm_arch_ops->decache_regs(vcpu);