From nobody Sun Feb 8 17:37:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1595603830; cv=none; d=zohomail.com; s=zohoarc; b=aS167FcEVCXiQnidulu8Pbnh3HowYf4M8fxqaPkvPnWnAQGqBQCiriOtBs0ZZ102v5yRqrz5CiXbglcf34nM/jUHlicMb2GsFCT+aqHuMqCXiUXwXz4dp/1YeBOFsZNxZ2lGIDBk0m2OPB0pjldIzQ2P4fxRmtHaOqghCdVXKhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595603830; 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=r6sT9s635E+lr1YRUy/GnfsNsFQJTWd5nl57kHfo4SQ=; b=HUeRjb9Qy7anYZi0iCw3bUL2uLw4BG09eaMG9of8CB2jDKRS0UK3+q+CUmtoaV1TEQ8txBYGQIuyCAUM30gxDGIrtIkkNWw5+VYUa+2LmqcoIpmOgeet1b3xl6j5IDu2TtXpNEhfB1WuLv6AzwXiaUNDZITw04IZ/Cw+bByG8G8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1595603830388779.1592716543556; Fri, 24 Jul 2020 08:17:10 -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-93-cNDY6GdCOvGUw92gt5rleQ-1; Fri, 24 Jul 2020 11:16:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1205319057A0; Fri, 24 Jul 2020 15:16:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7B15712C0; Fri, 24 Jul 2020 15:16:33 +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 B8759180954D; Fri, 24 Jul 2020 15:16:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06OFEVpC023181 for ; Fri, 24 Jul 2020 11:14:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0EAF32DE8F; Fri, 24 Jul 2020 15:14:31 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 254E52DE81; Fri, 24 Jul 2020 15:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595603829; 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=r6sT9s635E+lr1YRUy/GnfsNsFQJTWd5nl57kHfo4SQ=; b=OeefXA1arOdTxj4b9hp4o+I8t034PDS37jtBCKnDMQMp4kZPzOCoMCMi/l0Dg8Ri2vsSqR sEc8htC+pQdmfFKY5/BdHaW0SqfDJ/58n1BqLh5obLNIxuywvJhvQmSMkvs/qoVTNtTPtk D+SHILD+2xxQD6LTvR4/6oLsZlgbt+o= X-MC-Unique: cNDY6GdCOvGUw92gt5rleQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/10] rpc: switch order of args in virNetClientNewSSH Date: Fri, 24 Jul 2020 16:14:13 +0100 Message-Id: <20200724151414.3380935-10-berrange@redhat.com> In-Reply-To: <20200724151414.3380935-1-berrange@redhat.com> References: <20200724151414.3380935-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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 b59352aca0..1c6a273520 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1010,8 +1010,8 @@ doRemoteOpen(virConnectPtr conn, username, !tty, !verify, - netcat, keyfile, + netcat, sockname))) goto failed; =20 diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index f65cda0d7f..72ece28f59 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -444,8 +444,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