From patchwork Thu May 3 18:21:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 10378877 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 CE804603B4 for ; Thu, 3 May 2018 18:26:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC5BA29225 for ; Thu, 3 May 2018 18:26:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0C9829227; Thu, 3 May 2018 18:26:44 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 5B5E929225 for ; Thu, 3 May 2018 18:26:44 +0000 (UTC) Received: from localhost ([::1]:58205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEIwF-00081O-5d for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 May 2018 14:26:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEIqd-00029P-1J for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEIqc-0008K2-2H for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:55 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:39811) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEIqb-0008JV-Rp for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:53 -0400 Received: by mail-wm0-x244.google.com with SMTP id f8-v6so469694wmc.4 for ; Thu, 03 May 2018 11:20:53 -0700 (PDT) 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; bh=sCFF3rFPBrRd4RDgTTRV2ADNLvWEp2hUd2JKxDg/m8o=; b=TYDT0z9SXJFEu1Tyl3Oq6VpycGLKojxSjcnmVLTiAAzr/xOtW6651zGJJ41Il52UqN 3L5ndh0/Cx2wbVnyJ1tl5KwzfWInBukzSvOZ2nLOPvgH697lPg+WUWj7jj0TORmtqQcH 6bDBnw9UIIUPHVxN2JvnmBPrdbyFlfWd/N5Mn63k5LZ1rlfFJcu07wzdtS3+1cNGZlG1 HDuVRmXZY5mAmMsyMQPdfHCtm3/ca2AyR6hO7kZx0NiH0h3TibpbRk02qNZfgeBnKanj Xlw9dbBZ8nGdzYc9lSMYVT5/C82avvkr4uUHtW5O0nBqIdAL5p5ks0W1zA8GauCo62Kv /Jdg== 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; bh=sCFF3rFPBrRd4RDgTTRV2ADNLvWEp2hUd2JKxDg/m8o=; b=d88K5dt26XMJp9+t+JXkpi/2Qmhz5FjvZGRhsecpveNyq6cEjDwFoZxxbIxd6qaTng fvRLviXLpARwMX/AiutfrfN9C52Z8YCKY+iM5b8FaZ4m+KbPfwowkVi7inVr4+YzUT2G ZKV/fE+Q0pyt4VLGwiB1ppV9jHU2PFABUUfj11cgoKNQpO9155rSZSOnKlq0O1TtXWp4 NdPWAUI186dQo4t1LCPB4fWtFsywW5VYaUwsP5zbZuMvnL7oNiU6Z2xvmOuvF65LpcHc LVLK51EVNwJJuscLw2adHWjmBMAuj7CqCTQnN/VrvlUHcnY9sJJSvSywjSwfMBJCqSU0 MLOA== X-Gm-Message-State: ALQs6tARCdPnZuGJGdFDZY/GjsLXi2oEo4rm+2wdLrkmpcxsM4grccmN sucX71FauUqUdFU1RJmqfoly7A== X-Google-Smtp-Source: AB8JxZoFSMO+dJZ3k41rnnfzg6DmqD8yFnRA9LXAEwJap7bNO8XVC+Vc32ijCQpeSMH6/YTdZ0u4Cw== X-Received: by 10.28.113.220 with SMTP id d89mr15286364wmi.26.1525371652658; Thu, 03 May 2018 11:20:52 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id w40-v6sm24388801wrc.69.2018.05.03.11.20.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 11:20:52 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 21:21:23 +0300 Message-Id: <20180503182125.20310-7-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180503182125.20310-1-marcel.apfelbaum@gmail.com> References: <20180503182125.20310-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 6/8] hw/rdma: Delete duplicate definition of MAX_RM_TBL_NAME 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: peter.maydell@linaro.org, yuval.shaia@oracle.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Yuval Shaia By a mistake this constant was defined twice - remove the duplication. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180430200223.4119-7-marcel.apfelbaum@gmail.com> --- hw/rdma/rdma_rm.c | 2 -- hw/rdma/rdma_rm_defs.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 51a47d7292..415da15efe 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -21,8 +21,6 @@ #include "rdma_backend.h" #include "rdma_rm.h" -#define MAX_RM_TBL_NAME 16 - /* Page directory and page tables */ #define PG_DIR_SZ { TARGET_PAGE_SIZE / sizeof(__u64) } #define PG_TBL_SZ { TARGET_PAGE_SIZE / sizeof(__u64) } diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 4d22a20e4c..226011176d 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -34,9 +34,9 @@ #define MAX_QP_INIT_RD_ATOM 16 #define MAX_AH 64 -#define MAX_RMRESTBL_NAME_SZ 16 +#define MAX_RM_TBL_NAME 16 typedef struct RdmaRmResTbl { - char name[MAX_RMRESTBL_NAME_SZ]; + char name[MAX_RM_TBL_NAME]; QemuMutex lock; unsigned long *bitmap; size_t tbl_sz;