From patchwork Fri May 3 12:52:02 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: 794380 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp718106wrr; Fri, 3 May 2024 05:53:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsFiw3vtod26ArzPJw493nDFLFII6CrSHIf7+0xF2+Sv2nfO5dJ9dj7tJ5INLYxrQZJRhKvFYBBoiwmFWk/vu3 X-Google-Smtp-Source: AGHT+IFgeLgMdQ+I/t170PGpLk7JJpBWO+1+uxBtS2c1lLRGnpqznKP1LI4KcJ/3drZPQ0TGpt5W X-Received: by 2002:a05:620a:4149:b0:790:9dee:5ee5 with SMTP id k9-20020a05620a414900b007909dee5ee5mr3153917qko.2.1714740788519; Fri, 03 May 2024 05:53:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714740788; cv=none; d=google.com; s=arc-20160816; b=MXtLkXlp/L8G05f8Hb1+tsVXHbdPPKDKbS/nuZp7a86Y+peovsB2ZiLNB5/PvMPBqp OF55lEhPWCPajO9wFDjZ7nxqNIsxQIvODWrtMhE0pyO1OC4BcKkwqEjrwIBfMpsqagQo qX2F8TnJS2T6Etj7MHemtf9z6RYYMvBJHXWxfsmRfohYgW3D+dBKaDDoyw4AYXVv36bU 1wVWIBF0pUpkrNk8efq8nKUrIqqUMDYzoo1dtHLMYKjJJSlUPy96ej1Go5o/QXdSXpqn AVbySmy+JRlg0SiRV006Ao6oXdeFOtnFfUr8cWuL37FVWfrSHecW7SKhcNDY4LeyLFv9 MQag== 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=ED+XYfvia/D/wqYKfRWUzlTd4pH/F9dBy4hK44N8rGo=; fh=2k/dHyV7nYZf8MJ4h4eQuAubpyV46hmYX/dmtjGuxl8=; b=JT1uaevCMr4oNBWvZBKweD5yOS3HXkss2g2M7VmDzXQ8esfN3/P0JApHy7EM/cCQRJ osz68LSU1VSSaHPh8tfFU7ZGw/EELPmhBB8519JP6bH6dmPCaH4WIaYYW2zjMXzZsr0b zQw6wKrkK2iu9HMSM/0ttralXlbV6Z462YN7iqMqkj5gt5lSKJsrKzr1I4SwxFdwA2Rt f/Pl/SY3jruInNRR0BXEEWGWz6NEgGh+r2sm9YKgGb1MgHlds9Df3UZP09/KyLWiC+K2 nIb+WP6+aaHzeQp1NA6ev9OSP9QsTb6T4I603vWNI/6gfMbGAC5luhdozBfBej4QwA9y JjYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zeHGQLJh; 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 j23-20020a37ef17000000b0078ec66f3fcfsi2993971qkk.631.2024.05.03.05.53.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 05:53:08 -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=zeHGQLJh; 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 1s2sOn-0001Rl-U5; Fri, 03 May 2024 08:52:25 -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 1s2sOe-0001Qw-6C for qemu-devel@nongnu.org; Fri, 03 May 2024 08:52:16 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2sOX-00062F-60 for qemu-devel@nongnu.org; Fri, 03 May 2024 08:52:15 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-572babec735so2287071a12.0 for ; Fri, 03 May 2024 05:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714740725; x=1715345525; 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=ED+XYfvia/D/wqYKfRWUzlTd4pH/F9dBy4hK44N8rGo=; b=zeHGQLJhK9qIs27hSHrcs6KjM6QiAm2VDsJwidh1xFZmoyNbPWJivbtpV1ck4/bnbZ ledH6iVsFGp4PeDMfoQ8gybpQ1jDoNXcoTFDY5i6/RQnM667VDwW0w/MzDUgjliyqr3k WmaLWXMhl8pzN0AZGh0/gfRmSlxdynCupHB8Ujg9r21v/1P8v+HtqXr6mVBvxgqQ5u41 764TOAiBHCW4MRkNBVGBCgYPJpI38V4TEnuS36YsuokX4+NtCvCVXw+HlqHS7ndnzNzP LUNC6f22merTL1A82JRwWz2x/cb2c+vLClvSyKDR3/QH0meV8Hrdc1bmBGfsVCcqyBNF N3XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714740725; x=1715345525; 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=ED+XYfvia/D/wqYKfRWUzlTd4pH/F9dBy4hK44N8rGo=; b=f3qYMA0r8POjIasQGwK8NnijsjlEm6v0w+cuqbRdj1n8Ds9FOSpXtJKQ9FLKgnOs+L y2+XIzCyGlDgF9XSL3c+Fpj1ER6V7K0958aN8LKVEOMLPGOZqlHL2oyXp/HswZMd27Nt 2uHV/cipxdrY9kZS3NECdzo4XuXn9+KeJx32ZWPLaEXdfuJ60q+TmRYPNC1OJ5l+AUUq tVx6hx27oTGGL82px8BNR6Qq1PTvDmWL1GXX7i2Mv1BoTvK8Vp2KhmAkcWA2xClGQXP7 /ppDVUoSeZ66Dv6Gx+Bx+blCIo5opTnYKpagrVJHKpoYn5qB0v263zO2Kpe49s2rvocb cKjQ== X-Gm-Message-State: AOJu0YxiWDoPOCBw8WDw1ixRrGLbUKPGWeAJNHYGVtzk+gFAKBDpQl+M xkUOCyhZ8rAwv/zbzXjuOzuR+dnWBxbis2PQ29JFUbXlMAW7h88JiYlt2vnxl2GEQW+kIQN8XvV 5 X-Received: by 2002:a17:906:f754:b0:a58:f186:229 with SMTP id jp20-20020a170906f75400b00a58f1860229mr2187674ejb.0.1714740725306; Fri, 03 May 2024 05:52:05 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id x19-20020a170906135300b00a599e418208sm95025ejb.9.2024.05.03.05.52.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 05:52:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier , Warner Losh , Riku Voipio , Kyle Evans , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH] exec/user: Move 'abitypes.h' from 'exec/user' to 'user' Date: Fri, 3 May 2024 14:52:02 +0200 Message-ID: <20240503125202.35667-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::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.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, T_SPF_TEMPERROR=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 Keep all user emulation headers under the same user/ directory. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- Forgot to include this patch in "exec: Rework around CPUState user fields" https://lore.kernel.org/qemu-devel/20240428221450.26460-1-philmd@linaro.org/ --- bsd-user/qemu.h | 2 +- include/exec/cpu-all.h | 2 +- include/exec/user/thunk.h | 2 +- include/{exec => }/user/abitypes.h | 4 ++-- include/user/syscall-trace.h | 2 +- linux-user/qemu.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename include/{exec => }/user/abitypes.h (97%) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 8629f0dcde..a0c1ad7efa 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -22,7 +22,7 @@ #include "exec/cpu_ldst.h" #include "exec/exec-all.h" -#include "exec/user/abitypes.h" +#include "user/abitypes.h" extern char **environ; diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e75ec13cd0..032c6d990e 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -64,7 +64,7 @@ /* MMU memory access macros */ #if defined(CONFIG_USER_ONLY) -#include "exec/user/abitypes.h" +#include "user/abitypes.h" /* * If non-zero, the guest virtual address space is a contiguous subset diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h index 2ebfecf58e..9f35c888f9 100644 --- a/include/exec/user/thunk.h +++ b/include/exec/user/thunk.h @@ -21,7 +21,7 @@ #define THUNK_H #include "cpu.h" -#include "exec/user/abitypes.h" +#include "user/abitypes.h" /* types enums definitions */ diff --git a/include/exec/user/abitypes.h b/include/user/abitypes.h similarity index 97% rename from include/exec/user/abitypes.h rename to include/user/abitypes.h index 3ec1969368..5c9a955631 100644 --- a/include/exec/user/abitypes.h +++ b/include/user/abitypes.h @@ -1,5 +1,5 @@ -#ifndef EXEC_USER_ABITYPES_H -#define EXEC_USER_ABITYPES_H +#ifndef USER_ABITYPES_H +#define USER_ABITYPES_H #ifndef CONFIG_USER_ONLY #error Cannot include this header from system emulation diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h index b48b2b2d0a..9bd7ca19c8 100644 --- a/include/user/syscall-trace.h +++ b/include/user/syscall-trace.h @@ -10,7 +10,7 @@ #ifndef SYSCALL_TRACE_H #define SYSCALL_TRACE_H -#include "exec/user/abitypes.h" +#include "user/abitypes.h" #include "gdbstub/user.h" #include "qemu/plugin.h" #include "trace/trace-root.h" diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 4777856b52..263f445ff1 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -4,7 +4,7 @@ #include "cpu.h" #include "exec/cpu_ldst.h" -#include "exec/user/abitypes.h" +#include "user/abitypes.h" #include "syscall_defs.h" #include "target_syscall.h"