util: move virStorageEncryption code into conf

The code handles XML bits and internal definition and should be
in conf directory.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2a3c848d058138a2daa4ec68c2bb3a0b0d13448a..a2c46dd2390b1a9654ae68b38fdafa644caad7d1 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -43,6 +43,7 @@
 @SRCDIR@src/conf/snapshot_conf.c
 @SRCDIR@src/conf/storage_adapter_conf.c
 @SRCDIR@src/conf/storage_conf.c
+@SRCDIR@src/conf/storage_encryption_conf.c
 @SRCDIR@src/conf/storage_source_conf.c
 @SRCDIR@src/conf/virchrdev.c
 @SRCDIR@src/conf/virdomainmomentobjlist.c
@@ -307,7 +308,6 @@
 @SRCDIR@src/util/virscsivhost.c
 @SRCDIR@src/util/virsecret.c
 @SRCDIR@src/util/virsocketaddr.c
-@SRCDIR@src/util/virstorageencryption.c
 @SRCDIR@src/util/virstoragefile.c
 @SRCDIR@src/util/virstring.c
 @SRCDIR@src/util/virsysinfo.c

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f5d346ddf00fb6a4f9dd802eca51743a0f8c9f52..95ad052891bc9bca1f0d3d1abaf4cf0250c36725 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -29,7 +29,7 @@
 #include "internal.h"
 #include "virconftypes.h"
 #include "capabilities.h"
-#include "virstorageencryption.h"
+#include "storage_encryption_conf.h"
 #include "cpu_conf.h"
 #include "virthread.h"
 #include "virhash.h"

diff --git a/src/conf/meson.build b/src/conf/meson.build
index 9d4831b81598cd7e65a97aa4cb784d5078000728..bd35d87e0a70a03bfd60945c27c2ac9e39c6b0e2 100644 (file)
--- a/src/conf/meson.build
+++ b/src/conf/meson.build
@@ -54,6 +54,7 @@ storage_conf_sources = [
   'storage_adapter_conf.c',
   'storage_capabilities.c',
   'storage_conf.c',
+  'storage_encryption_conf.c',
   'storage_source_conf.c',
   'virstorageobj.c',
 ]

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index aeda2891d403fcfe277227cf3274647555fd2a00..647eb847bf9cd778dc111a44e5e457938708f0c6 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "internal.h"
-#include "virstorageencryption.h"
+#include "storage_encryption_conf.h"
 #include "storage_source_conf.h"
 #include "virbitmap.h"
 #include "virthread.h"

diff --git a/src/util/virstorageencryption.c b/src/conf/storage_encryption_conf.c
similarity index 99%
rename from src/util/virstorageencryption.c
rename to src/conf/storage_encryption_conf.c
index c893f0babe002416f11b69bb64c89e7fb8eb309f..34ad5dffeb384f0ec30ca10b7ce0f2063b3f5065 100644 (file)
--- a/src/util/virstorageencryption.c
+++ b/src/conf/storage_encryption_conf.c
@@ -1,5 +1,5 @@
 /*
- * virstorageencryption.c: volume encryption information
+ * storage_encryption_conf.c: volume encryption information
  *
  * Copyright (C) 2009-2014 Red Hat, Inc.
  *
@@ -27,7 +27,7 @@
 
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "virstorageencryption.h"
+#include "storage_encryption_conf.h"
 #include "virxml.h"
 #include "virerror.h"
 #include "viruuid.h"

diff --git a/src/util/virstorageencryption.h b/src/conf/storage_encryption_conf.h
similarity index 98%
rename from src/util/virstorageencryption.h
rename to src/conf/storage_encryption_conf.h
index 352dd373d6ca8be231df50a7be4802117bdfd08a..0799421763c711947df5de7008aab031b51968bb 100644 (file)
--- a/src/util/virstorageencryption.h
+++ b/src/conf/storage_encryption_conf.h
@@ -1,5 +1,5 @@
 /*
- * virstorageencryption.h: volume encryption information
+ * storage_encryption_conf.h: volume encryption information
  *
  * Copyright (C) 2009-2011, 2014 Red Hat, Inc.
  *

diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
index 6f39ab4bd020e69e566a1fb0cda70edd6e10c3e2..e66ccdedefafd2242452e6a86b2bb47802834c41 100644 (file)
--- a/src/conf/storage_source_conf.h
+++ b/src/conf/storage_source_conf.h
@@ -21,13 +21,13 @@
 
 #pragma once
 
+#include "storage_encryption_conf.h"
 #include "virbitmap.h"
 #include "virenum.h"
 #include "virobject.h"
 #include "virpci.h"
 #include "virseclabel.h"
 #include "virsecret.h"
-#include "virstorageencryption.h"
 
 /* Types of disk backends (host resource).  Comparable to the public
  * virStorageVolType, except we have an undetermined state, don't have

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b13d0db2091acb0b9cbc2a160d0f69793dc97e96..e8fe8e6c1219167bfee8f8e5cd7071885cd595b5 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1047,6 +1047,12 @@ virStorageVolTypeFromString;
 virStorageVolTypeToString;
 
 
+# conf/storage_encryption_conf.h
+virStorageEncryptionFormat;
+virStorageEncryptionFree;
+virStorageEncryptionParseNode;
+
+
 # conf/storage_event.h
 virStoragePoolEventLifecycleNew;
 virStoragePoolEventRefreshNew;
@@ -3206,12 +3212,6 @@ virSocketAddrSetIPv6AddrNetOrder;
 virSocketAddrSetPort;
 
 
-# util/virstorageencryption.h
-virStorageEncryptionFormat;
-virStorageEncryptionFree;
-virStorageEncryptionParseNode;
-
-
 # util/virstoragefile.h
 virStorageFileCanonicalizePath;
 virStorageFileGetNPIVKey;

diff --git a/src/util/meson.build b/src/util/meson.build
index b510f0ebe9bb8c4bec5d54213089862fe4cc54b6..c077c5cc99f7bb61eb1cbdf3c97e5b01380f28b1 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -88,7 +88,6 @@ util_sources = [
   'virsecret.c',
   'virsocket.c',
   'virsocketaddr.c',
-  'virstorageencryption.c',
   'virstoragefile.c',
   'virstring.c',
   'virsysinfo.c',