In commit dfa0e11 the last direct usage of devmapper for storage_disk was
removed. There is one stale include remaining, which is unused even longer
since df1011ca. Remove the include and change meson.build so we can use
storage_disk without devmapper.

I'm running it right now with a stripped-down config on a small arm64
router with openwrt.

Signed-off-by: Stefan Hellermann <stefan@the2masters.de>
---
 meson.build              | 4 ++--
 src/storage/parthelper.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index ca1b915737..ffe91dbd46 100644
--- a/meson.build
+++ b/meson.build
@@ -1787,11 +1787,11 @@ if conf.has('WITH_LIBVIRTD')
     conf.set('WITH_STORAGE_DIR', 1)
   endif
 
-  if not get_option('storage_disk').disabled() and devmapper_dep.found() and libparted_dep.found()
+  if not get_option('storage_disk').disabled() and libparted_dep.found()
     use_storage = true
     conf.set('WITH_STORAGE_DISK', 1)
   elif get_option('storage_disk').enabled()
-    error('You must install libparted and libdevmapper to compile libvirt with disk storage driver')
+    error('You must install libparted to compile libvirt with disk storage driver')
   endif
 
   if not get_option('storage_fs').disabled()
diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index ee07ba41bb..1169ebfb64 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -31,7 +31,6 @@
 #include <config.h>
 
 #include <parted/parted.h>
-#include <libdevmapper.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-- 
2.47.1

On 1/6/25 18:15, Stefan Hellermann wrote:
> In commit dfa0e11 the last direct usage of devmapper for storage_disk was
> removed. There is one stale include remaining, which is unused even longer
> since df1011ca. Remove the include and change meson.build so we can use
> storage_disk without devmapper.
> 
> I'm running it right now with a stripped-down config on a small arm64
> router with openwrt.
> 
> Signed-off-by: Stefan Hellermann <stefan@the2masters.de>
> ---
>  meson.build              | 4 ++--
>  src/storage/parthelper.c | 1 -
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

and merged. Congratulations on your first libvirt contribution!

Michal