openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

conf: move storage encryption type to util/ 

Encryption keys can be associated with each source file in a
backing chain; as such, this file belongs more in util/ where
it can be used by virstoragefile.h.

* src/conf/storage_encryption_conf.h: Rename...
* src/util/virstorageencryption.h: ...to this.
* src/conf/storage_encryption_conf.c: Rename...
* src/util/virstorageencryption.c: ...to this.
* src/Makefile.am (ENCRYPTION_CONF_SOURCES, CONF_SOURCES)
(UTIL_SOURCES): Update to new file names.
* src/libvirt_private.syms: Likewise.
* src/conf/domain_conf.h: Update client.
* src/conf/storage_conf.h: Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-27 21:26:44 -06:00
parent 4220f76aed
commit 8fc328592c
7 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -28,7 +28,6 @@ src/conf/object_event.c
src/conf/secret_conf.c
src/conf/snapshot_conf.c
src/conf/storage_conf.c
src/conf/storage_encryption_conf.c
src/conf/virchrdev.c
src/cpu/cpu.c
src/cpu/cpu_generic.c
@ -193,6 +192,7 @@ src/util/virsexpr.c
src/util/virscsi.c
src/util/virsocketaddr.c
src/util/virstatslinux.c
src/util/virstorageencryption.c
src/util/virstoragefile.c
src/util/virstring.c
src/util/virsysinfo.c

5
src/Makefile.am
View File

@ -146,6 +146,7 @@ UTIL_SOURCES = \
util/virsexpr.c util/virsexpr.h \
util/virsocketaddr.h util/virsocketaddr.c \
util/virstatslinux.c util/virstatslinux.h \
util/virstorageencryption.c util/virstorageencryption.h \
util/virstoragefile.c util/virstoragefile.h \
util/virstring.h util/virstring.c \
util/virsysinfo.c util/virsysinfo.h \
@ -288,9 +289,6 @@ SECRET_CONF_SOURCES = \
NODE_DEVICE_CONF_SOURCES = \
conf/node_device_conf.c conf/node_device_conf.h
ENCRYPTION_CONF_SOURCES = \
conf/storage_encryption_conf.c conf/storage_encryption_conf.h
CPU_CONF_SOURCES = \
conf/cpu_conf.c conf/cpu_conf.h
@ -312,7 +310,6 @@ CONF_SOURCES = \
$(NWFILTER_CONF_SOURCES) \
$(NODE_DEVICE_CONF_SOURCES) \
$(STORAGE_CONF_SOURCES) \
$(ENCRYPTION_CONF_SOURCES) \
$(INTERFACE_CONF_SOURCES) \
$(SECRET_CONF_SOURCES) \
$(CPU_CONF_SOURCES) \

2
src/conf/domain_conf.h
View File

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

4
src/conf/storage_conf.h
View File

@ -1,7 +1,7 @@
/*
* storage_conf.h: config handling for storage driver
*
* Copyright (C) 2006-2008, 2010-2013 Red Hat, Inc.
* Copyright (C) 2006-2008, 2010-2014 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
@ -25,7 +25,7 @@
# define __VIR_STORAGE_CONF_H__
# include "internal.h"
# include "storage_encryption_conf.h"
# include "virstorageencryption.h"
# include "virbitmap.h"
# include "virthread.h"

14
src/libvirt_private.syms
View File

@ -729,13 +729,6 @@ virStorageVolTypeFromString;
virStorageVolTypeToString;
# conf/storage_encryption_conf.h
virStorageEncryptionFormat;
virStorageEncryptionFree;
virStorageEncryptionParseNode;
virStorageGenerateQcowPassphrase;
# conf/virchrdev.h
virChrdevAlloc;
virChrdevFree;
@ -1815,6 +1808,13 @@ virSocketAddrSetIPv4Addr;
virSocketAddrSetPort;
# util/virstorageencryption.h
virStorageEncryptionFormat;
virStorageEncryptionFree;
virStorageEncryptionParseNode;
virStorageGenerateQcowPassphrase;
# util/virstoragefile.h
virStorageFileChainGetBroken;
virStorageFileChainLookup;

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

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

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

@ -1,7 +1,7 @@
/*
* storage_encryption_conf.h: volume encryption information
* virstorageencryption.h: volume encryption information
*
* Copyright (C) 2009-2011 Red Hat, Inc.
* Copyright (C) 2009-2011, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public