From patchwork Thu Jun 1 15:06:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 687713 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp406869wru; Thu, 1 Jun 2023 08:08:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7lzKDIuAcwV0K1cWhicUIdOt7659J6pACdf4PrfVTGrjIhV9/W1hkiFureSpELAoMg8dLa X-Received: by 2002:a05:620a:8083:b0:75b:23a1:d863 with SMTP id ef3-20020a05620a808300b0075b23a1d863mr1933654qkb.37.1685632100008; Thu, 01 Jun 2023 08:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685632099; cv=none; d=google.com; s=arc-20160816; b=Fnu3d6t/WgM4Wii147ER+fM5oTIT5nN4Ekj+hi9p6nnTWdxR1sJ+A726UTkVj52z7/ 4pQFVQkErTqFMVkmHg81HuCEsmpB+19zaaKxv7YNh0D53qA/PzzS4QHiA4FpJVv6f8Qy X18MuMJU56ZGJppkjL99u6GiuVqv5gQ+ZhKYPSO/C5UgIaY0cvzJh+bR7+pBzskK3kHE 126L2xqOvPoFFsnoPCBIRNGfFeU4E7zFBiyfVSnXggMmGuswcBmXu+JMhHuiAUCy/lSF pEZxOZ15KPCvOSZquAhQxVWJ15Eh3B1PWks+lnjxZTFHeeox7DPSb3wnESOXQkJ0c3qW LLsA== 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=EhKEAbqMK9IkgfkEd1vkIAuiBwE240qcpTqX/QDw5j9uVWNxM4fp2xietx3DQLjNwj RD95aeygiS3XkvFcrjLm7nDJ4CqDoBCzxfMWPkNK9bWeO59d5//7F5gIDKXRjqKriDQ4 sj/HxCGH7DZiCjfmk6QuikuaV+kzd8iWbHfiamnf2/RUd/rPV0RutfLsf3YvhhrBTK8m eXdRGp1yiJkQLuLZGeTcXOBPynJI2mpC/1LDj5ee5B7icjylrRkm2YwUDyfyi78ivkyN +COBai4tK7YyHEvZwHmrwB8TJvBBRv2Z/OsRTT/pmpsQwFY5WP28vaQUkKR1wN/WOkMF FGVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZoJXhySt; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.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.129.124]) by mx.google.com with ESMTPS id o25-20020a05620a15d900b0074df1d28aadsi9738998qkm.688.2023.06.01.08.08.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 08:08:19 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZoJXhySt; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.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=1685632099; 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=ZoJXhyStSQox/0eebKzwB24BJIurUzirvULkSa61cxvTc/dp+vX55EHVDq6BE9ZHRiHSP5 8ZIeVRu3HOfNaLhEMOre9iA+kmYKRjtxLZ6httHnwl/sUWobibvHgW3sysgjfXYoTRPwMy Hrn3WwxMfTmQ1T5nk9EOXCjftHUqeAA= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-163-MtRwFGyEPeST9zEDMZp6hg-1; Thu, 01 Jun 2023 11:07:28 -0400 X-MC-Unique: MtRwFGyEPeST9zEDMZp6hg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDC6338288AB; Thu, 1 Jun 2023 15:07:14 +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 D58162166B27; Thu, 1 Jun 2023 15:07:14 +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 C70551946595; Thu, 1 Jun 2023 15:07:14 +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-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C264C194658C for ; Thu, 1 Jun 2023 15:07:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B3F7C2166B2A; Thu, 1 Jun 2023 15:07:13 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from localhost (unknown [10.39.194.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3510B2166B25; Thu, 1 Jun 2023 15:07:13 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 10/11] hw/9pfs: use qemu_xxhash4 Date: Thu, 1 Jun 2023 11:06:48 -0400 Message-Id: <20230601150649.1591095-11-stefanha@redhat.com> In-Reply-To: <20230601150649.1591095-1-stefanha@redhat.com> References: <20230601150649.1591095-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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 , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , libvir-list@redhat.com, Michael Roth , Riku Voipio , Christian Schoenebeck , Markus Armbruster , Greg Kurz , Yanan Wang , Marcel Apfelbaum , Kyle Evans , Paolo Bonzini , Richard Henderson , 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.6 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)