From b41ed607630498fdaceb1ac3fe368ae4fd829ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 8 Dec 2022 12:37:26 +0000
Subject: [PATCH] meson: remove obsolete check for linux/magic.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 meson.build                   | 1 -
 src/util/virfile.c            | 4 +---
 tests/securityselinuxhelper.c | 4 +---
 tests/virfilemock.c           | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 30dd797ee5..612257a351 100644
--- 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 7b37d6888e..feb0d7f8ba 100644
--- 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 24c9f3841c..c32c90c17e 100644
--- 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 093a8d7cf0..4f1b8aecd7 100644
--- 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