From: Ján Tomko <jtomko@redhat.com>
Date: Sun, 16 Feb 2020 22:09:15 +0000 (+0100)
Subject: Remove virutil.h from all header files
X-Git-Tag: v6.1.0-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b11e8cccdd5163727fd4cecda0076ac2b63fe32d;p=thirdparty%2Flibvirt.git

Remove virutil.h from all header files

After the split of enum functions into virenum.h,
this function does not contain anything worth including
in another header file.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index 7480ee8c2f..42996b9741 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 6cef9e9726..a95d56d017 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virbuffer.h"
 #include "virxml.h"
 #include "virbitmap.h"
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index e091d7cfe2..d7395f2201 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -25,7 +25,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virutil.h"
 #include "virthread.h"
 #include "virbuffer.h"
 #include "virpci.h"
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index ce405e5b15..31063d206c 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -25,7 +25,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virutil.h"
 #include "virthread.h"
 #include "device_conf.h"
 #include "virenum.h"
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 4ff616ee90..9e4b0847fb 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virutil.h"
 #include "virscsihost.h"
 #include "virpci.h"
 #include "virvhba.h"
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index b1b8e3274d..ae3599bb8b 100644
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -23,7 +23,6 @@
 #include <libxml/xpath.h>
 
 #include "internal.h"
-#include "virutil.h"
 #include "virbitmap.h"
 #include "virbuffer.h"
 #include "virenum.h"
diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index ac94751ef3..77457ecd7a 100644
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 
 typedef struct _virSecretDef virSecretDef;
 typedef virSecretDef *virSecretDefPtr;
diff --git a/src/util/virconf.h b/src/util/virconf.h
index 0b2de34d36..6f0101bd3a 100644
--- a/src/util/virconf.h
+++ b/src/util/virconf.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 /**
diff --git a/src/util/virgic.h b/src/util/virgic.h
index 6552ab53f8..08838a619c 100644
--- a/src/util/virgic.h
+++ b/src/util/virgic.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h
index b8d167ff14..b725613458 100644
--- a/src/util/virkeycode.h
+++ b/src/util/virkeycode.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 VIR_ENUM_DECL(virKeycodeSet);
diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index e0905a3f6e..51f7f608a2 100644
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "virobject.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index 9dbf07a6e2..0c1f5f1ecd 100644
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include <virutil.h>
-
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index 88a42a1816..3873fdf067 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "viruuid.h"
-#include "virutil.h"
 #include "virmacaddr.h"
 #include "virenum.h"
 
diff --git a/src/util/virnuma.h b/src/util/virnuma.h
index 5a6b36f7e9..c5bb5ffece 100644
--- a/src/util/virnuma.h
+++ b/src/util/virnuma.h
@@ -23,7 +23,6 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virutil.h"
 
 
 char *virNumaGetAutoPlacementAdvice(unsigned short vcpus,
diff --git a/src/util/virpci.h b/src/util/virpci.h
index f6796fc422..f16d23614a 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "virmdev.h"
 #include "virobject.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef struct _virPCIDevice virPCIDevice;
diff --git a/src/util/virperf.h b/src/util/virperf.h
index db61f94888..46307714c3 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "virutil.h"
 #include "virenum.h"
 
 /* Some Intel processor families introduced some RDT (Resource Director
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 04adae6b82..437deb1830 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -25,7 +25,6 @@
 
 #include "internal.h"
 #include "virbitmap.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index 11f275acf4..dcd9ca2bb2 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -22,7 +22,6 @@
 
 #include "virobject.h"
 #include "virbitmap.h"
-#include "virutil.h"
 #include "virenum.h"
 
 typedef enum {
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index a5296890cd..802c4d7bd7 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -22,7 +22,6 @@
 
 #include "internal.h"
 #include "virobject.h"
-#include "virutil.h"
 
 typedef struct _virSCSIVHostDevice virSCSIVHostDevice;
 typedef virSCSIVHostDevice *virSCSIVHostDevicePtr;
diff --git a/src/util/virsecret.h b/src/util/virsecret.h
index bf056cb3b2..8c49cfbc89 100644
--- a/src/util/virsecret.h
+++ b/src/util/virsecret.h
@@ -23,7 +23,6 @@
 
 #include "internal.h"
 
-#include "virutil.h"
 #include "virxml.h"
 #include "virenum.h"
 
diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h
index 3e5485d88b..a107161f0f 100644
--- a/src/util/virstorageencryption.h
+++ b/src/util/virstorageencryption.h
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "virsecret.h"
-#include "virutil.h"
 #include "virenum.h"
 
 #include <libxml/tree.h>
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 5b995d54ab..9af7b4f226 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -27,7 +27,6 @@
 #include "virobject.h"
 #include "virseclabel.h"
 #include "virstorageencryption.h"
-#include "virutil.h"
 #include "virsecret.h"
 #include "virenum.h"
 #include "virpci.h"
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index 3ce936205c..f1d280e1c9 100644
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 #include "virbuffer.h"
 #include "virenum.h"
 
diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h
index 3ac2e68144..0a430924a7 100644
--- a/src/util/virtypedparam.h
+++ b/src/util/virtypedparam.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "internal.h"
-#include "virutil.h"
 #include "virenum.h"
 
 /**