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: NMartin Kletzander <mkletzan@redhat.com>

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$$

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

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 					\

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"

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"

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;

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
 

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"

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"

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"

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"

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
 

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"

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"

src/fdstream.c → src/util/virfdstream.c

 /*
- * 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"

src/fdstream.h → src/util/virfdstream.h

 /*
- * fdstream.h: generic streams impl for file descriptors
+ * virfdstream.h: generic streams impl for file descriptors
  *
  * Copyright (C) 2009-2012 Red Hat, Inc.
  *

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"

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"

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"