From patchwork Thu Jun 6 10:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 801980 Delivered-To: patch@linaro.org Received: by 2002:adf:f147:0:b0:35b:5a80:51b4 with SMTP id y7csp222748wro; Thu, 6 Jun 2024 03:30:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX/X6bYi8qHzgvSpwx81rOt2r80+FVpNHz29R10ETluCdQQ5A19eIfymxMBeZQfebwPIGgDac0ITvKd+qQ28ew7 X-Google-Smtp-Source: AGHT+IEtn+55w8K6N9gFQk7SYYYTr2wg3HXtRLvSCjPBpkiFqsdoRSDirUzVHQN4DWLhR7p0fpmc X-Received: by 2002:a05:622a:1a9b:b0:43e:26c1:1244 with SMTP id d75a77b69052e-4402b69960bmr52078881cf.50.1717669858033; Thu, 06 Jun 2024 03:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717669858; cv=none; d=google.com; s=arc-20160816; b=QRdhVAfOnPx2HS33tFvbgh9RDr/eM0q5lfqkAkhrtdit35y92ppORYA+NopEU2Mwml DTMgksIFfZrNf24ZFeI325XIgrXiXYNU+Qe6tcaugQJCbAIt4q+Be/zqBxU1sfrqk7ro oaBvX5nUJ2IF2sfFR1/Q1uPV9uZpEU5RjgA6f/oIIQfppYzrPe8v+BW4ItWFTDFqfhje nIdiwleVYf08Qv7Jpw08XWd81rFSG2tDa+Xc+TMg9jcD+pAnfvu+/jYL2GFsOwWuVG9T HJCy+oe+XBteu++W6RH1JJrEZ7tlWyLdm/6ExAyj81wpqs3RMJKNwfDUxWHjrLOVkDO9 2w1A== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=BWK/EfN701oM3pgWDTSDo41JLi2OHCRROtt96Imm5fI=; fh=ObnV8x7yIXxwZiWLp/MLUAGn6nUw4uZgIu4oJ2xO10c=; b=yguEUyuyiVqSJ6S7kv+deFvWzI4q+jX4oX63wNyI5mdIcPQaC3zEtl6vgwHmXw6lBy wGUVJglykxlmoCKzrJPLdbm75PpBbsuIbaFdmMC1lzYnksx2XimixooSGNtAKfg7Wgk/ tqFyAv+rbesLeRwirYK+K0nosh4V8tzxFMkjV7D6zgzrVnc50VpQXn18gRWPhifN3HO6 AXKrZuZt+wpN0scHtNzupdpYSGez+jFYQ92zNRoY5R6P2Y4czb5AcnE6aPq2ikpt0oE/ Z93/s75LvwoA4aFdCesISO6r5aOEvbwVjvS1uw/qR1CS8JI1ZInowjMwwKGRFGpNIZgC ZdQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K3HSb3SA; 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 d75a77b69052e-44038a6e0aesi13124201cf.161.2024.06.06.03.30.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Jun 2024 03:30:58 -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=K3HSb3SA; 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 1sFAOE-0000VF-3q; Thu, 06 Jun 2024 06:30:38 -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 1sFAOB-0000UO-UY for qemu-devel@nongnu.org; Thu, 06 Jun 2024 06:30:36 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sFAO8-00013n-SS for qemu-devel@nongnu.org; Thu, 06 Jun 2024 06:30:35 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4215ac379fdso8194145e9.3 for ; Thu, 06 Jun 2024 03:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717669830; x=1718274630; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BWK/EfN701oM3pgWDTSDo41JLi2OHCRROtt96Imm5fI=; b=K3HSb3SAqUjD85L/oKw/1J69T+Bsq4XZ9/p07H9ZMvmcAfd8ycHLZn+iy/yO7syuKp 3oC+VO+FDT3UUWUG4GDkMpdNkdaxqf9TI/RQetL8Vun/gXQ4i6qD/hNp92VcmEGUcS2c HESoe4ZmG0ESMR2ju/Tq18sUgxWUAAFQ+iMpR8a/D5JDMtlnEq57cFD/3i78LW1QKuZz Y140Um7s8ZbMIQlj5Z/XmMaEawFnmi8ePVyJkEkaR+/i8GtkbfmpiBwBs2MzLIMmT97Y G/aBf+Q4frb3Psd8cqPZHLz6kG/h6JKCy1JroEPpGxl5HW7sANfsf7UARhoH0cRZTyna zPyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717669830; x=1718274630; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BWK/EfN701oM3pgWDTSDo41JLi2OHCRROtt96Imm5fI=; b=B08EycMm0GYsc8pPMeI4qycbw5cqIVUFKhpkOgWfcQOeFSzug77nsdUXoMf5sG8wjq eTnBcntxotN2ECay5/MKSF8yfh+pzKCfLfbuVzoiYgq/Xs937waKpuaO5zSV/TynGmOO MlMprERTmF7SHUW1hsQavQA0bFDZfIp5vDcbd5g/iPXlEiNUk7BloYHY9H9cWHwM4b8Y 9nczwxOO6RCAXgpKEP4l9AhYGFa3+SEb8cy6NgY2elfjip6ZtRpdS4nDc7qaB++FOibs RXPDthoeIWdyoj40eaJJLgcceWuKOmaB/qPFiJXhrurX5RwlrLLlol9aGneWIZXWPdE7 YoOQ== X-Gm-Message-State: AOJu0YznF+bxYPu0lYQPX/7gZJnx3+to295i993KPXqNaE0AxpXVlWEF 2dFfSHEMNibYlqQWeHVv/JTQt88fPep/hJ4Zntexib5x3exI2aXp2vwZRNL4yY/zUJUVHsytVWv Fc9M= X-Received: by 2002:a7b:c4d0:0:b0:41f:e959:9053 with SMTP id 5b1f17b1804b1-4215634ddc4mr37601455e9.38.1717669829738; Thu, 06 Jun 2024 03:30:29 -0700 (PDT) Received: from localhost.localdomain (94.red-88-29-105.staticip.rima-tde.net. [88.29.105.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2a6225sm16963035e9.25.2024.06.06.03.30.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 06 Jun 2024 03:30:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Thomas Huth , Mark Cave-Ayland , David Hildenbrand , Ilya Leoshkevich , Richard Henderson , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH] target/s390x: Fix tracing header path in TCG mem_helper.c Date: Thu, 6 Jun 2024 12:30:26 +0200 Message-ID: <20240606103026.78448-1-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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=unavailable 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 Commit c9274b6bf0 ("target/s390x: start moving TCG-only code to tcg/") moved mem_helper.c, but the trace-events file is still in the parent directory, so is the generated trace.h. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Ilya Leoshkevich --- Ideally we should only use trace events from current directory. --- target/s390x/tcg/mem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 6a308c5553..1fb6cbb6cf 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -30,7 +30,7 @@ #include "hw/core/tcg-cpu-ops.h" #include "qemu/int128.h" #include "qemu/atomic128.h" -#include "trace.h" +#include "../trace.h" #if !defined(CONFIG_USER_ONLY) #include "hw/s390x/storage-keys.h"