On Thu, Aug 14, 2014 at 08:22:06PM +0400, Roman Bogorodskiy wrote:
Currently, qemu driver uses qemuTranslateDiskSourcePool()
to translate disk volume information. This function is
general enough and could be used for other drivers as well,
so move it to conf/domain_conf.c along with its helpers.
- qemuTranslateDiskSourcePool: move to conf/domain_conf.c
and rename to virDomainTranslateDiskSourcePool,
- qemuAddISCSIPoolSourceHost: move to conf/domain_conf.c
and rename to virDomainAddISCSIPoolSourceHost,
- qemuTranslateDiskSourcePoolAuth: move to conf/domain_conf.c
and rename to virDomainTranslateDiskSourcePoolAuth,
- Expose virDomainTranslateDiskSourcePool through
libvirt_private.syms,
- Update users of virDomainTranslateDiskSourcePool to use a
new name.
---
src/conf/domain_conf.c | 245 +++++++++++++++++++++++++++++++++++++++++++++++
src/conf/domain_conf.h | 3 +
src/libvirt_private.syms | 1 +
src/qemu/qemu_conf.c | 243 ----------------------------------------------
src/qemu/qemu_conf.h | 3 -
src/qemu/qemu_driver.c | 6 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_process.c | 4 +-
tests/qemuxml2argvtest.c | 2 +-
9 files changed, 256 insertions(+), 253 deletions(-)
The only problem with this patch is that I can't build when I apply
it. libvirt_lxc (the binary) does not get built because unresolved
dependencies in the libs. I cameup with a fix, but I'm pretty sure
that's not what we want. However, it works nice with it:
diff --git i/src/Makefile.am w/src/Makefile.am
index f69923f..0c4c8ae 100644
--- i/src/Makefile.am
+++ w/src/Makefile.am
@@ -2568,6 +2568,7 @@ libvirt_lxc_SOURCES = \
libvirt_lxc_LDFLAGS = \
$(AM_LDFLAGS) \
$(PIE_LDFLAGS) \
+ -lvirt \
$(NULL)
libvirt_lxc_LDADD = \
$(FUSE_LIBS) \
--
Martin