From patchwork Fri May 5 15:53:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 679308 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp437946wrs; Fri, 5 May 2023 08:54:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4NFu+7P5C/woyltSMOf3BkSnNnfAH/YNeaWXRLrgs5vXyGukAH+a/40DD/jQfzg578am5t X-Received: by 2002:ac8:5708:0:b0:3ef:58ac:82f4 with SMTP id 8-20020ac85708000000b003ef58ac82f4mr2820735qtw.38.1683302080937; Fri, 05 May 2023 08:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683302080; cv=none; d=google.com; s=arc-20160816; b=tYUB0WMW4AzA82tQTmE+7yiKuUXr/TDlK1J9uyfcpBMkylkFVHZzoTO8g7xqNiEOzb +l6R8e34o4NdKgBZG/cmecdlvkUFoXU6YxiX8qy1ea3YvPuO7f2CEEFC/8/g4fxw4/3L SitPGXAwC+/MD/irL3O/zGdW1//++iqbnMbzEyXK7WAuFL38wZacPPDuqMn5/qUdUEs7 yScn/id4+VkZOg36CMa6xBZnzOEKbVzopNfB9IvURZaY4LFw1hJuHUPgd24AaCVqTy/y W8k70xHWR7jeYSDuRqetiWIMSDaDc1glDszQhueCpsCKWQn2L7KrdsmdsthcKFPqRQv9 cSdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YSUPI0kqOU4QQe2wmlnWCjPR8JbP43bVwIlQhLoBovg=; b=lxjc/wsfoks7VMeJCehTgnZc3RKgL9RHJWWaVazXCGMkiP+gI3iuu81eIau9NsEGye +gBh2zr37lAtPuPqGJpugkxpvBw7uiVH2xLAPHYYgyVNUNxdhSTLG2TH1uFBG7kA6Eyc brSfmFv7Bq5cqwRXNGsWkMDP8lCW0Ezadro4TY5aHC/7gmDych8JkwXLeTNFGsEx0uMs HwFmMKKPUoJll8z3fRZBCetYNOclcozcotPWyhvyfyu2JlXp7yq9pUHOgl9+PLAA4sLs WdzsRs/+MC6PpM3dlIJ+D6vq2RByNX7r+cJogvkJUxqOoxq+pf+aTHe/6MdmhJAi6XrQ vlpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p+uuu3Od; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b13-20020ac85bcd000000b003e64495e392si692689qtb.248.2023.05.05.08.54.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 May 2023 08:54:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p+uuu3Od; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puxkj-0003OK-Je; Fri, 05 May 2023 11:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puxkg-0003Lz-Eq for qemu-devel@nongnu.org; Fri, 05 May 2023 11:53:46 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puxkd-0008Dn-4M for qemu-devel@nongnu.org; Fri, 05 May 2023 11:53:45 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-2f58125b957so1830062f8f.3 for ; Fri, 05 May 2023 08:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683302021; x=1685894021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YSUPI0kqOU4QQe2wmlnWCjPR8JbP43bVwIlQhLoBovg=; b=p+uuu3OdeqKErZ7XJLjeIihTSXE/arxZM29ZZYqimh2KpeO7I8/isig7BR3IRHXfwW nd8PhBkKfjauFwE2ME4um7FpKd9cubO8kYlly1ht40tiPBWn5J9+abLORCBu9/ko+HYP CZjRbBe8jF69plo0ZST+se36gUE/Sgd9VKO5GoWI45ik3pWlFnY0+abqje1gxe4C4w/w ZszX+VVWkJ9yL1W0akhys2Aduu6rMIn9Z1A59/FmuiPkI+OP1aUsvUFMWspz1deRCsfN kyv5UGMkXmtr2JgYeBqroKhrIw04i/VJdUxOns7j/gekaTSZPQcSA1XEUCRAWDPM8hmm nJTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683302021; x=1685894021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YSUPI0kqOU4QQe2wmlnWCjPR8JbP43bVwIlQhLoBovg=; b=Ogy0IyjZYfO22fdTw/xQVkGSW31P3ECqoF8NcPTdZdV8psrAHyLh1XrGrfy3W+pdya Ld/2D8UGCZxCKgNOTIPSVRF45XDHPsh8Oe4E1jL0fei1qWuCrS/0y/MH/vef5FutagwL UqtAZBVZwDG4bddWOQZltChmzymBd+ZsE7mNWwyVks7ds5vnXsRZIPhSZyTX5Jn8roEv 6mMAFXxkKXI2bTJzca7M/mGpyh7Qe+OwCbBMW7LRT1h1ITop5TrRrcnwLKn7nPfhtv04 Mt8nFolsoneFx0MbCZ8e5pF3WjMV8NNayD9VN/sojX18SD0WdZL7RoUffkJYEjaxWFws yX0g== X-Gm-Message-State: AC+VfDzjkrW1enF2RlgU6H+JIazZrhlN8ezLe6HGSNLI0J9LlqLcrjXc 6tAcP1BDARuKsWmBBUghnu3INg== X-Received: by 2002:a05:6000:1088:b0:306:3ec8:289d with SMTP id y8-20020a056000108800b003063ec8289dmr1846940wrw.46.1683302021596; Fri, 05 May 2023 08:53:41 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id q14-20020a7bce8e000000b003f182a10106sm8404594wmj.8.2023.05.05.08.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 08:53:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A703F1FFC4; Fri, 5 May 2023 16:53:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Christian Schoenebeck , Michael Roth , Eric Blake , Paolo Bonzini , Greg Kurz , Eduardo Habkost , Yanan Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , Warner Losh , Richard Henderson , Markus Armbruster , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 09/10] hw/9pfs: use qemu_xxhash4 Date: Fri, 5 May 2023 16:53:35 +0100 Message-Id: <20230505155336.137393-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505155336.137393-1-alex.bennee@linaro.org> References: <20230505155336.137393-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org No need to pass zeros as we have helpers that do that for us. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Christian Schoenebeck Reviewed-by: Stefan Hajnoczi Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230503091756.1453057-10-alex.bennee@linaro.org> --- v3 - remove stale comment --- hw/9pfs/9p.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 9621ec1341..991645adca 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -738,15 +738,14 @@ static VariLenAffix affixForIndex(uint64_t index) return invertAffix(&prefix); /* convert prefix to suffix */ } -/* creative abuse of tb_hash_func7, which is based on xxhash */ static uint32_t qpp_hash(QppEntry e) { - return qemu_xxhash7(e.ino_prefix, e.dev, 0, 0, 0); + return qemu_xxhash4(e.ino_prefix, e.dev); } static uint32_t qpf_hash(QpfEntry e) { - return qemu_xxhash7(e.ino, e.dev, 0, 0, 0); + return qemu_xxhash4(e.ino, e.dev); } static bool qpd_cmp_func(const void *obj, const void *userp)