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

Commit e9cdb1e3 authored by Andrew Morton's avatar Andrew Morton Committed by Avi Kivity
Browse files

KVM: Move kvmfs magic number to <linux/magic.h>



Use the standard magic.h for kvmfs.

Cc: Avi Kivity <avi@qumranet.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 58e690e6
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@
#include <linux/kvm.h>
#include <linux/kvm.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/errno.h>
#include <linux/magic.h>
#include <asm/processor.h>
#include <asm/processor.h>
#include <linux/percpu.h>
#include <linux/percpu.h>
#include <linux/gfp.h>
#include <linux/gfp.h>
@@ -75,7 +76,6 @@ static struct kvm_stats_debugfs_item {


static struct dentry *debugfs_dir;
static struct dentry *debugfs_dir;


#define KVMFS_MAGIC 0x19700426
struct vfsmount *kvmfs_mnt;
struct vfsmount *kvmfs_mnt;


#define MAX_IO_MSRS 256
#define MAX_IO_MSRS 256
@@ -2433,7 +2433,7 @@ hpa_t bad_page_address;
static int kvmfs_get_sb(struct file_system_type *fs_type, int flags,
static int kvmfs_get_sb(struct file_system_type *fs_type, int flags,
			const char *dev_name, void *data, struct vfsmount *mnt)
			const char *dev_name, void *data, struct vfsmount *mnt)
{
{
	return get_sb_pseudo(fs_type, "kvm:", NULL, KVMFS_MAGIC, mnt);
	return get_sb_pseudo(fs_type, "kvm:", NULL, KVMFS_SUPER_MAGIC, mnt);
}
}


static struct file_system_type kvm_fs_type = {
static struct file_system_type kvm_fs_type = {
+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@
#define HPFS_SUPER_MAGIC	0xf995e849
#define HPFS_SUPER_MAGIC	0xf995e849
#define ISOFS_SUPER_MAGIC	0x9660
#define ISOFS_SUPER_MAGIC	0x9660
#define JFFS2_SUPER_MAGIC	0x72b6
#define JFFS2_SUPER_MAGIC	0x72b6
#define KVMFS_SUPER_MAGIC	0x19700426


#define MINIX_SUPER_MAGIC	0x137F		/* original minix fs */
#define MINIX_SUPER_MAGIC	0x137F		/* original minix fs */
#define MINIX_SUPER_MAGIC2	0x138F		/* minix fs, 30 char names */
#define MINIX_SUPER_MAGIC2	0x138F		/* minix fs, 30 char names */