Commit 417bc304 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: Portability: Make exported debugfs data architecture-specific 



Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 1c73ef66

drivers/kvm/kvm.h

+7 −0
Original line number Diff line number Diff line
@@ -761,4 +761,11 @@ static inline u32 get_rdx_init_val(void) 
#define TSS_REDIRECTION_SIZE (256 / 8)

#define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1)



struct kvm_stats_debugfs_item {

	const char *name;

	int offset;

	struct dentry *dentry;

};

extern struct kvm_stats_debugfs_item debugfs_entries[];



#endif

drivers/kvm/kvm_main.c

+0 −25
Original line number Diff line number Diff line
@@ -63,31 +63,6 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_cache); 


static __read_mostly struct preempt_ops kvm_preempt_ops;



#define STAT_OFFSET(x) offsetof(struct kvm_vcpu, stat.x)



static struct kvm_stats_debugfs_item {

	const char *name;

	int offset;

	struct dentry *dentry;

} debugfs_entries[] = {

	{ "pf_fixed", STAT_OFFSET(pf_fixed) },

	{ "pf_guest", STAT_OFFSET(pf_guest) },

	{ "tlb_flush", STAT_OFFSET(tlb_flush) },

	{ "invlpg", STAT_OFFSET(invlpg) },

	{ "exits", STAT_OFFSET(exits) },

	{ "io_exits", STAT_OFFSET(io_exits) },

	{ "mmio_exits", STAT_OFFSET(mmio_exits) },

	{ "signal_exits", STAT_OFFSET(signal_exits) },

	{ "irq_window", STAT_OFFSET(irq_window_exits) },

	{ "halt_exits", STAT_OFFSET(halt_exits) },

	{ "halt_wakeup", STAT_OFFSET(halt_wakeup) },

	{ "request_irq", STAT_OFFSET(request_irq_exits) },

	{ "irq_exits", STAT_OFFSET(irq_exits) },

	{ "light_exits", STAT_OFFSET(light_exits) },

	{ "efer_reload", STAT_OFFSET(efer_reload) },

	{ NULL }

};



static struct dentry *debugfs_dir;



static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl,

drivers/kvm/x86.c

+22 −0
Original line number Diff line number Diff line
@@ -40,6 +40,28 @@ 
#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)

#define EFER_RESERVED_BITS 0xfffffffffffff2fe



#define STAT_OFFSET(x) offsetof(struct kvm_vcpu, stat.x)



struct kvm_stats_debugfs_item debugfs_entries[] = {

	{ "pf_fixed", STAT_OFFSET(pf_fixed) },

	{ "pf_guest", STAT_OFFSET(pf_guest) },

	{ "tlb_flush", STAT_OFFSET(tlb_flush) },

	{ "invlpg", STAT_OFFSET(invlpg) },

	{ "exits", STAT_OFFSET(exits) },

	{ "io_exits", STAT_OFFSET(io_exits) },

	{ "mmio_exits", STAT_OFFSET(mmio_exits) },

	{ "signal_exits", STAT_OFFSET(signal_exits) },

	{ "irq_window", STAT_OFFSET(irq_window_exits) },

	{ "halt_exits", STAT_OFFSET(halt_exits) },

	{ "halt_wakeup", STAT_OFFSET(halt_wakeup) },

	{ "request_irq", STAT_OFFSET(request_irq_exits) },

	{ "irq_exits", STAT_OFFSET(irq_exits) },

	{ "light_exits", STAT_OFFSET(light_exits) },

	{ "efer_reload", STAT_OFFSET(efer_reload) },

	{ NULL }

};





unsigned long segment_base(u16 selector)

{

	struct descriptor_table gdt;