---

yaml --- r: 54065 b: refs/heads/master c: 5d308f4 h: refs/heads/master i: 54063: 93880d5 v: v3
git-mirror · May 3, 2007 · 6fce2df · 6fce2df
1 parent cc8c6ff
commit 6fce2df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
     		;
     	}
@@ Expand Down @@