From patchwork Fri Dec 14 03:19:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153729 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1605318ljp; Thu, 13 Dec 2018 19:37:46 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ulix1Blpf8NIY3tGTVfYq2ge8AHl5EgTuFb2HKBj8WWbWcyJwdqhmcocqXRR9+udWvc2ov X-Received: by 2002:a0c:df12:: with SMTP id g18mr1256895qvl.208.1544758666122; Thu, 13 Dec 2018 19:37:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544758666; cv=none; d=google.com; s=arc-20160816; b=RjvBy7xbDawNxsTp+qvODRl6umVqWUUnTMf+e1MPnd4VIQA0cIkna7aT1AVdb5sg+K 9tPpqtVMfG0vDxZadjJjzBuEGPOSYVjGsoe2I3IlyJCAooj6bh3hURhSuq4PriJ8BHzj C9Zdff0oXenYokm8DxzUjoMANmidBAq7MRkNoLf2yD6AW3/XuMVHjt2YqbNnKKhU3i4l toj77XO91ZICIwADK/y/H3zUXQjLUYhrfO7fCmNxRyCD1CJY+koQuD6wrxN0TJuUtjF0 jKPI+xQVqsu4eGS80jiQa1hF2caA4IziCO0szZSk9Qu22JHrZrhBVE/VtVQnSEh7AvuY cDaQ== 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=fYfPDJdmcbia2mx2N/9k4jE4drUlv426aZrfBqVQSJI=; b=TXBHZw3vK+PQINMju7dGp9zTAN90rs1glwxxLXyXTvJbRFWR1sDUXlfD5z0XpJpJLq UITc2rzKsd4wi+puasG5fB5pB1cwE8k+w4p/+InTIbdHDful8lpf5FZnA2QPith4Z1VJ UJkFdVS0MiT/SIWEA2VyPhXaS9oGy0T1/XujuDPNevPu781Fa3m/MjifHPfmtjy5RPGn OWOBYyfawz1hWNFfPKwzFwcuQm3Me/sTZyHpyWJSiDMIqSiHY6LKn/Z78Np5RySp7TFK XB4RV/D/dXKS4MZRvgYtS3pRakU07LEQp+iBfgcY8vWBRaD0NgaqO89h9P/i8I8QCcpi UAgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ASoItt2v; 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 p86si1473475qkl.254.2018.12.13.19.37.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 19:37:46 -0800 (PST) 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=ASoItt2v; 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]:59145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXeIL-0004LZ-J2 for patch@linaro.org; Thu, 13 Dec 2018 22:37:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe1D-0006IK-SX for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe1C-0007k9-Jw for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:03 -0500 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]:38262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe1C-0007hV-Bm for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:02 -0500 Received: by mail-oi1-x232.google.com with SMTP id a77so3480349oii.5 for ; Thu, 13 Dec 2018 19:20:02 -0800 (PST) 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=fYfPDJdmcbia2mx2N/9k4jE4drUlv426aZrfBqVQSJI=; b=ASoItt2voQ487B7/wovxdjlIrXfppnFerTo4ZO77d1XPweYreGhlF8QT7PXKidX8NX 6JGtUSZQgOCZU60/yJo5o6nvwF2jOvzMDJIa9+BFvefgpHeGcsSfLo9LEusoztyj8MFu J3LvyM0Qz+Wm6DOFnMf5yz0FzInmO7/z1pCjY= 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=fYfPDJdmcbia2mx2N/9k4jE4drUlv426aZrfBqVQSJI=; b=qBoAPbJnJj6ih9QOZIWoc7l2ixlKYj1DDV/XW7W0qUaPmWP4jQo6eYn5oVR2FqPamP +R9+UBL4WgdEz9HTrCFfvwIslWPVkJD21g5edaT/6ZYhcv5aYtjM+/9R2b12eWvA0aMB PucHPD4v3/BB2XKkxxSMgA7VmCpYGhKTQ0UrzatBBZeAeQmrsiId9tqW8kn+zNCv4NEx eexS5o/zMr/Cmjub+gmVpmPUIN5ZHCX6Y8pVVmU6QoQh8AEK/JiBZSh5T4qALb4haU1Y atFQBTvJ/AtXvQTU9NE4sCTSrPD2ExqAdXq3jvo7n7oR2Pfip7UCFXqL+1tXI74gQxu7 hHrQ== X-Gm-Message-State: AA+aEWaKEDyJyC4g+5zuLvO4KDO+5rCB8S8rLQCGjSwNxgNSJEVpIvxY 0YTmvla0b2toAmog2wcbDstiwedGvb/Qdg== X-Received: by 2002:aca:33c2:: with SMTP id z185mr857456oiz.4.1544757601180; Thu, 13 Dec 2018 19:20:01 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.20.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:20:00 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:19:22 -0600 Message-Id: <20181214031923.29527-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-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::232 Subject: [Qemu-devel] [PULL 31/32] include: move exec/tb-hash-xx.h to qemu/xxhash.h 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 --- include/exec/tb-hash.h | 2 +- include/{exec/tb-hash-xx.h => qemu/xxhash.h} | 6 +++--- tests/qht-bench.c | 2 +- util/qsp.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename include/{exec/tb-hash-xx.h => qemu/xxhash.h} (97%) -- 2.17.2 diff --git a/include/exec/tb-hash.h b/include/exec/tb-hash.h index 731ba4c272..4f3a37d927 100644 --- a/include/exec/tb-hash.h +++ b/include/exec/tb-hash.h @@ -20,7 +20,7 @@ #ifndef EXEC_TB_HASH_H #define EXEC_TB_HASH_H -#include "exec/tb-hash-xx.h" +#include "qemu/xxhash.h" #ifdef CONFIG_SOFTMMU diff --git a/include/exec/tb-hash-xx.h b/include/qemu/xxhash.h similarity index 97% rename from include/exec/tb-hash-xx.h rename to include/qemu/xxhash.h index 98ce4b628a..fe35dde328 100644 --- a/include/exec/tb-hash-xx.h +++ b/include/qemu/xxhash.h @@ -31,8 +31,8 @@ * - xxHash source repository : https://github.com/Cyan4973/xxHash */ -#ifndef EXEC_TB_HASH_XX_H -#define EXEC_TB_HASH_XX_H +#ifndef QEMU_XXHASH_H +#define QEMU_XXHASH_H #include "qemu/bitops.h" @@ -119,4 +119,4 @@ static inline uint32_t qemu_xxhash6(uint64_t ab, uint64_t cd, uint32_t e, return qemu_xxhash7(ab, cd, e, f, 0); } -#endif /* EXEC_TB_HASH_XX_H */ +#endif /* QEMU_XXHASH_H */ diff --git a/tests/qht-bench.c b/tests/qht-bench.c index 0278f4da04..ab4e708180 100644 --- a/tests/qht-bench.c +++ b/tests/qht-bench.c @@ -9,7 +9,7 @@ #include "qemu/atomic.h" #include "qemu/qht.h" #include "qemu/rcu.h" -#include "exec/tb-hash-xx.h" +#include "qemu/xxhash.h" struct thread_stats { size_t rd; diff --git a/util/qsp.c b/util/qsp.c index dc29c41fde..410f1ba004 100644 --- a/util/qsp.c +++ b/util/qsp.c @@ -61,7 +61,7 @@ #include "qemu/timer.h" #include "qemu/qht.h" #include "qemu/rcu.h" -#include "exec/tb-hash-xx.h" +#include "qemu/xxhash.h" enum QSPType { QSP_MUTEX,