From 6fce2dfb28226ff95ff3c904446f511d9faa339b Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 1 Mar 2007 17:56:20 +0200
Subject: [PATCH] --- yaml --- r: 54065 b: refs/heads/master c:
 5d308f4550d9dc4c236e08b0377b610b9578577b h: refs/heads/master i:   54063:
 93880d5bd1fd9de948c3a938feace44284eda022 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 6 ++++++
 trunk/include/linux/kvm.h    | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d3298ba77f7..e13e61fe67e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 739872c56f3322c38320c7a5a543ef6f56f174bc
+refs/heads/master: 5d308f4550d9dc4c236e08b0377b610b9578577b
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 5d24203afd20..39cf8fd343a3 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -2416,6 +2416,12 @@ static long kvm_dev_ioctl(struct file *filp,
 		r = 0;
 		break;
 	}
+	case KVM_CHECK_EXTENSION:
+		/*
+		 * No extensions defined at present.
+		 */
+		r = 0;
+		break;
 	default:
 		;
 	}
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index 93472daec120..c93cf53953af 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -232,6 +232,11 @@ struct kvm_cpuid {
 #define KVM_GET_API_VERSION       _IO(KVMIO,   0x00)
 #define KVM_CREATE_VM             _IO(KVMIO,   0x01) /* returns a VM fd */
 #define KVM_GET_MSR_INDEX_LIST    _IOWR(KVMIO, 0x02, struct kvm_msr_list)
+/*
+ * Check if a kvm extension is available.  Argument is extension number,
+ * return is 1 (yes) or 0 (no, sorry).
+ */
+#define KVM_CHECK_EXTENSION       _IO(KVMIO,   0x03)
 
 /*
  * ioctls for VM fds