Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76f7c879 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: Rename debugfs_dir to kvm_debugfs_dir 



It's a globally exported symbol now.

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

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ struct kvm_stats_debugfs_item { 
	struct dentry *dentry;

};

extern struct kvm_stats_debugfs_item debugfs_entries[];

extern struct dentry *debugfs_dir;

extern struct dentry *kvm_debugfs_dir;



#ifdef CONFIG_KVM_TRACE

int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg);

virt/kvm/kvm_main.c

+4 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_cache); 


static __read_mostly struct preempt_ops kvm_preempt_ops;



struct dentry *debugfs_dir;

struct dentry *kvm_debugfs_dir;



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

			   unsigned long arg);
@@ -1392,9 +1392,9 @@ static void kvm_init_debug(void) 
{

	struct kvm_stats_debugfs_item *p;



	debugfs_dir = debugfs_create_dir("kvm", NULL);

	kvm_debugfs_dir = debugfs_create_dir("kvm", NULL);

	for (p = debugfs_entries; p->name; ++p)

		p->dentry = debugfs_create_file(p->name, 0444, debugfs_dir,

		p->dentry = debugfs_create_file(p->name, 0444, kvm_debugfs_dir,

						(void *)(long)p->offset,

						stat_fops[p->kind]);

}
@@ -1405,7 +1405,7 @@ static void kvm_exit_debug(void) 


	for (p = debugfs_entries; p->name; ++p)

		debugfs_remove(p->dentry);

	debugfs_remove(debugfs_dir);

	debugfs_remove(kvm_debugfs_dir);

}



static int kvm_suspend(struct sys_device *dev, pm_message_t state)

virt/kvm/kvm_trace.c

+2 −2
Original line number Diff line number Diff line
@@ -159,12 +159,12 @@ static int do_kvm_trace_enable(struct kvm_user_trace_setup *kuts) 


	r = -EIO;

	atomic_set(&kt->lost_records, 0);

	kt->lost_file = debugfs_create_file("lost_records", 0444, debugfs_dir,

	kt->lost_file = debugfs_create_file("lost_records", 0444, kvm_debugfs_dir,

					    kt, &kvm_trace_lost_ops);

	if (!kt->lost_file)

		goto err;



	kt->rchan = relay_open("trace", debugfs_dir, kuts->buf_size,

	kt->rchan = relay_open("trace", kvm_debugfs_dir, kuts->buf_size,

				kuts->buf_nr, &kvm_relay_callbacks, kt);

	if (!kt->rchan)

		goto err;