rpc: remove unused API for creating services from FDs

The virNetServerServiceNewFDOrUNIX method cannot be correctly used when
dealing with systemd activation of a service which can receive more than
one socket FD as there is not guaranteed ordering of FDs.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index 386137c0d8401cc0fb771b8b818da63fd2d2dfab..3307d74324b96873162437c94fb32b3529122b94 100644 (file)
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -205,7 +205,6 @@ virNetServerServiceGetMaxRequests;
 virNetServerServiceGetPort;
 virNetServerServiceGetTLSContext;
 virNetServerServiceIsReadonly;
-virNetServerServiceNewFDOrUNIX;
 virNetServerServiceNewFDs;
 virNetServerServiceNewPostExecRestart;
 virNetServerServiceNewTCP;

diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index d5df5d5c20b6db1cb44193994a3d14acb6135744..66af27d9f798d1d361ddb32a3471a0277607ba42 100644 (file)
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -88,52 +88,6 @@ static void virNetServerServiceAccept(virNetSocketPtr sock,
 }
 
 
-virNetServerServicePtr
-virNetServerServiceNewFDOrUNIX(const char *path,
-                               mode_t mask,
-                               gid_t grp,
-                               int auth,
-                               virNetTLSContextPtr tls,
-                               bool readonly,
-                               size_t max_queued_clients,
-                               size_t nrequests_client_max,
-                               unsigned int nfds,
-                               unsigned int *cur_fd)
-{
-    if (*cur_fd - STDERR_FILENO > nfds) {
-        /*
-         * There are no more file descriptors to use, so we have to
-         * fallback to UNIX socket.
-         */
-        return virNetServerServiceNewUNIX(path,
-                                          mask,
-                                          grp,
-                                          auth,
-                                          tls,
-                                          readonly,
-                                          max_queued_clients,
-                                          nrequests_client_max);
-
-    } else {
-        int fds[] = {(*cur_fd)++};
-        /*
-         * There's still enough file descriptors.  In this case we'll
-         * use the current one and increment it afterwards. Take care
-         * with order of operation for pointer arithmetic and auto
-         * increment on cur_fd - the parentheses are necessary.
-         */
-        return virNetServerServiceNewFDs(fds,
-                                         ARRAY_CARDINALITY(fds),
-                                         false,
-                                         auth,
-                                         tls,
-                                         readonly,
-                                         max_queued_clients,
-                                         nrequests_client_max);
-    }
-}
-
-
 static virNetServerServicePtr
 virNetServerServiceNewSocket(virNetSocketPtr *socks,
                              size_t nsocks,

diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index 73d61dde99f4db71666b2b802a7e7d348d7310b4..d58fc43437e423cd31cb9772449e93c3942ebfc9 100644 (file)
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -34,16 +34,6 @@ typedef int (*virNetServerServiceDispatchFunc)(virNetServerServicePtr svc,
                                                virNetSocketPtr sock,
                                                void *opaque);
 
-virNetServerServicePtr virNetServerServiceNewFDOrUNIX(const char *path,
-                                                      mode_t mask,
-                                                      gid_t grp,
-                                                      int auth,
-                                                      virNetTLSContextPtr tls,
-                                                      bool readonly,
-                                                      size_t max_queued_clients,
-                                                      size_t nrequests_client_max,
-                                                      unsigned int nfds,
-                                                      unsigned int *cur_fd);
 virNetServerServicePtr virNetServerServiceNewTCP(const char *nodename,
                                                  const char *service,
                                                  int family,