openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Kletzander 2017-03-07 10:34:47 +01:00
parent c67e04e25f
commit bdcb199532
19 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg.mk
View File

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

2
po/POTFILES.in
View File

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

2
src/Makefile.am
View File

@ -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 \

2
src/bhyve/bhyve_driver.c
View File

@ -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"

2
src/conf/virchrdev.c
View File

@ -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"

20
src/libvirt_private.syms
View File

@ -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;

2
src/libxl/libxl_migration.c
View File

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

2
src/lxc/lxc_driver.c
View File

@ -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"

2
src/qemu/qemu_driver.c
View File

@ -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"

2
src/qemu/qemu_migration.c
View File

@ -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"

2
src/storage/storage_driver.c
View File

@ -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"

2
src/storage/storage_util.c
View File

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

2
src/test/test_driver.c
View File

@ -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"

2
src/uml/uml_driver.c
View File

@ -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"

4
src/fdstream.c → src/util/virfdstream.c
View File

@ -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"

2
src/fdstream.h → src/util/virfdstream.h
View File

@ -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.
*

2
src/vbox/vbox_common.c
View File

@ -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"

2
src/xen/xen_driver.c
View File

@ -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"

2
tests/fdstreamtest.c
View File

@ -25,7 +25,7 @@
#include "testutils.h"
#include "fdstream.h"
#include "virfdstream.h"
#include "datatypes.h"
#include "virerror.h"
#include "viralloc.h"