History

BackMerge tag 'v7.0-rc4' into drm-next

Linux 7.0-rc4 Needed for rust tree.

Dave Airlie committed 7 months ago

Commit 13c072b2 parents 74919e2 f338e77513 files · +6174 −3957Browse files

Showing the changes to include/uapi (1 of 513 files). Show all

Unified · Split

include/uapi/linux/kvm.h+8−0
@@ -14,6 +14,10 @@ · 13 unmodified lines
14#include <linux/ioctl.h>14#include <linux/ioctl.h>
15#include <asm/kvm.h>15#include <asm/kvm.h>
16 16
17#ifdef __KERNEL__
18#include <linux/kvm_types.h>
19#endif
20
17#define KVM_API_VERSION 1221#define KVM_API_VERSION 12
18 22
19/*23/*
@@ -1601,7 +1605,11 @@ struct kvm_stats_desc { · 1581 unmodified lines
1601 __u16 size;1605 __u16 size;
1602 __u32 offset;1606 __u32 offset;
1603 __u32 bucket_size;1607 __u32 bucket_size;
1608#ifdef __KERNEL__
1609 char name[KVM_STATS_NAME_SIZE];
1610#else
1604 char name[];1611 char name[];
1612#endif
1605};1613};
1606 1614
1607#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)1615#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)