The 5th patch is applied to the latest qemu-kvm tree.

Signed-off-by: Zhang Yanmin <yanmin_zh...@linux.intel.com>

---

diff -Nraup qemu-kvm_0621/kvm/include/linux/kvm.h 
qemu-kvm_0621_perf/kvm/include/linux/kvm.h
--- qemu-kvm_0621/kvm/include/linux/kvm.h       2010-06-21 11:00:28.000000000 
+0800
+++ qemu-kvm_0621_perf/kvm/include/linux/kvm.h  2010-06-21 13:23:51.537999849 
+0800
@@ -530,6 +530,7 @@ struct kvm_enable_cap {
 #ifdef __KVM_HAVE_XCRS
 #define KVM_CAP_XCRS 56
 #endif
+#define KVM_CAP_PV_PERF 57
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
diff -Nraup qemu-kvm_0621/kvm/include/x86/asm/kvm_para.h 
qemu-kvm_0621_perf/kvm/include/x86/asm/kvm_para.h
--- qemu-kvm_0621/kvm/include/x86/asm/kvm_para.h        2010-06-21 
11:00:28.000000000 +0800
+++ qemu-kvm_0621_perf/kvm/include/x86/asm/kvm_para.h   2010-06-21 
13:27:04.375999849 +0800
@@ -15,6 +15,7 @@
 #define KVM_FEATURE_CLOCKSOURCE                0
 #define KVM_FEATURE_NOP_IO_DELAY       1
 #define KVM_FEATURE_MMU_OP             2
+#define KVM_FEATURE_PV_PERF            4
 
 #define MSR_KVM_WALL_CLOCK  0x11
 #define MSR_KVM_SYSTEM_TIME 0x12
diff -Nraup qemu-kvm_0621/target-i386/kvm.c qemu-kvm_0621_perf/target-i386/kvm.c
--- qemu-kvm_0621/target-i386/kvm.c     2010-06-21 11:00:29.000000000 +0800
+++ qemu-kvm_0621_perf/target-i386/kvm.c        2010-06-21 13:00:14.136999850 
+0800
@@ -150,6 +150,9 @@ struct kvm_para_features {
 #ifdef KVM_CAP_PV_MMU
         { KVM_CAP_PV_MMU, KVM_FEATURE_MMU_OP },
 #endif
+#ifdef KVM_CAP_PV_PERF
+        { KVM_CAP_PV_PERF, KVM_FEATURE_PV_PERF },
+#endif
         { -1, -1 }
 };


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to