From 6a38acb3c0d5feb4841044cb230590088f8970d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 25 Feb 2020 10:01:09 +0000
Subject: [PATCH] src: add virutil.h to more source files for geteuid() compat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The virutil.h header defines a geteuid() macro for Windows platforms.
This fixes a few missed cases from:

  commit b11e8cccdd5163727fd4cecda0076ac2b63fe32d
  Author: Ján Tomko <jtomko@redhat.com>
  Date:   Sun Feb 16 23:09:15 2020 +0100

    Remove virutil.h from all header files

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/admin/admin_server_dispatch.c | 1 +
 src/driver.c                      | 1 +
 src/util/virnetdevbandwidth.c     | 1 +
 src/util/virstoragefile.c         | 1 +
 tests/virlockspacetest.c          | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c
index 485f7d967c..7b3bd697f3 100644
--- a/src/admin/admin_server_dispatch.c
+++ b/src/admin/admin_server_dispatch.c
@@ -34,6 +34,7 @@
 #include "virstring.h"
 #include "virthreadjob.h"
 #include "virtypedparam.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_ADMIN
 
diff --git a/src/driver.c b/src/driver.c
index 2392fd7d5f..a2047beaef 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -31,6 +31,7 @@
 #include "virmodule.h"
 #include "virstring.h"
 #include "virthread.h"
+#include "virutil.h"
 #include "configmake.h"
 
 VIR_LOG_INIT("driver");
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index d00ef57606..5fd7186760 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -24,6 +24,7 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 831ce30d4d..d75d2a689a 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -39,6 +39,7 @@
 #include "virjson.h"
 #include "virstorageencryption.h"
 #include "virsecret.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 1f156ba3d6..82aef8bc2b 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -27,6 +27,7 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virlog.h"
+#include "virutil.h"
 
 #include "virlockspace.h"
 
-- 
GitLab