External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: move virStorageEncryption code into conf

Browse Source 
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>
This commit is contained in:
Pavel Hrdina 2020-12-08 16:54:30 +01:00
parent 3e54766414
commit 5ac39c4ab0
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -43,6 +43,7 @@
@SRCDIR@src/conf/snapshot_conf.c @SRCDIR@src/conf/snapshot_conf.c
@SRCDIR@src/conf/storage_adapter_conf.c @SRCDIR@src/conf/storage_adapter_conf.c
@SRCDIR@src/conf/storage_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/storage_source_conf.c
@SRCDIR@src/conf/virchrdev.c @SRCDIR@src/conf/virchrdev.c
@SRCDIR@src/conf/virdomainmomentobjlist.c @SRCDIR@src/conf/virdomainmomentobjlist.c
@ -307,7 +308,6 @@
@SRCDIR@src/util/virscsivhost.c @SRCDIR@src/util/virscsivhost.c
@SRCDIR@src/util/virsecret.c @SRCDIR@src/util/virsecret.c
@SRCDIR@src/util/virsocketaddr.c @SRCDIR@src/util/virsocketaddr.c
@SRCDIR@src/util/virstorageencryption.c
@SRCDIR@src/util/virstoragefile.c @SRCDIR@src/util/virstoragefile.c
@SRCDIR@src/util/virstring.c @SRCDIR@src/util/virstring.c
@SRCDIR@src/util/virsysinfo.c @SRCDIR@src/util/virsysinfo.c

2
src/conf/domain_conf.h
View File

@ -29,7 +29,7 @@
#include "internal.h" #include "internal.h"
#include "virconftypes.h" #include "virconftypes.h"
#include "capabilities.h" #include "capabilities.h"
#include "virstorageencryption.h" #include "storage_encryption_conf.h"
#include "cpu_conf.h" #include "cpu_conf.h"
#include "virthread.h" #include "virthread.h"
#include "virhash.h" #include "virhash.h"

1
src/conf/meson.build
View File

@ -54,6 +54,7 @@ storage_conf_sources = [
'storage_adapter_conf.c', 'storage_adapter_conf.c',
'storage_capabilities.c', 'storage_capabilities.c',
'storage_conf.c', 'storage_conf.c',
'storage_encryption_conf.c',
'storage_source_conf.c', 'storage_source_conf.c',
'virstorageobj.c', 'virstorageobj.c',
] ]

2
src/conf/storage_conf.h
View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include "internal.h" #include "internal.h"
#include "virstorageencryption.h" #include "storage_encryption_conf.h"
#include "storage_source_conf.h" #include "storage_source_conf.h"
#include "virbitmap.h" #include "virbitmap.h"
#include "virthread.h" #include "virthread.h"

4
src/util/virstorageencryption.c → src/conf/storage_encryption_conf.c
View File

@ -1,5 +1,5 @@
/* /*
* virstorageencryption.c: volume encryption information * storage_encryption_conf.c: volume encryption information
* *
* Copyright (C) 2009-2014 Red Hat, Inc. * Copyright (C) 2009-2014 Red Hat, Inc.
* *
@ -27,7 +27,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virstorageencryption.h" #include "storage_encryption_conf.h"
#include "virxml.h" #include "virxml.h"
#include "virerror.h" #include "virerror.h"
#include "viruuid.h" #include "viruuid.h"

2
src/util/virstorageencryption.h → src/conf/storage_encryption_conf.h
View File

@ -1,5 +1,5 @@
/* /*
* virstorageencryption.h: volume encryption information * storage_encryption_conf.h: volume encryption information
* *
* Copyright (C) 2009-2011, 2014 Red Hat, Inc. * Copyright (C) 2009-2011, 2014 Red Hat, Inc.
* *

2
src/conf/storage_source_conf.h
View File

@ -21,13 +21,13 @@
#pragma once #pragma once
#include "storage_encryption_conf.h"
#include "virbitmap.h" #include "virbitmap.h"
#include "virenum.h" #include "virenum.h"
#include "virobject.h" #include "virobject.h"
#include "virpci.h" #include "virpci.h"
#include "virseclabel.h" #include "virseclabel.h"
#include "virsecret.h" #include "virsecret.h"
#include "virstorageencryption.h"
/* Types of disk backends (host resource). Comparable to the public /* Types of disk backends (host resource). Comparable to the public
* virStorageVolType, except we have an undetermined state, don't have * virStorageVolType, except we have an undetermined state, don't have

12
src/libvirt_private.syms
View File

@ -1047,6 +1047,12 @@ virStorageVolTypeFromString;
virStorageVolTypeToString; virStorageVolTypeToString;
# conf/storage_encryption_conf.h
virStorageEncryptionFormat;
virStorageEncryptionFree;
virStorageEncryptionParseNode;
# conf/storage_event.h # conf/storage_event.h
virStoragePoolEventLifecycleNew; virStoragePoolEventLifecycleNew;
virStoragePoolEventRefreshNew; virStoragePoolEventRefreshNew;
@ -3206,12 +3212,6 @@ virSocketAddrSetIPv6AddrNetOrder;
virSocketAddrSetPort; virSocketAddrSetPort;
# util/virstorageencryption.h
virStorageEncryptionFormat;
virStorageEncryptionFree;
virStorageEncryptionParseNode;
# util/virstoragefile.h # util/virstoragefile.h
virStorageFileCanonicalizePath; virStorageFileCanonicalizePath;
virStorageFileGetNPIVKey; virStorageFileGetNPIVKey;

1
src/util/meson.build
View File

@ -88,7 +88,6 @@ util_sources = [
'virsecret.c', 'virsecret.c',
'virsocket.c', 'virsocket.c',
'virsocketaddr.c', 'virsocketaddr.c',
'virstorageencryption.c',
'virstoragefile.c', 'virstoragefile.c',
'virstring.c', 'virstring.c',
'virsysinfo.c', 'virsysinfo.c',