From patchwork Wed May 31 19:48:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 687291 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1441588wru; Wed, 31 May 2023 12:48:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ73lPsJMJmiOVs6a2N1zj/FqN0C6/GUFSx89fDVN+zvVC0tPpmn3Oz9D6CZd6guuVMScJH+ X-Received: by 2002:a05:620a:2541:b0:75b:23a0:d9e9 with SMTP id s1-20020a05620a254100b0075b23a0d9e9mr6946110qko.63.1685562530624; Wed, 31 May 2023 12:48:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685562530; cv=none; d=google.com; s=arc-20160816; b=FQCe2mRzelGGwsg+4fHldfmYRAK6RUSbKLMurnPyegkZ5rOFBZDwh3D3dpZJg5Inww PY6mCIrRnwyAWDCIQekF7eYdq6f2ea5kb3k+bsxx/CD0mrtBwIATwuYDMJQwaCyqzxU5 cvPA1tHsse5ULic/0hmt52IsPyyJmq9bMU2d3ZHExdmGzvVd4H7cFW6GPYMieG8WYKwS JfURQc3IIf5Bbqs7q+xyf4zZCJqQLvHmidqspgMhD8aFMnRkUvEk7Ozi7JwW8KMvdVia N7UW8m5WG3shvH5XfMIavxB0G4lnbTzBLPs0gT/WwNgjJbS+Y2FtC1glLWviTS3BLkby stQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:sender:errors-to:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to:delivered-to:dkim-signature; bh=c+XyfxTZMzK3ja4GbAtJLCIzXpCGwY8IXwOAZg5IFGI=; b=RfdLBQSfACwPkZ6yUMk2RmiHXqwqZm1Oo5C6zLSvBWPiDrWOKIQS+kg4WkjVIs4DpF PsQWcvfTKuI0iAWjOgvezLi3oloGzikU/LO1IFO3VLI6gnZV1E4Nm/YC5r1o2Q3S4fxO OvyfgvlsbPD6SzGPfZz4Qy2QnBPPZCXmfDWbu789MfbXKTFxQj7dyfxJFkO6ohZmk5mb ZKWoOw1WWK2Pgq3uKO24MwcqhRHSR2LiCG2Pz1EpRFDeokd7jVpzBQ1bBQV2afRL3vbc RbE6NUZxR00LrZW42uIc6hA8tgKWwcGlWWRwDl+ZWQZAMjTRwzf40H0a2NiDfMwE3nRi 7huA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BaGIJV2c; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id m23-20020ae9e717000000b0071b2303a52csi8546778qka.752.2023.05.31.12.48.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 12:48:50 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BaGIJV2c; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685562530; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=c+XyfxTZMzK3ja4GbAtJLCIzXpCGwY8IXwOAZg5IFGI=; b=BaGIJV2cHfXxWvePriqTwKntGZliXibuiwhIsRIdrzacOI1IL+VTzNI2gNP4ON85JqO5qQ xo2Gq5nLCxbP8nsIt1Zvbtk8wddE+8hrZkVwXTqHYv4ZjxldQgLRuC+hQogk883eCpr5Wi 5iFT3nu99iy1MjYRuEcr5VKwv/1OHJw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-136-bUvqo0UmPC-mushz5nijag-1; Wed, 31 May 2023 15:48:48 -0400 X-MC-Unique: bUvqo0UmPC-mushz5nijag-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D52358037AD; Wed, 31 May 2023 19:48:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF6D9112132D; Wed, 31 May 2023 19:48:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 921951946A42; Wed, 31 May 2023 19:48:44 +0000 (UTC) X-Original-To: libvir-list@listman.corp.redhat.com Delivered-To: libvir-list@listman.corp.redhat.com Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 05D7819465B1 for ; Wed, 31 May 2023 19:48:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DA9F1140E966; Wed, 31 May 2023 19:48:43 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from localhost (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F43D140E965; Wed, 31 May 2023 19:48:42 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 10/11] hw/9pfs: use qemu_xxhash4 Date: Wed, 31 May 2023 15:48:14 -0400 Message-Id: <20230531194815.1508961-11-stefanha@redhat.com> In-Reply-To: <20230531194815.1508961-1-stefanha@redhat.com> References: <20230531194815.1508961-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , libvir-list@redhat.com, Kyle Evans , Riku Voipio , Richard Henderson , Greg Kurz , Markus Armbruster , Yanan Wang , Stefan Hajnoczi , Michael Roth , Paolo Bonzini , Christian Schoenebeck , Eric Blake , Warner Losh , Richard Henderson Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com From: Alex Bennée 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: 20230526165401.574474-11-alex.bennee@linaro.org Message-Id: <20230524133952.3971948-10-alex.bennee@linaro.org> Signed-off-by: Stefan Hajnoczi --- 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)