9:55 a.m.
The code handles XML bits and internal definition and should be
in conf directory.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/conf/domain_conf.h | 2 +-
src/conf/meson.build | 1 +
src/conf/storage_conf.h | 2 +-
.../storage_encryption.c} | 4 ++--
.../storage_encryption.h} | 2 +-
src/conf/storage_source.h | 2 +-
src/libvirt_private.syms | 12 ++++++------
src/util/meson.build | 1 -
9 files changed, 14 insertions(+), 14 deletions(-)
rename src/{util/virstorageencryption.c => conf/storage_encryption.c} (99%)
rename src/{util/virstorageencryption.h => conf/storage_encryption.h} (98%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 135198820a..3062a4080c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -43,6 +43,7 @@
@SRCDIR(a)src/conf/snapshot_conf.c
@SRCDIR(a)src/conf/storage_adapter_conf.c
@SRCDIR(a)src/conf/storage_conf.c
+@SRCDIR(a)src/conf/storage_encryption.c
@SRCDIR(a)src/conf/storage_source.c
@SRCDIR(a)src/conf/virchrdev.c
@SRCDIR(a)src/conf/virdomainmomentobjlist.c
@@ -306,7 +307,6 @@
@SRCDIR(a)src/util/virscsivhost.c
@SRCDIR(a)src/util/virsecret.c
@SRCDIR(a)src/util/virsocketaddr.c
-@SRCDIR(a)src/util/virstorageencryption.c
@SRCDIR(a)src/util/virstoragefile.c
@SRCDIR(a)src/util/virstring.c
@SRCDIR(a)src/util/virsysinfo.c
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5c95317501..298a1ac261 100644
--- 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.h"
#include "cpu_conf.h"
#include "virthread.h"
#include "virhash.h"
diff --git a/src/conf/meson.build b/src/conf/meson.build
index 12efaf56cc..709389c9ba 100644
--- 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.c',
'storage_source.c',
'virstorageobj.c',
]
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 47f2bf602d..7835c7aed8 100644
--- 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.h"
#include "storage_source.h"
#include "virbitmap.h"
#include "virthread.h"
diff --git a/src/util/virstorageencryption.c b/src/conf/storage_encryption.c
similarity index 99%
rename from src/util/virstorageencryption.c
rename to src/conf/storage_encryption.c
index c893f0babe..020dfdc6a2 100644
--- a/src/util/virstorageencryption.c
+++ b/src/conf/storage_encryption.c
@@ -1,5 +1,5 @@
/*
- * virstorageencryption.c: volume encryption information
+ * storage_encryption.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.h"
#include "virxml.h"
#include "virerror.h"
#include "viruuid.h"
diff --git a/src/util/virstorageencryption.h b/src/conf/storage_encryption.h
similarity index 98%
rename from src/util/virstorageencryption.h
rename to src/conf/storage_encryption.h
index 352dd373d6..c5673053e6 100644
--- a/src/util/virstorageencryption.h
+++ b/src/conf/storage_encryption.h
@@ -1,5 +1,5 @@
/*
- * virstorageencryption.h: volume encryption information
+ * storage_encryption.h: volume encryption information
*
* Copyright (C) 2009-2011, 2014 Red Hat, Inc.
*
diff --git a/src/conf/storage_source.h b/src/conf/storage_source.h
index 89bba38599..dac2e8b71c 100644
--- a/src/conf/storage_source.h
+++ b/src/conf/storage_source.h
@@ -21,13 +21,13 @@
#pragma once
+#include "storage_encryption.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 0b0a57e85d..91f795adfc 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1047,6 +1047,12 @@ virStorageVolTypeFromString;
virStorageVolTypeToString;
+# conf/storage_encryption.h
+virStorageEncryptionFormat;
+virStorageEncryptionFree;
+virStorageEncryptionParseNode;
+
+
# conf/storage_event.h
virStoragePoolEventLifecycleNew;
virStoragePoolEventRefreshNew;
@@ -3207,12 +3213,6 @@ virSocketAddrSetIPv6AddrNetOrder;
virSocketAddrSetPort;
-# util/virstorageencryption.h
-virStorageEncryptionFormat;
-virStorageEncryptionFree;
-virStorageEncryptionParseNode;
-
-
# util/virstoragefile.h
virStorageFileGetNPIVKey;
virStorageFileGetSCSIKey;
diff --git a/src/util/meson.build b/src/util/meson.build
index b510f0ebe9..c077c5cc99 100644
--- 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',
--
2.28.0