meson: remove obsolete check for linux/magic.h

The linux/magic.h header has existed since

  commit e18fa700c9a31360bc8f193aa543b7ef7b39a06b
  Author: Jeff Garzik <jeff@garzik.org>
  Date:   Sun Sep 24 11:13:19 2006 -0400

    Move several *_SUPER_MAGIC symbols to include/linux/magic.h.

This is old enough that all our supported platforms can be assumed
to have this header.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/meson.build b/meson.build
index 30dd797ee5c8fe4eb12dc1c247c90ec187756723..612257a35190b208d7b5abf8373efd2f1539fafb 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -596,7 +596,6 @@ headers = [
   'ifaddrs.h',
   'libtasn1.h',
   'linux/kvm.h',
-  'linux/magic.h',
   'mntent.h',
   'net/ethernet.h',
   'net/if.h',

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 7b37d6888ef6568f4a2c3cf0cbf038679bc38ca9..feb0d7f8baf1ca1ec2ae689ca652e408e86a9fe1 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -62,9 +62,7 @@
 #include <sys/file.h>
 
 #ifdef __linux__
-# if WITH_LINUX_MAGIC_H
-#  include <linux/magic.h>
-# endif
+# include <linux/magic.h>
 # include <sys/statfs.h>
 # include <linux/loop.h>
 # include <sys/ioctl.h>

diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c
index 24c9f3841c4fa63d36b90e57712ec72248d2ef20..c32c90c17e13deefb84700edac1ca124895339d2 100644 (file)
--- a/tests/securityselinuxhelper.c
+++ b/tests/securityselinuxhelper.c
@@ -23,9 +23,7 @@
  * detected. */
 
 #include "virmock.h"
-#if WITH_LINUX_MAGIC_H
-# include <linux/magic.h>
-#endif
+#include <linux/magic.h>
 #include <selinux/selinux.h>
 #include <selinux/label.h>
 #include <sys/vfs.h>

diff --git a/tests/virfilemock.c b/tests/virfilemock.c
index 093a8d7cf00c615a541fdab120aad517129ed45f..4f1b8aecd7d4dd59b77d7a41a4b0d9996b0e97fb 100644 (file)
--- a/tests/virfilemock.c
+++ b/tests/virfilemock.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <mntent.h>
 #include <sys/vfs.h>
-#if WITH_LINUX_MAGIC_H
+#ifdef __linux__
 # include <linux/magic.h>
 #endif