On 03/27/14 00:09, Eric Blake wrote:
In order to reuse the newly-created host-side disk struct in
the virstoragefile backing chain code, I first have to move
it to util/. This starts the process, by first moving the
security label structures.
* src/conf/domain_conf.h (virDomainDefGenSecurityLabelDef)
(virDomainDiskDefGenSecurityLabelDef, virSecurityLabelDefFree)
(virSecurityDeviceLabelDefFree, virSecurityLabelDef)
(virSecurityDeviceLabelDef): Move...
* src/util/virseclabel.h: ...to new file.
(virSecurityLabelDefNew, virSecurityDeviceLabelDefNew): Rename the
GenSecurity functions.
* src/qemu/qemu_process.c (qemuProcessAttach): Adjust callers.
* src/security/security_manager.c (virSecurityManagerGenLabel):
Likewise.
* src/security/security_selinux.c
(virSecuritySELinuxSetSecurityFileLabel): Likewise.
* src/util/virseclabel.c: New file.
* src/conf/domain_conf.c: Move security code, and fix fallout.
* src/Makefile.am (UTIL_SOURCES): Build new file.
* src/libvirt_private.syms (domain_conf.h): Move symbols...
(virseclabel.h): ...to new section.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/Makefile.am | 1 +
src/conf/domain_conf.c | 51 -------------------------
src/conf/domain_conf.h | 43 +--------------------
src/libvirt_private.syms | 11 ++++--
src/qemu/qemu_process.c | 2 +-
src/security/security_manager.c | 2 +-
src/security/security_selinux.c | 2 +-
src/util/virseclabel.c | 82 +++++++++++++++++++++++++++++++++++++++++
src/util/virseclabel.h | 67 +++++++++++++++++++++++++++++++++
9 files changed, 161 insertions(+), 100 deletions(-)
create mode 100644 src/util/virseclabel.c
create mode 100644 src/util/virseclabel.h
ACK.
Peter