From patchwork Fri May 3 12:25:23 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: 794372 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp707820wrr; Fri, 3 May 2024 05:27:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVL0fu3FRcCMMNDq5OvQUZI3WONLRPP6CyGGW/NPTGmQVk3As2R4SKK934Wf+0tmJKVfajkb4Al32UOvPJqoSh X-Google-Smtp-Source: AGHT+IHPR7G8T3FPM64qNy58h6rQH/y7R51PH5WVzEDGYg8snQYwNdziM+uqbs63t5uIhUtJ0L6H X-Received: by 2002:a05:6808:170e:b0:3c8:64d0:523f with SMTP id bc14-20020a056808170e00b003c864d0523fmr2822708oib.59.1714739220281; Fri, 03 May 2024 05:27:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714739220; cv=none; d=google.com; s=arc-20160816; b=WgKF0LdNourslYUDPeMHeBDvIUYXG/cSAzwvtgz6nwisEvNcUv7XOmqxoFxQ3Kz2va jzHXBToDec30PSmJaNs/xpz1tmLYnlaQeHLVGkm5dYdhcQ791LTDO2J1so96huKLjF+W nfJGV41HZEuJii9IezD6CHbgyDtYaCXkpyWqjJ2fkkjoNv9pkqDI/E1KdYNXSCom1OHq piNTgYYeliT2LFf39vyZeg/hhP5v824L6UeOEZ4cuC1KVESCH52VU0BlQDIoIr/Mk+3q Osz2aUoGsd8Tc0pVJxr9MdFja5u9xN2AP0ju8+HtfS57HAIm2zfzkLS3h9Yh8uRR+FSF RXbA== 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=CZ/5slWG25YGe7Sfq3Hc99Zz9GmHkCwksopYYuykw+4=; fh=SLdBWdVl4pOwq9we+/FCh5WeSKt0HqFXI7sxtbVu3fc=; b=gbUJqknky6Cvom3RTplAxJmGHZoXchI88xNTo8n/QfxKZ30K1B58G3lHNnrEcNWQqX vNrECSsbLurYwEYRPsj0QipWGEM+LJzyrQnJ+Rn/clQXcBNYkSEBRCddisUf9DKlnOEj 0R6ImUmLKJhWaDlAjYEgnFn+QTSYotMdteDP+MTI534Np5NEHJYJZBCOGwXC5duqv5mS I4ylJjge4g9c8Vp72RTEZzoLjkGyRtIrUavVR+fXyQUbrEmdMg+vUhqdMB3CKTCkoUZZ dfd9JFpRlBYrpGHmb1Ru430YOtXa3f0TowU46zHo+lh4S7ophEInB5lXHGp7V1NtX+bb FmYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=muHaCnIB; 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 o21-20020a05620a2a1500b0078edf1f4c40si3454461qkp.197.2024.05.03.05.27.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 05:27:00 -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=muHaCnIB; 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 1s2rz6-0006kk-5w; Fri, 03 May 2024 08:25:52 -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 1s2ryx-0006j1-B0 for qemu-devel@nongnu.org; Fri, 03 May 2024 08:25:44 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2rys-0000o1-Vt for qemu-devel@nongnu.org; Fri, 03 May 2024 08:25:43 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a599332afcbso109464666b.2 for ; Fri, 03 May 2024 05:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714739135; x=1715343935; 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=CZ/5slWG25YGe7Sfq3Hc99Zz9GmHkCwksopYYuykw+4=; b=muHaCnIBzvEkdsefcEZBJ9vldcxpEMJccATT6w+ug9kaG4a1UofrwandJhJeZbZ9S2 VxSJT3yFaOncAGxMT/sO8rx/GE3m5lnpzinalOVfxPLqxO8e5v+KB3mnUSHLgcIq7M2N DMtai937Itctu2SBfIqIzniETY+qr9iz82VR1J32r1NugqnrmCU8ChPnHIBV4Ff8bajM 2ImWG+rMIGk9kQ9Gap9ahhtKzpO3Q/WbdxXanXybq4YKLl6z/+6loQ1mX52ZjCnteQZH hsXzB61/0qidMY37oHEKmesX6r+ufgWQAt/LhQAXXvpEQ/HfjxjoAooiM7j01LHct5jP 7YZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714739135; x=1715343935; 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=CZ/5slWG25YGe7Sfq3Hc99Zz9GmHkCwksopYYuykw+4=; b=QdUcZppxxnI1MVFIQT3ie/+DWIaJ/LVb0DAUgEm6L+y/1WeMQUMbVKV/z6upfyzzKr OUPLuHy6LLN1Gmt3JbOLL06mwhOJvYgr9S6aDTpM03mmp5s39Xq+Nniqn//SIVDyvow6 Un+f7foLHaerZttl2GcRMbGADZ9kBnSldUc0w24T7nEgrT4sKrITQLZYxLyvx6n4twv5 7sM50NKwVm2i7VtxWMrmKU1xvGx/WGsejiBPDr5UZlOGdEz8SAYejBLr+m3WQNZS3S77 snwB5D1Jj4xS3Gk8N39NRVNQ3VKIivkFGBMzdD1rtUO7lQyJxMlfkidcP4yiA7S1UDuB c7bg== X-Gm-Message-State: AOJu0YwhEORSdmtmzRunfq57c1wFnHcTL1b+5KJzRZi5lpIkEkguYxGp U3daoLGaxPJFfdHsTBNUxRZi9XCnYrgwdjyUokb1Si586ls2dFvILYkK/f4mIKL8vNvJf/axMEd N X-Received: by 2002:a17:906:cf83:b0:a52:6e3b:fcf1 with SMTP id um3-20020a170906cf8300b00a526e3bfcf1mr1561615ejb.17.1714739135466; Fri, 03 May 2024 05:25:35 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id z21-20020a170906715500b00a599c8b6531sm161905ejj.178.2024.05.03.05.25.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 05:25:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Richard Henderson , Kyle Evans , Ilya Leoshkevich , Warner Losh , Paolo Bonzini , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/4] accel/tcg: Move system emulation files under sysemu/ subdirectory Date: Fri, 3 May 2024 14:25:23 +0200 Message-ID: <20240503122526.28312-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503122526.28312-1-philmd@linaro.org> References: <20240503122526.28312-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=philmd@linaro.org; helo=mail-ej1-x636.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 aef80de967..1b91f26a7f 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -18,19 +18,9 @@ if get_option('plugins') endif specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) -specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( # SoftMMU 'cputlb.c', 'watchpoint.c', )) -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', -)) +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', +))