Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44872
b: refs/heads/master
c: 0b76e20
h: refs/heads/master
v: v3
  • Loading branch information
Avi Kivity authored and Linus Torvalds committed Dec 22, 2006
1 parent cacdee1 commit 611208f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f8e3d365a30a8788d4c348e2885bac9640bf4d0
refs/heads/master: 0b76e20b27d20f7cb240e6b1b2dbebaa1b7f9b60
3 changes: 3 additions & 0 deletions trunk/drivers/kvm/kvm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,9 @@ static long kvm_dev_ioctl(struct file *filp,
int r = -EINVAL;

switch (ioctl) {
case KVM_GET_API_VERSION:
r = KVM_API_VERSION;
break;
case KVM_CREATE_VCPU: {
r = kvm_dev_ioctl_create_vcpu(kvm, arg);
if (r)
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/kvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include <asm/types.h>
#include <linux/ioctl.h>

#define KVM_API_VERSION 1

/*
* Architectural interrupt line count, and the size of the bitmap needed
* to hold them.
Expand Down Expand Up @@ -209,6 +211,7 @@ struct kvm_dirty_log {

#define KVMIO 0xAE

#define KVM_GET_API_VERSION _IO(KVMIO, 1)
#define KVM_RUN _IOWR(KVMIO, 2, struct kvm_run)
#define KVM_GET_REGS _IOWR(KVMIO, 3, struct kvm_regs)
#define KVM_SET_REGS _IOW(KVMIO, 4, struct kvm_regs)
Expand Down

0 comments on commit 611208f

Please sign in to comment.