From patchwork Sat Jan 19 10:03:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g5WeXleL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYWf6GwNz9s2P for ; Sat, 19 Jan 2019 21:11:58 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknbY-00085C-TK for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:11:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001MS-H9 for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00082i-FN for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:33498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007ry-3R for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wm1-x343.google.com with SMTP id r24so2638911wmh.0 for ; Sat, 19 Jan 2019 02:03:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=taMlslyGH8YAoOO9e/T4VryOWswhKcy2nPy5LB3Jymk=; b=g5WeXleLou4jFx/m+r8Zef8IeZmBtGsOUu7wr16MtsAzCeluK7hbXHemH+EdSlndFe g9K+Od6FOec6uldspAbX9DAfJptQxl8Rh36J0BhJrFKZMAWWQU2faeTo3DS0opRluKeq XiM18lmWkbEhTiYEysY+9gM9cGzrEKJ6CpkAQrOKh3SFRjFyVibpxEEG5xXSqIYxI4xc dHzqfHOmoXJ+xaKMrb6ITR2Z6wMQ+Ady/MpmYNadIIDCUG7VdpZUU7aLDecOXhRgqYCy 3df4yTU7dJyTLnxGpCeZPdbNCoQQeGj6fs+EfvgXbOCwUsF080KzHug5PGhC+zuGJVDq Vnug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=taMlslyGH8YAoOO9e/T4VryOWswhKcy2nPy5LB3Jymk=; b=s3OFUMMB62Zr5OKxEOZldgybnyqyYDIvsEwIptTg0rJoC9v20SHOWblfv8edLYGP0f ZDUJFETtC2yshkRSylveXyP/lIXwDlG3kw64UwlQ2bxR3kNLNfpi2Bb4KzHc+Kpl9li8 eYVWDUE9lWyDHr7kFtGeuW4nuoXQZBAquIePSbkDVMX2CYeJu6PZzgNhFTfrKQRnWGIf LhxvCNfKp8cm5xoDhyWao8/+e5W2Q9frebL4Wt4KbvRLPVz02x3PZvdQ3nWCxqGi+z72 F1zi5SoRW7E7Fgq3lFRswqML18reMHiCEkgVbAS6U9RUDaWhv8Phz7pw1NcZ4CaDYhOs kIKw== X-Gm-Message-State: AJcUukfdpHeHxmgu4N/eboNWfLYVRecB/Kfl1peOIYbUdl4Fv5vXZKMy GWFGIczCt3XhjvqrI7A4x7FhqkOh X-Google-Smtp-Source: ALg8bN55Q3TaDDe46QA6QqpYJI6GF3xapWi4w1wEgBL9lti/dE+0AToHoUNF6HlAymfXRau5p+guyA== X-Received: by 2002:a1c:bdc5:: with SMTP id n188mr19431337wmf.69.1547892203724; Sat, 19 Jan 2019 02:03:23 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:23 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:08 +0200 Message-Id: <20190119100315.23985-4-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH PULL 03/10] hw/rdma: Delete unused struct member 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: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia This member is used only in init_device_caps function, make it local. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 26 ++++++++++++++------------ hw/rdma/rdma_backend_defs.h | 1 - 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 16dca69ee9..b49edaacaf 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -917,23 +917,25 @@ void rdma_backend_destroy_qp(RdmaBackendQP *qp) static int init_device_caps(RdmaBackendDev *backend_dev, struct ibv_device_attr *dev_attr) { - if (ibv_query_device(backend_dev->context, &backend_dev->dev_attr)) { + struct ibv_device_attr bk_dev_attr; + + if (ibv_query_device(backend_dev->context, &bk_dev_attr)) { return -EIO; } dev_attr->max_sge = MAX_SGE; - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_mr_size, "%" PRId64); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_qp, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_sge, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_qp_wr, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_cq, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_cqe, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_mr, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_pd, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_qp_rd_atom, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_qp_init_rd_atom, "%d"); - CHK_ATTR(dev_attr, backend_dev->dev_attr, max_ah, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_mr_size, "%" PRId64); + CHK_ATTR(dev_attr, bk_dev_attr, max_qp, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_sge, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_qp_wr, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_cq, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_cqe, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_mr, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_pd, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_qp_rd_atom, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_qp_init_rd_atom, "%d"); + CHK_ATTR(dev_attr, bk_dev_attr, max_ah, "%d"); return 0; } diff --git a/hw/rdma/rdma_backend_defs.h b/hw/rdma/rdma_backend_defs.h index 1e5c3dd3bf..15ae8b970e 100644 --- a/hw/rdma/rdma_backend_defs.h +++ b/hw/rdma/rdma_backend_defs.h @@ -41,7 +41,6 @@ typedef struct RdmaCmMux { } RdmaCmMux; typedef struct RdmaBackendDev { - struct ibv_device_attr dev_attr; RdmaBackendThread comp_thread; PCIDevice *dev; RdmaDeviceResources *rdma_dev_res;