From patchwork Fri May 3 09:16:54 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: 794367 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp642512wrr; Fri, 3 May 2024 02:18:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUliB6RUn1UwUslRlLNkEmHZ3dyJoscgq2lQEw57NOr5es/ANox2HnjSU+dHBn6aCt8sNfL/Q8RE5lAJA9PY4TP X-Google-Smtp-Source: AGHT+IFDbTCUfuY5fGh9i1nWyppeRtzCOv2CjZ5Wkzt/Qls8+IZuC2aVIcxZWOrmE6k4BHtSW/Xc X-Received: by 2002:a05:622a:164a:b0:43a:d84e:442b with SMTP id y10-20020a05622a164a00b0043ad84e442bmr2073815qtj.5.1714727917298; Fri, 03 May 2024 02:18:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714727917; cv=none; d=google.com; s=arc-20160816; b=NKETnUkjnymrWvlBDo4+NINE8t94TTzrCtuG9nVdSnAYqdMWozxXHlo8fvIryEeOS5 6uQz9UhSXM3pQyu1QVPRkztwWVOTDP75lDd27NJwc+sFsEAf/1lasAQ+zCfqKOw7dtR8 Apb8QjIjjl5vbNOh5ZWNYfEHhoasLZG+A4id+iFip+Hbk5zo9PxcMcyQLD37HCrYRJNv qm2nMhgqMYE7laArMGI0/V0U11C48GrAqf+iQITyuVQ7AHbuaWkdkMAg/1RhTUCcJjPG 2DK2PDYQPAxOud7hOKv6m4C4cU/HKi6osnPhDo26se6P86iUHps9AZcvn9bPHNMzeFyY Im0w== 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=1/nrhpPctNIFKbTVUUpB8iSj1laj4YlC2viiNoCursk=; fh=Wz5tv+q376m1WnuXLGinc1he4hBXyNhLC9q3oZt2ig0=; b=j+iw9JTNZiv/OyfHxKTCXiC79mcXioi4bJlAkj7kyEJeahbrk1Fqhitn3pNvT6IO3f rt3CrtnNGuesLiVYAAZRgn7H51xYfP43J82Pb6cKRRUSndDso8XN5mGXjNiVhEPHN0s4 ZeLgoKRvIV8e5kh/EKP0fRqaMS9BmuW+vYIHzQBZJUGWlFw4YyRI+HLa+yq+TEdAmBCT KoQWbGgEAA7/XL3PCxOxrn396wzctERJFkircHZlujHCeo59gQJqbjyiptYPp7aihV5C F5fERnGVISZit4UStFodgLyrEEUD2NvV7wb3VCkeIBc2MreEVwr5tLziUL31+gapj674 B20g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CWddUIEs; 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 8-20020ac85908000000b0043af86e7fb0si2980756qty.205.2024.05.03.02.18.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 02:18: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=CWddUIEs; 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 1s2p2b-0001h6-6O; Fri, 03 May 2024 05:17:17 -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 1s2p2Z-0001gr-FI for qemu-devel@nongnu.org; Fri, 03 May 2024 05:17:15 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2p2X-0003ZV-Ir for qemu-devel@nongnu.org; Fri, 03 May 2024 05:17:15 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-41bab13ca4eso47913325e9.1 for ; Fri, 03 May 2024 02:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714727831; x=1715332631; 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=1/nrhpPctNIFKbTVUUpB8iSj1laj4YlC2viiNoCursk=; b=CWddUIEsDjkjJn/C7tFITvsJvhbVTwmpRy1MdbpZMX19W5vghItn59iOjZjF0O3s7Q ihIfCX8PSPvTkQkNCNEARSWIXKEsM4ik8A01UoGSslC85CY6KYiTtZhpz+Nrbo+bfTF1 OMpIKTVl0lBsHk6uVyaOCmbp49DtSJ0lMfAe34NE/3nQqM3qO+wG0QjW6wK2aU311ocM 3pBVHQW+1V4ZlYbxxPGMJLrbb8MabJtupV4m3msCDMiLnWr92d+/w2nclKNpvp14f8xV eaKW9vc3vakyVZDH2S2siwvQfNbSvbKUCZT4lspF4MOB1XcFFE6uRCerdGsBHhv2ceDI EQYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714727831; x=1715332631; 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=1/nrhpPctNIFKbTVUUpB8iSj1laj4YlC2viiNoCursk=; b=tP8mBrfFxzKcRy3rHtvn3fAo6Svn4bbL5NpsiLCydSkzsnXiQBkYmKi6sO8cy5E1aW vp/GbxeYFsHD7H0akF256/GYcDOy4i/jXm3OkKvf+3pYC//Pxh4W8smxOhekFzMwtRsQ C6ywcrlh8sEbQHzNzLs1g/GQ5eY7jrlLhRcPkY/WZDCwkNy2qi5dNI+fuu61OnWocyQa oajlYpFRyAFBM6H0XYJzxweJ5S4cC/PIDr6UPDTktOHBvCL+Jua2Td1qiSyKVr8TSm8R Sc+Y+ii6wBg0ntUPfDFL6NnaE0j1avLjknM/kfp5LEg9ag9/hb4CJbnFWgPINKRdq65Q Z4Iw== X-Gm-Message-State: AOJu0Yz2Iy2IrndwZYo5ow63Nxe5ghlRmZCW6Gj5TEIaH5dn3OLfJ9oX DaJjDaZ2jOlKYbTaA5qqYjkZKbeo364FoiTqP2ChpdKfnEh/U+kQpVBJT8VNTnumif1jia1AbuJ o X-Received: by 2002:a05:600c:4505:b0:41a:a08f:2696 with SMTP id t5-20020a05600c450500b0041aa08f2696mr1765123wmo.12.1714727831576; Fri, 03 May 2024 02:17:11 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id t1-20020a05600001c100b0034e0a3a9e14sm3273731wrx.75.2024.05.03.02.17.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 02:17:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Warner Losh , Paolo Bonzini , Laurent Vivier , Riku Voipio , Kyle Evans , Ilya Leoshkevich , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 2/5] accel/tcg: Move system emulation files under sysemu/ subdirectory Date: Fri, 3 May 2024 11:16:54 +0200 Message-ID: <20240503091657.26468-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503091657.26468-1-philmd@linaro.org> References: <20240503091657.26468-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 | 14 ++------------ accel/tcg/sysemu/meson.build | 11 +++++++++++ 12 files changed, 15 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 f40959436e..8d263a71cd 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -20,19 +20,9 @@ if get_option('plugins') specific_ss.add(files('plugin-gen.c')) endif -specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files( +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files( # SOFTMMU 'cputlb.c', 'watchpoint.c', )) -system_ss.add(files( - 'icount-common.c', - 'monitor.c', -)) - -tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files( - 'tcg-accel-ops.c', - 'tcg-accel-ops-mttcg.c', - 'tcg-accel-ops-icount.c', - 'tcg-accel-ops-rr.c', -)) +subdir('sysemu') diff --git a/accel/tcg/sysemu/meson.build b/accel/tcg/sysemu/meson.build new file mode 100644 index 0000000000..d0b4939ba9 --- /dev/null +++ b/accel/tcg/sysemu/meson.build @@ -0,0 +1,11 @@ +system_ss.add(files( + 'icount-common.c', + 'monitor.c', +)) + +tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files( + 'tcg-accel-ops.c', + 'tcg-accel-ops-mttcg.c', + 'tcg-accel-ops-icount.c', + 'tcg-accel-ops-rr.c', +))