Commit 0e9b0e01 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-fixes-7.1' of https://github.com/kvm-x86/linux into HEAD 

KVM x86 fixes for 7.1

Declare flexible arrays in uAPI structures using __DECLARE_FLEX_ARRAY() so
that KVM's uAPI headers can be included in C++ projects.
parents 591cd656 2619da73

arch/x86/include/uapi/asm/kvm.h

+6 −6
Original line number Diff line number Diff line
@@ -197,13 +197,13 @@ struct kvm_msrs { 
	__u32 nmsrs; /* number of msrs in entries */

	__u32 pad;



	struct kvm_msr_entry entries[];

	__DECLARE_FLEX_ARRAY(struct kvm_msr_entry, entries);

};



/* for KVM_GET_MSR_INDEX_LIST */

struct kvm_msr_list {

	__u32 nmsrs; /* number of msrs in entries */

	__u32 indices[];

	__DECLARE_FLEX_ARRAY(__u32, indices);

};



/* Maximum size of any access bitmap in bytes */
@@ -245,7 +245,7 @@ struct kvm_cpuid_entry { 
struct kvm_cpuid {

	__u32 nent;

	__u32 padding;

	struct kvm_cpuid_entry entries[];

	__DECLARE_FLEX_ARRAY(struct kvm_cpuid_entry, entries);

};



struct kvm_cpuid_entry2 {
@@ -267,7 +267,7 @@ struct kvm_cpuid_entry2 { 
struct kvm_cpuid2 {

	__u32 nent;

	__u32 padding;

	struct kvm_cpuid_entry2 entries[];

	__DECLARE_FLEX_ARRAY(struct kvm_cpuid_entry2, entries);

};



/* for KVM_GET_PIT and KVM_SET_PIT */
@@ -398,7 +398,7 @@ struct kvm_xsave { 
	 * the contents of CPUID leaf 0xD on the host.

	 */

	__u32 region[1024];

	__u32 extra[];

	__DECLARE_FLEX_ARRAY(__u32, extra);

};



#define KVM_MAX_XCRS	16
@@ -566,7 +566,7 @@ struct kvm_pmu_event_filter { 
	__u32 fixed_counter_bitmap;

	__u32 flags;

	__u32 pad[4];

	__u64 events[];

	__DECLARE_FLEX_ARRAY(__u64, events);

};



#define KVM_PMU_EVENT_ALLOW 0

include/uapi/linux/kvm.h

+6 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/const.h>

#include <linux/types.h>

#include <linux/compiler.h>

#include <linux/stddef.h>

#include <linux/ioctl.h>

#include <asm/kvm.h>
@@ -542,7 +543,7 @@ struct kvm_coalesced_mmio { 


struct kvm_coalesced_mmio_ring {

	__u32 first, last;

	struct kvm_coalesced_mmio coalesced_mmio[];

	__DECLARE_FLEX_ARRAY(struct kvm_coalesced_mmio, coalesced_mmio);

};



#define KVM_COALESCED_MMIO_MAX \
@@ -592,7 +593,7 @@ struct kvm_clear_dirty_log { 
/* for KVM_SET_SIGNAL_MASK */

struct kvm_signal_mask {

	__u32 len;

	__u8  sigset[];

	__DECLARE_FLEX_ARRAY(__u8, sigset);

};



/* for KVM_TPR_ACCESS_REPORTING */
@@ -1051,7 +1052,7 @@ struct kvm_irq_routing_entry { 
struct kvm_irq_routing {

	__u32 nr;

	__u32 flags;

	struct kvm_irq_routing_entry entries[];

	__DECLARE_FLEX_ARRAY(struct kvm_irq_routing_entry, entries);

};



#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
@@ -1142,7 +1143,7 @@ struct kvm_dirty_tlb { 


struct kvm_reg_list {

	__u64 n; /* number of regs */

	__u64 reg[];

	__DECLARE_FLEX_ARRAY(__u64, reg);

};



struct kvm_one_reg {
@@ -1608,7 +1609,7 @@ struct kvm_stats_desc { 
#ifdef __KERNEL__

	char name[KVM_STATS_NAME_SIZE];

#else

	char name[];

	__DECLARE_FLEX_ARRAY(char, name);

#endif

};