[libvirt] [PATCH RFC 02/48] src: Move iohelper out from utils/ to a separate dir

Michal Privoznik mprivozn at redhat.com
Wed Jun 22 14:43:19 UTC 2016


This helper binary will grow in the future (e.g. it will gain
a so library which will be shared with daemon too) therefore its
sources should live somewhere else than utils/. I've chosen
src/iohelper.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 po/POTFILES.in                    | 2 +-
 src/Makefile.am                   | 6 +++---
 src/{util => iohelper}/iohelper.c | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{util => iohelper}/iohelper.c (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 822cfbc..9f4866c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,6 +63,7 @@ src/hyperv/hyperv_wmi.c
 src/interface/interface_backend_netcf.c
 src/interface/interface_backend_udev.c
 src/internal.h
+src/iohelper/iohelper.c
 src/libvirt-admin.c
 src/libvirt-domain-snapshot.c
 src/libvirt-domain.c
@@ -176,7 +177,6 @@ src/storage/storage_driver.c
 src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
-src/util/iohelper.c
 src/util/viralloc.c
 src/util/viraudit.c
 src/util/virauth.c
diff --git a/src/Makefile.am b/src/Makefile.am
index a14cb3f..3409631 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -991,8 +991,8 @@ STORAGE_DRIVER_ZFS_SOURCES =					\
 STORAGE_HELPER_DISK_SOURCES =					\
 		storage/parthelper.c
 
-UTIL_IO_HELPER_SOURCES =					\
-		util/iohelper.c
+IO_HELPER_SOURCES =								\
+		iohelper/iohelper.c
 
 NETWORK_LEASES_HELPER_SOURCES =                                 \
                network/leaseshelper.c
@@ -2843,7 +2843,7 @@ libexec_PROGRAMS =
 
 if WITH_LIBVIRTD
 libexec_PROGRAMS += libvirt_iohelper
-libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
+libvirt_iohelper_SOURCES = $(IO_HELPER_SOURCES)
 libvirt_iohelper_LDFLAGS = \
 		$(AM_LDFLAGS) \
 		$(PIE_LDFLAGS) \
diff --git a/src/util/iohelper.c b/src/iohelper/iohelper.c
similarity index 100%
rename from src/util/iohelper.c
rename to src/iohelper/iohelper.c
-- 
2.8.4




More information about the libvir-list mailing list