From de77f01a0985432617ee21ad41ec39fecf55fec8 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 10 Sep 2020 10:58:51 +0200
Subject: Fixed major number of xloop device and device names in xlosetup

---
 utils/include/loopdev.h   | 4 ++--
 utils/include/pathnames.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'utils/include')

diff --git a/utils/include/loopdev.h b/utils/include/loopdev.h
index bc68e52..0221e6b 100644
--- a/utils/include/loopdev.h
+++ b/utils/include/loopdev.h
@@ -75,8 +75,8 @@ struct loop_info64 {
 	uint32_t	lo_file_fmt_type;
 };
 
-#define LOOPDEV_MAJOR		7	/* loop major number */
-#define LOOPDEV_DEFAULT_NNODES	8	/* default number of loop devices */
+#define LOOPDEV_MAJOR	XLOOP_MAJOR	/* loop major number */
+#define LOOPDEV_DEFAULT_NNODES	CONFIG_BLK_DEV_XLOOP_MIN_COUNT	/* default number of loop devices */
 
 struct loopdev_iter {
 	FILE		*proc;		/* /proc/partitions */
diff --git a/utils/include/pathnames.h b/utils/include/pathnames.h
index 8f62337..8f1bb56 100644
--- a/utils/include/pathnames.h
+++ b/utils/include/pathnames.h
@@ -144,8 +144,8 @@
 
 #define _PATH_DEV_MEM		"/dev/mem"
 
-#define _PATH_DEV_LOOP		"/dev/loop"
-#define _PATH_DEV_LOOPCTL	"/dev/loop-control"
+#define _PATH_DEV_LOOP		"/dev/xloop"
+#define _PATH_DEV_LOOPCTL	"/dev/xloop-control"
 
 /* udev paths */
 #define _PATH_DEV_BYLABEL	"/dev/disk/by-label"
-- 
cgit v1.2.3-55-g7522