Move src/fdstream to src/util/virfdstream

There is no reason for it not to be in the utils, all global symbols
under that file already have prefix vir* and there is no reason for it
to be part of DRIVER_SOURCES because that is just a leftover from
older days (pre-driver modules era, I believe).

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index bfaea4afb255b85bc5772989e8eb858f9ed9b83a..36f70bfb93d280d77feef420b6266c7206f57246 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1101,7 +1101,7 @@ $(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x
 # List all syntax-check exemptions:
 exclude_file_name_regexp--sc_avoid_strcase = ^tools/vsh\.h$$
 
-_src1=libvirt-stream|fdstream|qemu/qemu_monitor|util/(vircommand|virfile)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon
+_src1=libvirt-stream|qemu/qemu_monitor|util/vir(command|file|fdstream)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon
 _test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock
 exclude_file_name_regexp--sc_avoid_write = \
   ^(src/($(_src1))|daemon/libvirtd|tools/virsh-console|tests/($(_test1)))\.c$$

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 64cb88cfa5a78adab150968ae048c08dd2868fce..2002e6889413083789a997a7b043ce04e2225ee7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,7 +67,6 @@ src/esx/esx_util.c
 src/esx/esx_vi.c
 src/esx/esx_vi_methods.c
 src/esx/esx_vi_types.c
-src/fdstream.c
 src/hyperv/hyperv_driver.c
 src/hyperv/hyperv_util.c
 src/hyperv/hyperv_wmi.c
@@ -206,6 +205,7 @@ src/util/virdnsmasq.c
 src/util/virerror.c
 src/util/virerror.h
 src/util/vireventpoll.c
+src/util/virfdstream.c
 src/util/virfile.c
 src/util/virfirewall.c
 src/util/virfirmware.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 86fb721fc3af1f10ea41d92b07f47e26a7db2295..efaa7241394ba12f5f1fa52ce1e8ff35a8a8e916 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,6 +113,7 @@ UTIL_SOURCES =                                                      \
                util/virerror.c util/virerror.h                 \
                util/virevent.c util/virevent.h                 \
                util/vireventpoll.c util/vireventpoll.h         \
+               util/virfdstream.c util/virfdstream.h           \
                util/virfile.c util/virfile.h                   \
                util/virfirewall.c util/virfirewall.h           \
                util/virfirewallpriv.h                          \
@@ -218,7 +219,6 @@ DRIVER_SOURCES =                                                    \
                driver-stream.h                                         \
                internal.h                                              \
                $(DATATYPES_SOURCES)                                    \
-               fdstream.c fdstream.h                                   \
                $(NODE_INFO_SOURCES)                                    \
                libvirt.c libvirt_internal.h                            \
                libvirt-domain.c                                        \

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 3258c272085d0840cf18310fb6631c7963868d68..380af39b0b2a44e1fb8479e8482af135f7958269 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -37,7 +37,7 @@
 #include "domain_audit.h"
 #include "domain_event.h"
 #include "snapshot_conf.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "storage_conf.h"
 #include "node_device_conf.h"
 #include "virdomainobjlist.h"

diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c
index bca9c37d427ee3bde2b59c60c7d51798959e9490..416a7a129c78392dc09ef378c4e44abd942d7c66 100644 (file)
--- a/src/conf/virchrdev.c
+++ b/src/conf/virchrdev.c
@@ -29,7 +29,7 @@
 
 #include "virchrdev.h"
 #include "virhash.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "internal.h"
 #include "virthread.h"
 #include "viralloc.h"

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 384888d158199ed747647213dcac3fefc06d4466..ec6deb8a5dfd11dddc30b7f9719f06c4a37cfeab 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1063,16 +1063,6 @@ virStorageVolClass;
 virStreamClass;
 
 
-# fdstream.h
-virFDStreamConnectUNIX;
-virFDStreamCreateFile;
-virFDStreamOpen;
-virFDStreamOpenBlockDevice;
-virFDStreamOpenFile;
-virFDStreamOpenPTY;
-virFDStreamSetInternalCloseCb;
-
-
 # libvirt_internal.h
 virConnectSupportsFeature;
 virDomainMigrateBegin3;
@@ -1569,6 +1559,16 @@ virEventPollUpdateHandle;
 virEventPollUpdateTimeout;
 
 
+# util/virfdstream.h
+virFDStreamConnectUNIX;
+virFDStreamCreateFile;
+virFDStreamOpen;
+virFDStreamOpenBlockDevice;
+virFDStreamOpenFile;
+virFDStreamOpenPTY;
+virFDStreamSetInternalCloseCb;
+
+
 # util/virfile.h
 saferead;
 safewrite;

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 6b5b981f18bc5563d78d4a2e0ef9df3ac13d9408..073cfda64302a3a8e2d5eb8b4ceea127d19d807d 100644 (file)
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -44,7 +44,7 @@
 #include "libxl_migration.h"
 #include "locking/domain_lock.h"
 #include "virtypedparam.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a2c1052c65fe13de121456b3733890c5ce493cdb..5dbd5a6c242c4cb48d356c58919900c66e737ac9 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -64,7 +64,7 @@
 #include "virhook.h"
 #include "virfile.h"
 #include "virpidfile.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "domain_audit.h"
 #include "domain_nwfilter.h"
 #include "nwfilter_conf.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 53c909072621e14e61256b24c44649e59dccbe63..68044d8c4dc93326ea1a96365d0baef1231583f6 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -87,7 +87,7 @@
 #include "virhook.h"
 #include "virstoragefile.h"
 #include "virfile.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "configmake.h"
 #include "virthreadpool.h"
 #include "locking/lock_manager.h"

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a69e8784ab5240c947bc8f6ff631bcca7bc703bd..3e789a7a7e1fcdda0842f2a3026bb59ab82b7573 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -49,7 +49,7 @@
 #include "virfile.h"
 #include "virnetdevopenvswitch.h"
 #include "datatypes.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "viruuid.h"
 #include "virtime.h"
 #include "locking/domain_lock.h"

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 287a86276c3333072be0d20ab60a3b0c5449167c..61c5e7eff132c528060978ce33fe99961c16ccc8 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -46,7 +46,7 @@
 #include "storage_backend.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "configmake.h"
 #include "virstring.h"
 #include "viraccessapicheck.h"

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 38d373ec26c460e160d866dbfb7979d13d3a19d7..7687eb89a0baaf09fb1ee016277ed615efffa0c9 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -67,7 +67,7 @@
 #include "stat-time.h"
 #include "virstring.h"
 #include "virxml.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 18eaf56021dd860959a0e5be3b378b7cc5b3a91a..866949558bb29f6a7a164c4bef2f6e0d969a6c9c 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -47,7 +47,7 @@
 #include "domain_event.h"
 #include "network_event.h"
 #include "snapshot_conf.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "storage_conf.h"
 #include "virstorageobj.h"
 #include "storage_event.h"

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index f0c0ad35a8beec04f13ead3186315ea8e501cb2e..18e62663ca861826a623ea956ba66b1824c7b23a 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -58,7 +58,7 @@
 #include "domain_nwfilter.h"
 #include "nwfilter_conf.h"
 #include "virfile.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "configmake.h"
 #include "virnetdevtap.h"
 #include "virnodesuspend.h"

diff --git a/src/fdstream.c b/src/util/virfdstream.c
similarity index 99%
rename from src/fdstream.c
rename to src/util/virfdstream.c
index 3e92577c79854e3fc4723f3b64395163b03cd7c6..75b69b611c12957b6bcb5e3259967d49e5064933 100644 (file)
--- a/src/fdstream.c
+++ b/src/util/virfdstream.c
@@ -1,5 +1,5 @@
 /*
- * fdstream.c: generic streams impl for file descriptors
+ * virfdstream.c: generic streams impl for file descriptors
  *
  * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
  *
@@ -33,7 +33,7 @@
 #include <netinet/in.h>
 #include <termios.h>
 
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "virerror.h"
 #include "datatypes.h"
 #include "virlog.h"

diff --git a/src/fdstream.h b/src/util/virfdstream.h
similarity index 97%
rename from src/fdstream.h
rename to src/util/virfdstream.h
index 2c913ea14093347f275776fceb610ce95ac07c17..32a741e2695d3cd88acc4dd29cdfeb600d8c8d5a 100644 (file)
--- a/src/fdstream.h
+++ b/src/util/virfdstream.h
@@ -1,5 +1,5 @@
 /*
- * fdstream.h: generic streams impl for file descriptors
+ * virfdstream.h: generic streams impl for file descriptors
  *
  * Copyright (C) 2009-2012 Red Hat, Inc.
  *

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 96e1ffdc759cc3a51e4b4c055c3ea0d11a90557b..a64d2e89a9bd66e5c9eb6aa61ddb41daf3cbcb5d 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -37,7 +37,7 @@
 #include "virkeycode.h"
 #include "snapshot_conf.h"
 #include "vbox_snapshot_conf.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "configmake.h"
 
 #include "vbox_common.h"

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 3f9bfa7a6c38e3cf804a7cc35f58fe47166b839a..c88e7ea00751fc35909dc1ca6badac8c5af2f12a 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -59,7 +59,7 @@
 #include "node_device_conf.h"
 #include "virpci.h"
 #include "viruuid.h"
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "virfile.h"
 #include "viruri.h"
 #include "vircommand.h"

diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 625fd561d3b37ca988515d29ecbb03f134057460..9c7d65bef6cc39d2be969708ea8789830e5b4aa0 100644 (file)
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -25,7 +25,7 @@
 
 #include "testutils.h"
 
-#include "fdstream.h"
+#include "virfdstream.h"
 #include "datatypes.h"
 #include "virerror.h"
 #include "viralloc.h"