提交 120758fb 编写于 作者: P Paolo Bonzini

update Linux headers to 4.3-rc1

The update to 4.2 was reviewed by Michael S. Tsirkin and Cornelia
Huck.  The further update to 4.3-rc1 only touches KVM files.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 84090bbc
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* Copyright Rusty Russell IBM Corporation 2007. */ * Copyright Rusty Russell IBM Corporation 2007. */
#include <stdint.h>
#include "standard-headers/linux/types.h" #include "standard-headers/linux/types.h"
#include "standard-headers/linux/virtio_types.h" #include "standard-headers/linux/virtio_types.h"
...@@ -143,7 +144,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p, ...@@ -143,7 +144,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p,
vr->num = num; vr->num = num;
vr->desc = p; vr->desc = p;
vr->avail = p + num*sizeof(struct vring_desc); vr->avail = p + num*sizeof(struct vring_desc);
vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__virtio16) vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)
+ align-1) & ~(align - 1)); + align-1) & ~(align - 1));
} }
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#define HV_X64_MSR_VP_RUNTIME_AVAILABLE (1 << 0) #define HV_X64_MSR_VP_RUNTIME_AVAILABLE (1 << 0)
/* Partition Reference Counter (HV_X64_MSR_TIME_REF_COUNT) available*/ /* Partition Reference Counter (HV_X64_MSR_TIME_REF_COUNT) available*/
#define HV_X64_MSR_TIME_REF_COUNT_AVAILABLE (1 << 1) #define HV_X64_MSR_TIME_REF_COUNT_AVAILABLE (1 << 1)
/* Partition reference TSC MSR is available */
#define HV_X64_MSR_REFERENCE_TSC_AVAILABLE (1 << 9)
/* A partition's reference time stamp counter (TSC) page */ /* A partition's reference time stamp counter (TSC) page */
#define HV_X64_MSR_REFERENCE_TSC 0x40000021 #define HV_X64_MSR_REFERENCE_TSC 0x40000021
...@@ -108,6 +110,8 @@ ...@@ -108,6 +110,8 @@
#define HV_X64_HYPERCALL_PARAMS_XMM_AVAILABLE (1 << 4) #define HV_X64_HYPERCALL_PARAMS_XMM_AVAILABLE (1 << 4)
/* Support for a virtual guest idle state is available */ /* Support for a virtual guest idle state is available */
#define HV_X64_GUEST_IDLE_STATE_AVAILABLE (1 << 5) #define HV_X64_GUEST_IDLE_STATE_AVAILABLE (1 << 5)
/* Guest crash data handler available */
#define HV_X64_GUEST_CRASH_MSR_AVAILABLE (1 << 10)
/* /*
* Implementation recommendations. Indicates which behaviors the hypervisor * Implementation recommendations. Indicates which behaviors the hypervisor
......
...@@ -354,7 +354,7 @@ struct kvm_xcrs { ...@@ -354,7 +354,7 @@ struct kvm_xcrs {
struct kvm_sync_regs { struct kvm_sync_regs {
}; };
#define KVM_QUIRK_LINT0_REENABLED (1 << 0) #define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)
#define KVM_QUIRK_CD_NW_CLEARED (1 << 1) #define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)
#endif /* _ASM_X86_KVM_H */ #endif /* _ASM_X86_KVM_H */
...@@ -317,6 +317,7 @@ struct kvm_run { ...@@ -317,6 +317,7 @@ struct kvm_run {
struct { struct {
#define KVM_SYSTEM_EVENT_SHUTDOWN 1 #define KVM_SYSTEM_EVENT_SHUTDOWN 1
#define KVM_SYSTEM_EVENT_RESET 2 #define KVM_SYSTEM_EVENT_RESET 2
#define KVM_SYSTEM_EVENT_CRASH 3
__u32 type; __u32 type;
__u64 flags; __u64 flags;
} system_event; } system_event;
...@@ -481,6 +482,7 @@ struct kvm_s390_psw { ...@@ -481,6 +482,7 @@ struct kvm_s390_psw {
((ai) << 26)) ((ai) << 26))
#define KVM_S390_INT_IO_MIN 0x00000000u #define KVM_S390_INT_IO_MIN 0x00000000u
#define KVM_S390_INT_IO_MAX 0xfffdffffu #define KVM_S390_INT_IO_MAX 0xfffdffffu
#define KVM_S390_INT_IO_AI_MASK 0x04000000u
struct kvm_s390_interrupt { struct kvm_s390_interrupt {
......
...@@ -39,6 +39,7 @@ cp_virtio() { ...@@ -39,6 +39,7 @@ cp_virtio() {
if if
grep '#include' "$f" | grep -v -e 'linux/virtio' \ grep '#include' "$f" | grep -v -e 'linux/virtio' \
-e 'linux/types' \ -e 'linux/types' \
-e 'stdint' \
-e 'linux/if_ether' \ -e 'linux/if_ether' \
-e 'sys/' \ -e 'sys/' \
> /dev/null > /dev/null
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册