diff mbox

[QEMU,1/2] kvm: sync kernel headers

Message ID 20141210162420.149256493@amt.cnet
State New
Headers show

Commit Message

Marcelo Tosatti Dec. 10, 2014, 4:23 p.m. UTC 
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

---
 linux-headers/asm-x86/kvm.h |    5 +++++
 linux-headers/linux/kvm.h   |   14 +++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)
diff mbox

Patch

Index: qemu/linux-headers/asm-x86/kvm.h
===================================================================
--- qemu.orig/linux-headers/asm-x86/kvm.h	2014-12-08 17:54:33.647488264 -0200
+++ qemu/linux-headers/asm-x86/kvm.h	2014-12-09 13:27:20.749752962 -0200
@@ -277,6 +277,11 @@ 
 	__u8 reserved[31];
 };
 
+struct kvm_tscdeadline_advance {
+	__u32 timer_advance;
+	__u32 reserved[3];
+};
+
 /* When set in flags, include corresponding fields on KVM_SET_VCPU_EVENTS */
 #define KVM_VCPUEVENT_VALID_NMI_PENDING	0x00000001
 #define KVM_VCPUEVENT_VALID_SIPI_VECTOR	0x00000002
Index: qemu/linux-headers/linux/kvm.h
===================================================================
--- qemu.orig/linux-headers/linux/kvm.h	2014-12-08 17:54:33.647488264 -0200
+++ qemu/linux-headers/linux/kvm.h	2014-12-09 13:27:20.750752961 -0200
@@ -761,6 +753,7 @@ 
 #define KVM_CAP_PPC_FIXUP_HCALL 103
 #define KVM_CAP_PPC_ENABLE_HCALL 104
 #define KVM_CAP_CHECK_EXTENSION_VM 105
+#define KVM_CAP_TSCDEADLINE_ADVANCE 106
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -1061,6 +1054,8 @@ 
 #define KVM_GET_DEVICE_ATTR	  _IOW(KVMIO,  0xe2, struct kvm_device_attr)
 #define KVM_HAS_DEVICE_ATTR	  _IOW(KVMIO,  0xe3, struct kvm_device_attr)
 
+#define KVM_SET_TSCDEADLINE_ADVANCE  _IOW(KVMIO,  0xe4, struct kvm_tscdeadline_advance)
+
 /*
  * ioctls for vcpu fds
  */