Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3299CCF9EA for ; Tue, 28 Oct 2025 23:50:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDtR1-0001vv-Rm; Tue, 28 Oct 2025 19:49:03 -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 1vDtQz-0001uc-2E for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:49:01 -0400 Received: from p-east1-cluster5-host8-snip4-1.eps.apple.com ([57.103.89.202] helo=outbound.ci.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDtQe-0004lJ-U5 for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:48:58 -0400 Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-20-percent-0 (Postfix) with ESMTPS id C66A818034C3; Tue, 28 Oct 2025 23:48:22 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=+vx3umYoS3NDGSTtVzJpT+/HRoR3l2TnMKGFOX8C9/8=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=DErFVrDmhYWZu684tpBnWWNGRy+xQHex1fWM/h+gPq0s0VXrxewJatGuwp5Z2RUqCiGrAh6YwPyc76hojn0iXnZJwDgjQU/nCHtzjqKUdtO69flgBPt8DzvMNS1CzrtHHLw/LTZE/SJ+glNdPiSniQHYjmKI/Qb6Kh4Cj+vkEajK16OfVQNvdZbjMhOKxDi5sy+NEmH6tdWgEdj3UlWtDslACQ7amAS3oarf+0Zh2+dEBU80da+ll/tg4ssVO3ZmZhfmPMexPhtr85gLMINA8Ivf3maPn7gXugn4+R2yi4bpQlQ0WDZtJ31KqsLsZPUma6Rl1FiMyLoIP8eL9Sibqw== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-20-percent-0 (Postfix) with ESMTPSA id A7CB718034DA; Tue, 28 Oct 2025 23:48:20 +0000 (UTC) From: Mohamed Mediouni To: mohamed@unpredictable.fr, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Graf , Phil Dennis-Jordan , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Richard Henderson , Pedro Barbuda , Pierrick Bouvier Subject: [PATCH v9 06/27] whpx: Move around files before introducing AArch64 support Date: Wed, 29 Oct 2025 00:47:36 +0100 Message-ID: <20251028234757.39609-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251028234757.39609-1-mohamed@unpredictable.fr> References: <20251028234757.39609-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: 6bqLBGFMl-5ozrQa8Xb3syXD9Shsmtmf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI4MDIwMiBTYWx0ZWRfX3e5HcbaPj+t2 vO2e6I+xBAItZgfDflJua8jfYxPau8WJkoFL1pnPgMF85xqOI9s81IgDBuRXvbRRU4HctsRkdcc P6jPMvxajO3+qygvyHih1HenJNKW2KDzqTu3yAK1MJmvc4L4HS76eE3THiSaJPftr1IVTXTHVCg NE4SJ3DszNO0xW+Uzgu+x/c8i3AD+w6Qcrqlw1Tma48zcT8iMxeCUTAcosqRrOTLLD1fg9vUbXQ UKF810cta70pwvtVhZk0AEjHvxreIuo5E5gHHG1iqqAlzBZL+LXsfN0q+kkC2BK6eC0bDBL8E= X-Proofpoint-ORIG-GUID: 6bqLBGFMl-5ozrQa8Xb3syXD9Shsmtmf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-28_09,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 adultscore=0 mlxscore=0 clxscore=1030 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510280202 X-JNJ: AAAAAAABFMi6CsrbpSrPYSpG5KdesK9cvtGH8V13amUPPtz72C+yabilr+GB5rOZgBN8SAA0xgWwfV7Dw8u4mo0NHaW6p0vYYWFB5ZwEXHT4F96QqfADs7k7ackcXTAuAuCfbvv4e2tX0K6k0nXxrpJ93qe264kzWSWXpoHF+06Kpp9//XtoauKNPFmQ8qykHgTBO4l9mrxsjKMuHRNCQpxYqHYklBX2j0ypBXb79TcKu66xozC+4JhBxJaO74PR5D6/IB0Hnn/RBzjBORX+DoKt7EXhgyYvNfx7nsjP54D2XtY7QKFam79dTSl1h+MYGbVjk7m1/nBk5fTGrcEEoeQpcCPZpdEDA4BhzW3qGMNTEFfFT8s+d14D1wBblhKZ7R4YgBc300wPSwEh6QZvk56ycABTqHhAjPCmIyxUgIMBAmn9Z+orZgauv/a1F2mybo61TndNOA/8BUjg4E1N1IgE89aWH4H6pM0sh+AqtrAkHTMU1jdDKW0HgYP2I0+3O1gPnJiBybJJZgw/r4sSlqf+HPYfgBhjT22P2HPBdtoAAck8oEcCnf5Uu7DE046atNcPOkxahcPlQCSBTsONh5DndvRwl3BYi8Hv9vJNxtTqJwqJHDEoaBo4cnGJJgnyVJ9/1msnRm1DWHboJwGksK1YIYhxliQQdv1r4eXt2FsNAC6pmOfWxvLcWeI+RORAsHMuq4VHa9Pj2vyzGLkHwpUG48RDK2YvFY1vuU7mF+aEBZ5QwyA7TuWyLgyP1tnk5+Q4iYMblOlDX1aU/b5Zig== Received-SPF: pass client-ip=57.103.89.202; envelope-from=mohamed@unpredictable.fr; helo=outbound.ci.icloud.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, FORGED_SPF_HELO=1, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Switch to a design where we can share whpx code between x86 and AArch64 when it makes sense to do so. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 ++ accel/meson.build | 1 + accel/whpx/meson.build | 6 ++++++ {target/i386 => accel}/whpx/whpx-accel-ops.c | 4 ++-- {target/i386/whpx => include/system}/whpx-accel-ops.h | 4 ++-- {target/i386/whpx => include/system}/whpx-internal.h | 5 +++-- target/i386/whpx/meson.build | 1 - target/i386/whpx/whpx-all.c | 4 ++-- target/i386/whpx/whpx-apic.c | 2 +- 9 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 accel/whpx/meson.build rename {target/i386 => accel}/whpx/whpx-accel-ops.c (97%) rename {target/i386/whpx => include/system}/whpx-accel-ops.h (92%) rename {target/i386/whpx => include/system}/whpx-internal.h (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 64491c800c..4ea4c48a2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -549,9 +549,11 @@ F: include/system/hvf_int.h WHPX CPUs M: Sunil Muthuswamy S: Supported +F: accel/whpx/ F: target/i386/whpx/ F: accel/stubs/whpx-stub.c F: include/system/whpx.h +F: include/system/whpx-accel-ops.h MSHV M: Magnus Kulke diff --git a/accel/meson.build b/accel/meson.build index 983dfd0bd5..289b7420ff 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -6,6 +6,7 @@ user_ss.add(files('accel-user.c')) subdir('tcg') if have_system subdir('hvf') + subdir('whpx') subdir('qtest') subdir('kvm') subdir('xen') diff --git a/accel/whpx/meson.build b/accel/whpx/meson.build new file mode 100644 index 0000000000..7b3d6f1c1c --- /dev/null +++ b/accel/whpx/meson.build @@ -0,0 +1,6 @@ +whpx_ss = ss.source_set() +whpx_ss.add(files( + 'whpx-accel-ops.c', +)) + +specific_ss.add_all(when: 'CONFIG_WHPX', if_true: whpx_ss) diff --git a/target/i386/whpx/whpx-accel-ops.c b/accel/whpx/whpx-accel-ops.c similarity index 97% rename from target/i386/whpx/whpx-accel-ops.c rename to accel/whpx/whpx-accel-ops.c index f75886128d..c84a25c273 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/accel/whpx/whpx-accel-ops.c @@ -16,8 +16,8 @@ #include "qemu/guest-random.h" #include "system/whpx.h" -#include "whpx-internal.h" -#include "whpx-accel-ops.h" +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" static void *whpx_cpu_thread_fn(void *arg) { diff --git a/target/i386/whpx/whpx-accel-ops.h b/include/system/whpx-accel-ops.h similarity index 92% rename from target/i386/whpx/whpx-accel-ops.h rename to include/system/whpx-accel-ops.h index 54cfc25a14..ed9d4c49f4 100644 --- a/target/i386/whpx/whpx-accel-ops.h +++ b/include/system/whpx-accel-ops.h @@ -7,8 +7,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef TARGET_I386_WHPX_ACCEL_OPS_H -#define TARGET_I386_WHPX_ACCEL_OPS_H +#ifndef SYSTEM_WHPX_ACCEL_OPS_H +#define SYSTEM_WHPX_ACCEL_OPS_H #include "system/cpus.h" diff --git a/target/i386/whpx/whpx-internal.h b/include/system/whpx-internal.h similarity index 98% rename from target/i386/whpx/whpx-internal.h rename to include/system/whpx-internal.h index 2dcad1f565..c59f9de091 100644 --- a/target/i386/whpx/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -1,5 +1,6 @@ -#ifndef TARGET_I386_WHPX_INTERNAL_H -#define TARGET_I386_WHPX_INTERNAL_H +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef SYSTEM_WHPX_INTERNAL_H +#define SYSTEM_WHPX_INTERNAL_H #include #include diff --git a/target/i386/whpx/meson.build b/target/i386/whpx/meson.build index 9c54aaad39..c3aaaff9fd 100644 --- a/target/i386/whpx/meson.build +++ b/target/i386/whpx/meson.build @@ -1,5 +1,4 @@ i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files( 'whpx-all.c', 'whpx-apic.c', - 'whpx-accel-ops.c', )) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 256761834c..106a352980 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -31,8 +31,8 @@ #include "accel/accel-cpu-target.h" #include -#include "whpx-internal.h" -#include "whpx-accel-ops.h" +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" #include #include diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c index afcb25843b..b934fdcbe1 100644 --- a/target/i386/whpx/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c @@ -18,7 +18,7 @@ #include "hw/pci/msi.h" #include "system/hw_accel.h" #include "system/whpx.h" -#include "whpx-internal.h" +#include "system/whpx-internal.h" struct whpx_lapic_state { struct { -- 2.50.1 (Apple Git-155)