From patchwork Fri May 3 12:34:53 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: 794378 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp711902wrr; Fri, 3 May 2024 05:36:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUbeW6oqF/lmgmpKzNIkoaVbEFwRgsI8Jd1yL6gAjH4knTYTg85UHZ+tToDM4UMuDos7DZll4ZmAXkX8KMJoL+ X-Google-Smtp-Source: AGHT+IEas/+VaaddjPzeaY87dZTmwD8px+H0bUfTD8Q6LVrY5QLdjE8g+IWV5sXWTCUkxSmjwVpr X-Received: by 2002:a05:6808:1492:b0:3c8:533d:3e9c with SMTP id e18-20020a056808149200b003c8533d3e9cmr3512685oiw.13.1714739797135; Fri, 03 May 2024 05:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714739797; cv=none; d=google.com; s=arc-20160816; b=rOdBjOSdRXYwMet62tGmvzmoltMeXzPhhA4g/mnNr1y9tyGUXXfmC9y3Fat32U5bQ3 1O0eFAlvzgMg6q28dcgA78Ic2InERdeIwou2y0EjDF+i+fmOA5zwP4OobMrSZrL6I5Ky HUIm4jC7L/iLNM0QnvJOGyY6d7N5tQHifm1sLJAtgGM1wpdo8QunHj+AmEANGzPH8jWY 7r74AKNyL0gTc7eSpS3z5KAR04m54EDr/hl8ggbwGcHxUE9zg2UNUZT1Fmm3y7alf2tC Qd6bAjtusz7IvEr+okX2e6i/e0CQbzKC+ZanZkTRoYRktZN7ShiiQggm3K7hC8A6Hayw uAEg== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tc6dayl5tulhCDU0tgAOjnRfAOhbRHX4YnefxEFrhW4=; fh=oECX/HpztodFaUv3pEO7ZivaceaHACgJ0hUyl/lk/I0=; b=QOibzQL81CAr3Dsj8GGzekwP8wO1eCfiIf3bLET1EexlOJiC+ww0FJ81sAp+3VuEeE +sXtZtMF7lYUjn4kVrwY66b9H+G3YoFFFpXJV2U1rekcdxwuaT/6COa0EVZV+6RG/ZUO 0Vn3xGDKLb1R92U1bLYf9zqs8kmZSY21FvFdM0AqLb/UXwB7ujtEKV4uDaTdSVQHvsIi 1iAVwRa4uqr3vCZoaxiN/Q7eX2o1JtOBXV85sT8vEU9vPafbH78byzi+bQXs1yqFsFAh FXCLlqa975Ck6pYNw49K2QRpZf+0Q8cou7+ulQm6GNWKV9ACq+7QFqYTxRkzZev1aYcT KZbw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MsI97ceG; 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 m3-20020a05622a118300b0043af8fa1328si3257335qtk.472.2024.05.03.05.36.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 05:36:37 -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=MsI97ceG; 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 1s2s8n-0007bw-0W; Fri, 03 May 2024 08:35:55 -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 1s2s8E-0007Fp-Bf for qemu-devel@nongnu.org; Fri, 03 May 2024 08:35:20 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2s8A-00030F-AA for qemu-devel@nongnu.org; Fri, 03 May 2024 08:35:17 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-41bca450fa3so48323325e9.2 for ; Fri, 03 May 2024 05:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714739712; x=1715344512; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tc6dayl5tulhCDU0tgAOjnRfAOhbRHX4YnefxEFrhW4=; b=MsI97ceGgamI3T8MQhU3M/m5VRsbHKtX2ONfnoWq8ADdjTGD+CaMGFCaVZGPyh+HPS USkTm8jJH7QIwGqIxAvTN+ZsaUFB9/txnD6LR4LdhgOUjouR4TPvfgb61ES7JYNTEJZ8 V0XWWRiT9DF4FKiy1zeXBYJ7Pw/tba56VlhQs4iPrF0d7Rph8VQWFdDSB6TBG8BT0Yv7 gAHGjZSfbtOGVyxJwBTWANeXqwMQcu2syVmbBbbxb4UtXHFO2gU0rv50+FY8POmeCbcu YgFAhhWCWBYgK1F5t1tB89qWBRMG64CKX/22bJvXwOoxH+juiIrwVyomfd86mRrpiRsK 1fBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714739712; x=1715344512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tc6dayl5tulhCDU0tgAOjnRfAOhbRHX4YnefxEFrhW4=; b=H9BFaHHlqrY5JK0/9V3IPeZZ0BBkEl9mWSwdgsTHrA6AvaC5EsQF2ewZlU3IDx76W7 HjamoK1o/nqhowvy/iPIxpHvjsdyfcBjwRYqFh7p12o72fDa4MUf5iRxkr0TUkMJpXXl 8P+7WJ+qcBoqOsNoxO6I6kiOrvgcjluRCZr+pfVpVJX488MWLhXhI5b8y05m0UOrW1So Bxy4G3Hst74ooEgrIKmeRQahNYI55Nj6wt0M8HbLLdLJHsUuzDcltLNbJmvUNfvdTuZA a/upHAqKQAq4XHCBXwrnfmJjcLJszN4NyJwGrd7h79zcK5tIct7hz3kw5AGdftG67MIl MvhA== X-Gm-Message-State: AOJu0YzklUFOPyjiYp1ngbt0yIobOWDnEetJ4QAAW5HNhspNfxru4N3v L/4oN2cLwYmKzJmpa4g34CL/MvcGDq1r6KDF34siY42w3v78Q0HbrfHw40JVayR7lT2OBplnGBF D X-Received: by 2002:a05:600c:46cb:b0:41b:d08d:dce4 with SMTP id q11-20020a05600c46cb00b0041bd08ddce4mr1919892wmo.5.1714739712282; Fri, 03 May 2024 05:35:12 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id f20-20020a05600c4e9400b0041b5500e438sm5504276wmq.23.2024.05.03.05.35.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 05:35:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Warner Losh , Richard Henderson , Kyle Evans , Ilya Leoshkevich , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/5] accel/tcg: Move system emulation files under sysemu/ subdirectory Date: Fri, 3 May 2024 14:34:53 +0200 Message-ID: <20240503123456.28866-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503123456.28866-1-philmd@linaro.org> References: <20240503123456.28866-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 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 Some files are specific to system emulation. Move them under their own sysemu/ directory. This might help to notice what is affected (user, system or both) when doing global refactors. Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/{ => sysemu}/tcg-accel-ops-icount.h | 0 accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.h | 0 accel/tcg/{ => sysemu}/tcg-accel-ops-rr.h | 0 accel/tcg/{ => sysemu}/tcg-accel-ops.h | 0 accel/tcg/{ => sysemu}/icount-common.c | 0 accel/tcg/{ => sysemu}/monitor.c | 4 ++-- accel/tcg/{ => sysemu}/tcg-accel-ops-icount.c | 0 accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.c | 0 accel/tcg/{ => sysemu}/tcg-accel-ops-rr.c | 0 accel/tcg/{ => sysemu}/tcg-accel-ops.c | 0 accel/tcg/meson.build | 12 ------------ accel/tcg/sysemu/meson.build | 11 +++++++++++ 12 files changed, 13 insertions(+), 14 deletions(-) rename accel/tcg/{ => sysemu}/tcg-accel-ops-icount.h (100%) rename accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.h (100%) rename accel/tcg/{ => sysemu}/tcg-accel-ops-rr.h (100%) rename accel/tcg/{ => sysemu}/tcg-accel-ops.h (100%) rename accel/tcg/{ => sysemu}/icount-common.c (100%) rename accel/tcg/{ => sysemu}/monitor.c (99%) rename accel/tcg/{ => sysemu}/tcg-accel-ops-icount.c (100%) rename accel/tcg/{ => sysemu}/tcg-accel-ops-mttcg.c (100%) rename accel/tcg/{ => sysemu}/tcg-accel-ops-rr.c (100%) rename accel/tcg/{ => sysemu}/tcg-accel-ops.c (100%) create mode 100644 accel/tcg/sysemu/meson.build diff --git a/accel/tcg/tcg-accel-ops-icount.h b/accel/tcg/sysemu/tcg-accel-ops-icount.h similarity index 100% rename from accel/tcg/tcg-accel-ops-icount.h rename to accel/tcg/sysemu/tcg-accel-ops-icount.h diff --git a/accel/tcg/tcg-accel-ops-mttcg.h b/accel/tcg/sysemu/tcg-accel-ops-mttcg.h similarity index 100% rename from accel/tcg/tcg-accel-ops-mttcg.h rename to accel/tcg/sysemu/tcg-accel-ops-mttcg.h diff --git a/accel/tcg/tcg-accel-ops-rr.h b/accel/tcg/sysemu/tcg-accel-ops-rr.h similarity index 100% rename from accel/tcg/tcg-accel-ops-rr.h rename to accel/tcg/sysemu/tcg-accel-ops-rr.h diff --git a/accel/tcg/tcg-accel-ops.h b/accel/tcg/sysemu/tcg-accel-ops.h similarity index 100% rename from accel/tcg/tcg-accel-ops.h rename to accel/tcg/sysemu/tcg-accel-ops.h diff --git a/accel/tcg/icount-common.c b/accel/tcg/sysemu/icount-common.c similarity index 100% rename from accel/tcg/icount-common.c rename to accel/tcg/sysemu/icount-common.c diff --git a/accel/tcg/monitor.c b/accel/tcg/sysemu/monitor.c similarity index 99% rename from accel/tcg/monitor.c rename to accel/tcg/sysemu/monitor.c index 093efe9714..620c18d267 100644 --- a/accel/tcg/monitor.c +++ b/accel/tcg/sysemu/monitor.c @@ -17,8 +17,8 @@ #include "sysemu/cpu-timers.h" #include "sysemu/tcg.h" #include "tcg/tcg.h" -#include "internal-common.h" -#include "tb-context.h" +#include "../internal-common.h" +#include "../tb-context.h" static void dump_drift_info(GString *buf) diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/sysemu/tcg-accel-ops-icount.c similarity index 100% rename from accel/tcg/tcg-accel-ops-icount.c rename to accel/tcg/sysemu/tcg-accel-ops-icount.c diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/sysemu/tcg-accel-ops-mttcg.c similarity index 100% rename from accel/tcg/tcg-accel-ops-mttcg.c rename to accel/tcg/sysemu/tcg-accel-ops-mttcg.c diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/sysemu/tcg-accel-ops-rr.c similarity index 100% rename from accel/tcg/tcg-accel-ops-rr.c rename to accel/tcg/sysemu/tcg-accel-ops-rr.c diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/sysemu/tcg-accel-ops.c similarity index 100% rename from accel/tcg/tcg-accel-ops.c rename to accel/tcg/sysemu/tcg-accel-ops.c diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 84826f043a..3539b0b799 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -24,16 +24,4 @@ softmmu_specific_ss.add(files( )) tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: softmmu_specific_ss) -system_ss.add(when: ['CONFIG_TCG'], if_true: files( - 'icount-common.c', - 'monitor.c', -)) - -tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( - 'tcg-accel-ops.c', - 'tcg-accel-ops-mttcg.c', - 'tcg-accel-ops-icount.c', - 'tcg-accel-ops-rr.c', -)) - specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) diff --git a/accel/tcg/sysemu/meson.build b/accel/tcg/sysemu/meson.build new file mode 100644 index 0000000000..5a97cabe7b --- /dev/null +++ b/accel/tcg/sysemu/meson.build @@ -0,0 +1,11 @@ +system_ss.add(when: ['CONFIG_TCG'], if_true: files( + 'icount-common.c', + 'monitor.c', +)) + +tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( + 'tcg-accel-ops.c', + 'tcg-accel-ops-mttcg.c', + 'tcg-accel-ops-icount.c', + 'tcg-accel-ops-rr.c', +))