From patchwork Mon Oct 31 18:06:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9406247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2701A60234 for ; Mon, 31 Oct 2016 18:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D1D728F6A for ; Mon, 31 Oct 2016 18:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 108452919D; Mon, 31 Oct 2016 18:27:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B055E28F6A for ; Mon, 31 Oct 2016 18:27:05 +0000 (UTC) Received: from localhost ([::1]:37739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1HIW-0006Fz-TX for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Oct 2016 14:27:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1H1o-0006t2-Iv for qemu-devel@nongnu.org; Mon, 31 Oct 2016 14:09:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1H1j-0004Qe-Fn for qemu-devel@nongnu.org; Mon, 31 Oct 2016 14:09:48 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:32818) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c1H1j-0004QE-9i; Mon, 31 Oct 2016 14:09:43 -0400 Received: by mail-pf0-x244.google.com with SMTP id a136so5937912pfa.0; Mon, 31 Oct 2016 11:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=hibAwghkqRz9P8Om4JhBLcP2dXJ6v27MpZ3Gm3KjJuw=; b=PI1o9/2Fi0GGMCiGSknGMqNTQNzzHv7ZMQtFTJbeR5Lw2abRk85u7RGwMv71F8vjzQ yXBzsNoyaGO13arLVzCIHTpU5+JjBRc5tEj+KYlSb0du5S5PS6RP5c+yOvNLQRfrhW4S 92haoavCKm1m4BrkG91Pgy/8crOEWzsVYMvlkbAO2xwb4PuCkWaByQdOFXGocezbr2UO 9oGDa8KbdX7WIOj06DWHsvCsY/ujeOGbubLqd9Czm7+ZnWGn7Ie2YchjU/r7ymh365hQ 2ae5qxyQ1mOpUpV05VsE9UxuVbJwczzqqZ799XQaGgkGvGRj7RYzDNCdJUFAuQK0t59P mSfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hibAwghkqRz9P8Om4JhBLcP2dXJ6v27MpZ3Gm3KjJuw=; b=f/41DvbDkiSt2//+uP/+UUBX1cfI9lYBttLtrGsO4bxr3l2KVOJNACr12FWVQZuPqh NgcJOuPrwPdhtgO6Vc3GBDgoyJZJMR975YR/4sk2jYcBEmGTbZTycgTsm+K7KprYg9b8 pDo9AKi1dPIjoyw7K7DOXt/cLChVLkpgUiKIJujTPRXjf+X8qdOFv9b3ST/ZRFJwlvsh RpE1Df3+8TRMSqzlGx/N9/jmiHJWfUOT8YSTjzjDD+jzos/fXdg7VpBtOxviLf1CFw6o p4TX3f8TS5oFQUGm3ErmF4R7Xkq3NqpmNGguqV6s3OhgE3OvZQRPEhxja45eDRL1bCyM XsFA== X-Gm-Message-State: ABUngvdTxE68iaGwirzXHMUcT0H0sWIsv8h8FJom63Gp0F3782AkrQCyQKfO77vtLK9aUg== X-Received: by 10.99.125.14 with SMTP id y14mr43146218pgc.163.1477937382052; Mon, 31 Oct 2016 11:09:42 -0700 (PDT) Received: from linux.local ([47.247.61.135]) by smtp.gmail.com with ESMTPSA id xv9sm37116469pab.36.2016.10.31.11.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Oct 2016 11:09:41 -0700 (PDT) From: Ashijeet Acharya To: kwolf@redhat.com Date: Mon, 31 Oct 2016 23:36:54 +0530 Message-Id: <1477937214-20899-1-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH] block/ssh: Fix the regression of unused parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, jcody@redhat.com, qemu-devel@nongnu.org, rjones@redhat.com, Ashijeet Acharya , mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch drops the unused parameter "BDRVSSHState" being passed into the ssh_config() function and fixes the bug. Signed-off-by: Ashijeet Acharya --- block/ssh.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index ca071c5..15ed281 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -582,8 +582,7 @@ static bool ssh_process_legacy_socket_options(QDict *output_opts, return true; } -static InetSocketAddress *ssh_config(BDRVSSHState *s, QDict *options, - Error **errp) +static InetSocketAddress *ssh_config(QDict *options, Error **errp) { InetSocketAddress *inet = NULL; QDict *addr = NULL; @@ -661,7 +660,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, } /* Pop the config into our state object, Exit if invalid */ - s->inet = ssh_config(s, options, errp); + s->inet = ssh_config(options, errp); if (!s->inet) { ret = -EINVAL; goto err;