Now that we have virSetUninstalledDir() and virGetUninstalledDir(), we no longer need virFDStreamSetIOHelper(). --- src/fdstream.c | 11 ----------- src/fdstream.h | 2 -- src/libvirt_private.syms | 1 - tests/fdstreamtest.c | 3 --- 4 files changed, 0 insertions(+), 17 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index 031d9f5..dbe2781 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -78,17 +78,6 @@ struct virFDStreamData { }; -static const char *iohelper_path = LIBEXECDIR "/libvirt_iohelper"; - -void virFDStreamSetIOHelper(const char *path) -{ - if (path == NULL) - iohelper_path = LIBEXECDIR "/libvirt_iohelper"; - else - iohelper_path = path; -} - - static int virFDStreamRemoveCallback(virStreamPtr stream) { struct virFDStreamData *fdst = stream->privateData; diff --git a/src/fdstream.h b/src/fdstream.h index 9c7295d..6292cd5 100644 --- a/src/fdstream.h +++ b/src/fdstream.h @@ -34,8 +34,6 @@ typedef void (*virFDStreamInternalCloseCbFreeOpaque)(void *opaque); /* Only for use by test suite */ -void virFDStreamSetIOHelper(const char *path); - int virFDStreamOpen(virStreamPtr st, int fd); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3549868..6ac54ea 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -809,7 +809,6 @@ virFDStreamCreateFile; virFDStreamOpen; virFDStreamOpenFile; virFDStreamOpenPTY; -virFDStreamSetIOHelper; # libvirt_internal.h diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 92e7add..f1ef42a 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -321,9 +321,6 @@ mymain(void) { char scratchdir[] = SCRATCHDIRTEMPLATE; int ret = 0; - const char *iohelper = abs_builddir "/../src/libvirt_iohelper"; - - virFDStreamSetIOHelper(iohelper); if (!mkdtemp(scratchdir)) { virFilePrintf(stderr, "Cannot create fakesysfsdir"); -- 1.7.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list