util: Don't include 'viralloc.h' into other header files

'viralloc.h' does not provide any type or macro which would be necessary
in headers. Prevent leakage of the inclusion.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

src/conf/domain_capabilities.h

@@ -23,7 +23,6 @@
 
 # include "internal.h"
 # include "domain_conf.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef const char * (*virDomainCapsValToStr)(int value);

src/conf/node_device_util.c

@@ -25,6 +25,7 @@
 #include "virscsihost.h"
 #include "virstring.h"
 #include "virvhba.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 

src/conf/virdomainmomentobjlist.c

@@ -28,6 +28,7 @@
 #include "virerror.h"
 #include "virstring.h"
 #include "moment_conf.h"
+#include "viralloc.h"
 
 /* FIXME: using virObject would allow us to not need this */
 #include "snapshot_conf.h"

src/conf/virdomainsnapshotobjlist.c

@@ -29,6 +29,7 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
 

src/lxc/lxc_fuse.c

@@ -30,6 +30,7 @@
 #include "virfile.h"
 #include "virbuffer.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_fuse.h

@@ -28,7 +28,6 @@
 # endif
 
 # include "lxc_conf.h"
-# include "viralloc.h"
 
 struct virLXCMeminfo {
     unsigned long long memtotal;

src/qemu/qemu_firmware.c

@@ -33,6 +33,7 @@
 #include "virjson.h"
 #include "virlog.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_firmware.h

@@ -22,7 +22,6 @@
 # define LIBVIRT_QEMU_FIRMWARE_H
 
 # include "domain_conf.h"
-# include "viralloc.h"
 # include "qemu_conf.h"
 # include "virautoclean.h"
 

src/util/virauth.c

@@ -24,6 +24,7 @@
 
 
 #include "virauth.h"
+#include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
 #include "datatypes.h"

src/util/virauthconfig.c

@@ -26,6 +26,7 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 struct _virAuthConfig {
     virKeyFilePtr keyfile;

src/util/virauthconfig.h

@@ -22,7 +22,6 @@
 # define LIBVIRT_VIRAUTHCONFIG_H
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virAuthConfig virAuthConfig;

src/util/virbitmap.c

@@ -24,6 +24,7 @@
 #include <sys/types.h>
 
 #include "virbitmap.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "c-ctype.h"
 #include "count-one-bits.h"

src/util/virbitmap.h

@@ -23,7 +23,6 @@
 # define LIBVIRT_VIRBITMAP_H
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # include <sys/types.h>

src/util/virbuffer.c

@@ -26,6 +26,7 @@
 #include "virbuffer.h"
 #include "virerror.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virbuffer.h

@@ -24,7 +24,6 @@
 # include <stdarg.h>
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 

src/util/vircgroupv1.c

@@ -39,6 +39,7 @@
 #include "virstring.h"
 #include "virsystemd.h"
 #include "virerror.h"
+#include "viralloc.h"
 
 VIR_LOG_INIT("util.cgroup");
 

src/util/vircgroupv2.c

@@ -29,6 +29,7 @@
 #define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
 
+#include "viralloc.h"
 #include "vircgroup.h"
 #include "vircgroupbackend.h"
 #include "vircgroupv2.h"

src/util/vircommand.c

@@ -42,6 +42,7 @@
 #endif
 
 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
+#include "viralloc.h"
 #include "vircommandpriv.h"
 #include "virerror.h"
 #include "virutil.h"

src/util/vircommand.h

@@ -24,7 +24,6 @@
 
 # include "internal.h"
 # include "virbuffer.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virCommand virCommand;

src/util/virerror.c

@@ -24,6 +24,7 @@
 
 #include "virerror.h"
 #include "datatypes.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virthread.h"
 #include "virutil.h"

src/util/virerror.h

@@ -23,7 +23,6 @@
 # define LIBVIRT_VIRERROR_H
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # define VIR_ERROR_MAX_LENGTH 1024

src/util/virfile.c

@@ -70,6 +70,7 @@
 
 #include "configmake.h"
 #include "intprops.h"
+#include "viralloc.h"
 #include "vircommand.h"
 #include "virerror.h"
 #include "virfile.h"

src/util/virfile.h

@@ -30,7 +30,6 @@
 # include "internal.h"
 # include "virbitmap.h"
 # include "virstoragefile.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef enum {

src/util/virfirewall.c

@@ -25,6 +25,7 @@
 #define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 #include "virfirewallpriv.h"
 #include "virfirewalld.h"
+#include "viralloc.h"
 #include "virerror.h"
 #include "virutil.h"
 #include "virstring.h"

src/util/virfirewall.h

@@ -22,7 +22,6 @@
 # define LIBVIRT_VIRFIREWALL_H
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virFirewall virFirewall;

src/util/virfirewalld.c

@@ -26,6 +26,7 @@
 #include "virfirewalld.h"
 #define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
 #include "virfirewalldpriv.h"
+#include "viralloc.h"
 #include "virerror.h"
 #include "virutil.h"
 #include "virlog.h"

src/util/virhash.c

@@ -21,6 +21,7 @@
 
 #include "virerror.h"
 #include "virhash.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virhashcode.h"
 #include "virrandom.h"

src/util/virhash.h

@@ -11,7 +11,6 @@
 # define LIBVIRT_VIRHASH_H
 
 
-# include "viralloc.h"
 # include "virautoclean.h"
 
 /*

src/util/virjson.c

@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include "virjson.h"
+#include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virstring.h"

src/util/virjson.h

@@ -25,7 +25,6 @@
 
 # include "internal.h"
 # include "virbitmap.h"
-# include "viralloc.h"
 # include "virbuffer.h"
 # include "virautoclean.h"
 

src/util/virmacaddr.c

@@ -25,6 +25,7 @@
 #include "virmacaddr.h"
 #include "virrandom.h"
 #include "virutil.h"
+#include "viralloc.h"
 
 static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] =
     { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

src/util/virmacaddr.h

@@ -22,7 +22,6 @@
 # define LIBVIRT_VIRMACADDR_H
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # define VIR_MAC_BUFLEN 6

src/util/virmdev.c

@@ -24,6 +24,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virmdev.h

@@ -22,7 +22,6 @@
 # include "internal.h"
 # include "virobject.h"
 # include "virutil.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef enum {

src/util/virnetdev.c

@@ -20,6 +20,7 @@
 
 #include "dirname.h"
 #include "virnetdev.h"
+#include "viralloc.h"
 #include "virnetlink.h"
 #include "virmacaddr.h"
 #include "virfile.h"

src/util/virnetdev.h

@@ -26,7 +26,6 @@
 # include "virmacaddr.h"
 # include "virpci.h"
 # include "virnetdevvlan.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # ifdef HAVE_STRUCT_IFREQ

src/util/virnetdevip.c

@@ -27,6 +27,7 @@
 #include "virstring.h"
 #include "virutil.h"
 #include "vircommand.h"
+#include "viralloc.h"
 
 #if HAVE_GETIFADDRS
 # include <ifaddrs.h>

src/util/virnetdevvlan.c

@@ -21,6 +21,7 @@
 #include "internal.h"
 #include "virerror.h"
 #include "virnetdevvlan.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virnetdevvlan.h

@@ -21,7 +21,6 @@
 
 # include <virutil.h>
 
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef enum {

src/util/virnetlink.c

@@ -33,6 +33,7 @@
 #include "virthread.h"
 #include "virmacaddr.h"
 #include "virerror.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 

src/util/virnetlink.h

@@ -22,7 +22,6 @@
 
 # include "internal.h"
 # include "virmacaddr.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # if defined(__linux__) && defined(HAVE_LIBNL)

src/util/virpci.c

@@ -38,6 +38,7 @@
 #include "virkmod.h"
 #include "virstring.h"
 #include "virutil.h"
+#include "viralloc.h"
 
 VIR_LOG_INIT("util.pci");
 

src/util/virpci.h

@@ -25,7 +25,6 @@
 # include "virmdev.h"
 # include "virobject.h"
 # include "virutil.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virPCIDevice virPCIDevice;

src/util/virperf.c

@@ -28,6 +28,7 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "virtypedparam.h"
+#include "viralloc.h"
 
 VIR_LOG_INIT("util.perf");
 

src/util/virperf.h

@@ -20,7 +20,6 @@
 # define LIBVIRT_VIRPERF_H
 
 # include "virutil.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 /* Some Intel processor families introduced some RDT (Resource Director

src/util/virscsi.c

@@ -34,6 +34,7 @@
 #include "virutil.h"
 #include "virstring.h"
 #include "virerror.h"
+#include "viralloc.h"
 
 #define SYSFS_SCSI_DEVICES "/sys/bus/scsi/devices"
 

src/util/virscsi.h

@@ -23,7 +23,6 @@
 
 # include "internal.h"
 # include "virobject.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virSCSIDevice virSCSIDevice;

src/util/virscsivhost.c

@@ -26,6 +26,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 /* For virReportOOMError()  and virReportSystemError() */
 #define VIR_FROM_THIS VIR_FROM_NONE

src/util/virscsivhost.h

@@ -24,7 +24,6 @@
 # include "internal.h"
 # include "virobject.h"
 # include "virutil.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 typedef struct _virSCSIVHostDevice virSCSIVHostDevice;

src/util/virsocketaddr.c

@@ -22,6 +22,7 @@
 #include "virerror.h"
 #include "virstring.h"
 #include "virbuffer.h"
+#include "viralloc.h"
 
 #include <netdb.h>
 

src/util/virsocketaddr.h

@@ -26,7 +26,6 @@
 # endif
 
 # include "internal.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 /* On architectures which lack these limits, define them (ie. Cygwin).

src/util/virstring.h

@@ -22,7 +22,6 @@
 # include <stdarg.h>
 
 # include "internal.h"
-# include "viralloc.h"
 
 char **virStringSplitCount(const char *string,
                            const char *delim,

src/util/virusb.c

@@ -33,6 +33,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "viralloc.h"
 
 #define USB_SYSFS "/sys/bus/usb"
 #define USB_ID_LEN 10 /* "1234 5678" */

src/util/virusb.h

@@ -23,7 +23,6 @@
 
 # include "internal.h"
 # include "virobject.h"
-# include "viralloc.h"
 # include "virautoclean.h"
 
 # define USB_DEVFS "/dev/bus/usb/"

tests/qemusecuritymock.c

@@ -29,6 +29,7 @@
 #include "virthread.h"
 #include "virhash.h"
 #include "virstring.h"
+#include "viralloc.h"
 #include "qemusecuritytest.h"
 #include "security/security_manager.h"
 

tests/vircgroupmock.c

@@ -34,6 +34,7 @@
 # include "testutilslxc.h"
 # include "virstring.h"
 # include "virfile.h"
+# include "viralloc.h"
 
 static int (*real_open)(const char *path, int flags, ...);
 static FILE *(*real_fopen)(const char *path, const char *mode);