util: Move virSecretUsageType to virsecret.h

Move the virSecretUsageType into the util.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e3e9fc748a895ba675b4533fb55ead2ab2ff949a..44cfb52b43136ee2e12f3f2eed803d615a87e682 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -53,6 +53,7 @@
 #include "device_conf.h"
 #include "network_conf.h"
 #include "virtpm.h"
+#include "virsecret.h"
 #include "virstring.h"
 #include "virnetdev.h"
 #include "virnetdevmacvlan.h"

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index bd085b7e414164eacdbc7c92a33d5c012b17c2d7..989705234c76112118ef8d8daa2baf3e8857a311 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -30,6 +30,7 @@
 #include "secret_conf.h"
 #include "virsecretobj.h"
 #include "virerror.h"
+#include "virsecret.h"
 #include "virstring.h"
 #include "virxml.h"
 #include "viruuid.h"
@@ -38,9 +39,6 @@
 
 VIR_LOG_INIT("conf.secret_conf");
 
-VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST,
-              "none", "volume", "ceph", "iscsi", "tls")
-
 void
 virSecretDefFree(virSecretDefPtr def)
 {

diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index e0d9465a0b6088c83846a6f7ae436c3858f3d9fe..aa81651d4f21ee833e2e2b0b0ee03733547dd267 100644 (file)
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -26,8 +26,6 @@
 # include "internal.h"
 # include "virutil.h"
 
-VIR_ENUM_DECL(virSecretUsage)
-
 typedef struct _virSecretDef virSecretDef;
 typedef virSecretDef *virSecretDefPtr;
 struct _virSecretDef {

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index 6286c2e7adc4398ff03a21b42d65e7b13d8f7838..c9112dd90e41d23049e3f03b7174a45f00b57497 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -28,9 +28,9 @@
 #include "dirname.h"
 #include "viralloc.h"
 #include "virlog.h"
+#include "virsecret.h"
 #include "virstring.h"
 #include "c-ctype.h"
-#include "secret_conf.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 4096d29701d04f96e568f455a70869ff7d06018a..d08dedd87983397cf1c6be1f9e52fe87574a0cfd 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -48,6 +48,7 @@
 #include "virfile.h"
 #include "virfdstream.h"
 #include "configmake.h"
+#include "virsecret.h"
 #include "virstring.h"
 #include "viraccessapicheck.h"
 //#include "dirname.h"

diff --git a/src/util/virsecret.c b/src/util/virsecret.c
index aded8028b9cd1767fc0ba0f9dde1cea81c70066e..4dd19cdf59f7fe359f1e79cf4d00db6b69b68f14 100644 (file)
--- a/src/util/virsecret.c
+++ b/src/util/virsecret.c
@@ -32,6 +32,8 @@
 
 VIR_LOG_INIT("util.secret");
 
+VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST,
+              "none", "volume", "ceph", "iscsi", "tls")
 
 void
 virSecretLookupDefClear(virSecretLookupTypeDefPtr def)

diff --git a/src/util/virsecret.h b/src/util/virsecret.h
index 4506fb36eb5e4287b8355fae5c8aa060f0f397c3..a56e0c0c5745d098b988c895877ca1f926f4d478 100644 (file)
--- a/src/util/virsecret.h
+++ b/src/util/virsecret.h
@@ -24,8 +24,11 @@
 
 # include "internal.h"
 
+# include "virutil.h"
 # include "virxml.h"
 
+VIR_ENUM_DECL(virSecretUsage)
+
 typedef enum {
     VIR_SECRET_LOOKUP_TYPE_NONE,
     VIR_SECRET_LOOKUP_TYPE_UUID,

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index cd788b687320759b4e94d3722a57f5998b1d62d2..52f067652bd180ba0040f3f4d63c5fb6445043f7 100644 (file)
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -32,9 +32,9 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virutil.h"
+#include "virsecret.h"
 #include "virstring.h"
 #include "virtime.h"
-#include "conf/secret_conf.h"
 
 static virSecretPtr
 virshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)