[libvirt PATCH 8/9] rpc: switch order of args in virNetClientNewSSH

[Daniel P. Berrangé]

Switch keyfile and netcat parameters, since the netcat path and
socket path are a logical pair that belong together. This patches
the other constructors.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/remote/remote_driver.c | 2 +-
 src/rpc/virnetclient.c     | 2 +-
 src/rpc/virnetclient.h     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c2dcf20f91..c1f7a45aab 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1010,8 +1010,8 @@ doRemoteOpen(virConnectPtr conn,
                                                 username,
                                                 !tty,
                                                 !verify,
-                                                netcat ? netcat : "nc",
                                                 keyfile,
+                                                netcat ? netcat : "nc",
                                                 sockname)))
             goto failed;
 
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index aee2b52bf6..cd1bcc3ab3 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -441,8 +441,8 @@ virNetClientPtr virNetClientNewSSH(const char *nodename,
                                    const char *username,
                                    bool noTTY,
                                    bool noVerify,
-                                   const char *netcatPath,
                                    const char *keyfile,
+                                   const char *netcatPath,
                                    const char *socketPath)
 {
     virNetSocketPtr sock;
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 0005de46f3..6fdc370083 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -48,9 +48,9 @@ virNetClientPtr virNetClientNewSSH(const char *nodename,
                                    const char *username,
                                    bool noTTY,
                                    bool noVerify,
-                                   const char *netcat,
                                    const char *keyfile,
-                                   const char *path);
+                                   const char *netcat,
+                                   const char *socketPath);
 
 virNetClientPtr virNetClientNewLibSSH2(const char *host,
                                        const char *port,
-- 
2.26.2