External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: remove obsolete check for linux/magic.h

Browse Source 
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>
This commit is contained in:
Daniel P. Berrangé 2022-12-08 12:37:26 +00:00
parent 21f2b9cf9d
commit b41ed60763
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -596,7 +596,6 @@ headers = [
'ifaddrs.h', 'ifaddrs.h',
'libtasn1.h', 'libtasn1.h',
'linux/kvm.h', 'linux/kvm.h',
'linux/magic.h',
'mntent.h', 'mntent.h',
'net/ethernet.h', 'net/ethernet.h',
'net/if.h', 'net/if.h',

4
src/util/virfile.c
View File

@ -62,9 +62,7 @@
#include <sys/file.h> #include <sys/file.h>
#ifdef __linux__ #ifdef __linux__
# if WITH_LINUX_MAGIC_H # include <linux/magic.h>
# include <linux/magic.h>
# endif
# include <sys/statfs.h> # include <sys/statfs.h>
# include <linux/loop.h> # include <linux/loop.h>
# include <sys/ioctl.h> # include <sys/ioctl.h>

4
tests/securityselinuxhelper.c
View File

@ -23,9 +23,7 @@
* detected. */ * detected. */
#include "virmock.h" #include "virmock.h"
#if WITH_LINUX_MAGIC_H #include <linux/magic.h>
# include <linux/magic.h>
#endif
#include <selinux/selinux.h> #include <selinux/selinux.h>
#include <selinux/label.h> #include <selinux/label.h>
#include <sys/vfs.h> #include <sys/vfs.h>

2
tests/virfilemock.c
View File

@ -21,7 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include <mntent.h> #include <mntent.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#if WITH_LINUX_MAGIC_H #ifdef __linux__
# include <linux/magic.h> # include <linux/magic.h>
#endif #endif