From nobody Sat Feb 7 11:04:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594319884; cv=none; d=zohomail.com; s=zohoarc; b=R75hozB2mRUgh1e4edfsMM1DcgvV+S91/QF7RXvvcGp2MZoSLJhzgBS4M9s2izlWYszFeuM/2Eqqstlxq2o8K7PPK7pTlSZSnkbBuPowpCBDyy6MRJ4W8thr9R7VX5AYSjtWnTN/VEI5NM3Hn5wGAMlInASHv3UVt8fwdvoSaHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594319884; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QGcxCew+VYQ8lMWj/EwNonhQ+e/5vjwZjAnAX73Kygs=; b=XKlrZoE9Hxysj7pNt48OKvKO3If+6cb/ki6UZa6URMPhE5WYmJl5Moc8wwXEu1B2w2kAxf7OwE2SETMuOjEVD4MAVi1Z+QO7JKqg/RH0j3loru0f86Ror4Xwkq4Sj/arVv83CDgNVvkPLpy4S8ao1+QfB85S4UuaVHuTufmAGdA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594319884241422.4047786644376; Thu, 9 Jul 2020 11:38:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-f9mx_bNUN3O5pyCA4_Mm_A-1; Thu, 09 Jul 2020 14:37:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F1CF80BCAE; Thu, 9 Jul 2020 18:37:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4DB0179CF3; Thu, 9 Jul 2020 18:37:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1C8B98435D; Thu, 9 Jul 2020 18:37:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 069Ib7B1023486 for ; Thu, 9 Jul 2020 14:37:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8364460F8D; Thu, 9 Jul 2020 18:37:07 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E53260E1C; Thu, 9 Jul 2020 18:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594319883; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QGcxCew+VYQ8lMWj/EwNonhQ+e/5vjwZjAnAX73Kygs=; b=KNgyClnMudhK8G4id2pbcuIolE7q08HWUjpYCIby0det/S8WSjYxb1VR/bWet7JnQT7NJV U6DNZtY4Om+F6vbD1qsHhhSrZ1h+HMOsI3fOIi5a0cO71JNIRuBKS3RGg8yRZDyLlV2nQJ +EVMCbrP4VXEp/caKKGGKZSAclFiQeE= X-MC-Unique: f9mx_bNUN3O5pyCA4_Mm_A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 8/9] rpc: switch order of args in virNetClientNewSSH Date: Thu, 9 Jul 2020 19:36:45 +0100 Message-Id: <20200709183646.4016586-9-berrange@redhat.com> In-Reply-To: <20200709183646.4016586-1-berrange@redhat.com> References: <20200709183646.4016586-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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=C3=A9 --- 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; =20 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); =20 virNetClientPtr virNetClientNewLibSSH2(const char *host, const char *port, --=20 2.26.2