From patchwork Wed Sep 26 18:36:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 147630 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1066600lji; Wed, 26 Sep 2018 11:37:48 -0700 (PDT) X-Google-Smtp-Source: ACcGV63sTyI8LhObx50S1TpC1mBSDt0dMkFYaOWtp0Qf6FRjvKjjWAxkvJEvqMMTVSJsiQHSI2W6 X-Received: by 2002:a0c:ec47:: with SMTP id n7-v6mr1757522qvq.56.1537987068762; Wed, 26 Sep 2018 11:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537987068; cv=none; d=google.com; s=arc-20160816; b=rtOO4mKgAL9bVp2gp1C4ur2vsSPf+hdnFBQDz7RjbWd7m+jzmZCksYBir0i+GWfqIV DPTkJGMAAD7zlS8vqDHW/ApXOKcYes8O5NgWHpRAWCBmbdCX1W7en0YlD676MjyQdnA5 sZ4yF3EtTzHghNA2QrSyzlwUWX8nZMxDZOd05T1KXSDjWuRJj5BUgDj7E90eMJcaKwnh 7S9UH2ixzhTyNh1p3nundZftCW7eb5CZh9xB3afM69oVIw+oyg4WkMj0Z1U2KdXyXY9i /OORGbvK/JrRBWC3L96h30edNyXD0fvRIzfpvMOgAja5XAH7hyLoBlIWmT+OKr/yN2Io Iv5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=DzNemCflqvfNAtAYsmACDL1RY7fZHGvm7UAXMK9Epso=; b=ClwCHp+98FAT2+hKvBsexnEB5aVFmOCGK7OVhAM6vzqB+DBXHVTPk9Ip+4M899EFum Ij0/0EM62CzXratnP8edcFKrjwMRUmp9ZulZx0vqghyilIu7DGV0q3741sWMUOo5YUNK TXlz1GnGwH7meCPswbJ+zL+X+SnK2wXzAZyEraiGehnFnZpaBpLZ2TKUrGWfvAto5dLi UX1sYEn/X4in7NFT4qXq4RXmJqghNi5uT04H8zNgFkC115kzUfsB1PCmsUmVT8/0MZVr akLhfKc7ZVp5VdVTuT658Ec+U2CyA+UA/kcv9b9Phb3nQMv+iAWPqTDAtaM0ikSPJECh baAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KKOIJDvr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p79-v6si1956029qki.58.2018.09.26.11.37.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 26 Sep 2018 11:37:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KKOIJDvr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Eh2-0001MB-4S for patch@linaro.org; Wed, 26 Sep 2018 14:37:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Ege-0001Lg-OM for qemu-devel@nongnu.org; Wed, 26 Sep 2018 14:37:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5Ega-0007Ax-Cd for qemu-devel@nongnu.org; Wed, 26 Sep 2018 14:37:22 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:38351) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g5EgW-00078X-IS for qemu-devel@nongnu.org; Wed, 26 Sep 2018 14:37:17 -0400 Received: by mail-pf1-x443.google.com with SMTP id x17-v6so13885152pfh.5 for ; Wed, 26 Sep 2018 11:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DzNemCflqvfNAtAYsmACDL1RY7fZHGvm7UAXMK9Epso=; b=KKOIJDvrUh2Ou5pBR2mTbYJMYOTmvckprwun3YQLBnZ31EH/toL9O1XUksBV1vc778 5n4k195kt8B7fJGUvPDBPtGhIi+SzKlR2EuDWuo6vMZwgJoqiKxKb99S6btypS05s7na WZkN4zTmo3BrvvOvpxeezuo411SlBN6/GWYgM= 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=DzNemCflqvfNAtAYsmACDL1RY7fZHGvm7UAXMK9Epso=; b=hC6uMBbo8C1kIRrg/3IGbC2jl41AGMii3ZuPsftagDK2C9J+AMmc4lvuK6RQSwtb/z Y1MezvarYXCS4IqT4WNZyycHzkfjRU3FqAJ8YC7H556sx4EAJ995887Ux+cmsnIN8zg8 ojVuvotSe6ItQef6qwWulhacjfH8axaYVgWaZjZvST/aV8PKUN7y8e2cNXiCZqEc1GTG snhLwIqoqithXsV8i67K3a8kk78Zh1NSB5RWScpB8ug2fJA4GCugkrZPWXJKl2jSoVKc 9BL8tXDvTDfl/NQwxMaWt1vYy2Cu2o+HCXpNZV4BTJDX6ExaitV4hgMob7ZAWt2muBoa jBhw== X-Gm-Message-State: ABuFfohqUbJ2MnVodEtMOR1yhtgkHYOYbHMhygCQY7NfRcDOm6pr8G70 zlDvRooekiR1LTYo035ajICdowPxDow= X-Received: by 2002:a17:902:44:: with SMTP id 62-v6mr7370351pla.181.1537987033749; Wed, 26 Sep 2018 11:37:13 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id b14-v6sm9735952pfc.178.2018.09.26.11.37.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Sep 2018 11:37:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2018 11:36:57 -0700 Message-Id: <20180926183709.21293-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180926183709.21293-1-richard.henderson@linaro.org> References: <20180926183709.21293-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PULL 01/13] qht: remove unused map param from qht_remove__locked 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, "Emilio G. Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- util/qht.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/util/qht.c b/util/qht.c index 1e3a072e25..28d9273371 100644 --- a/util/qht.c +++ b/util/qht.c @@ -692,8 +692,7 @@ static inline void qht_bucket_remove_entry(struct qht_bucket *orig, int pos) /* call with b->lock held */ static inline -bool qht_remove__locked(struct qht_map *map, struct qht_bucket *head, - const void *p, uint32_t hash) +bool qht_remove__locked(struct qht_bucket *head, const void *p, uint32_t hash) { struct qht_bucket *b = head; int i; @@ -728,7 +727,7 @@ bool qht_remove(struct qht *ht, const void *p, uint32_t hash) qht_debug_assert(p); b = qht_bucket_lock__no_stale(ht, hash, &map); - ret = qht_remove__locked(map, b, p, hash); + ret = qht_remove__locked(b, p, hash); qht_bucket_debug__locked(b); qemu_spin_unlock(&b->lock); return ret;