From nobody Mon Feb 9 12:15:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1768398223; cv=none; d=zohomail.com; s=zohoarc; b=futPCctPjV0VAkCtdVpT5aqprhi268rrzDLU1pEhCt6zmvw6gJMdJmLqu7hLx49NpAI/CtrnAwhUY8nvcWYEgJ2bXG5rHE6k1yA5fOq0esFx9GSdMWKzq+Eb+bpfzlVZNtkwpZWYgcKDon9qrOwQSm3EPIAIorgkO1VNuO0iAmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768398223; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZDL+1ZrQdQMU6W30aFxKeJ0WSSWhexTpAIoa7LZHNfo=; b=ipQJOjuccTP/iPZXL9KwDHcLLWPQ0UOPW92Juvr7KdVHaNdVVudAzWjwYbrPc9JiORmHXklZ7dzmAliZ95xfZOb9Hsx+xA5XeolBYl/DDO8x9xa0hawdsLTCxlYQOK50tJTyCHR0yO9YBKQ2Vj31DvgjBZjoHTCwzLxy7vC95uU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768398222748222.82282790701765; Wed, 14 Jan 2026 05:43:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vg18p-0007vW-NM; Wed, 14 Jan 2026 08:42:31 -0500 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 1vg18o-0007vF-Nx for qemu-devel@nongnu.org; Wed, 14 Jan 2026 08:42:30 -0500 Received: from p-east2-cluster3-host11-snip4-7.eps.apple.com ([57.103.77.178] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vg18m-00070c-Vj for qemu-devel@nongnu.org; Wed, 14 Jan 2026 08:42:30 -0500 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-100-percent-2 (Postfix) with ESMTPS id 2410D18004A6; Wed, 14 Jan 2026 13:42:23 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-100-percent-2 (Postfix) with ESMTPSA id 660D8180016F; Wed, 14 Jan 2026 13:42:19 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=ZDL+1ZrQdQMU6W30aFxKeJ0WSSWhexTpAIoa7LZHNfo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=KekDW+OqSWpMevUdB30Ijqq5P0OMexeJ6rXhxUDqNOQoXkzlwfSILCCZFb6HyJWQEAS8ewpwcWujZJDn74yxSLS/gql3NB3cUS+y21Mo0/dM1DuyXz4l3K0rXS053S/M7Pnfd7ppjoENQhtiwJGRRR0K3Dcy327UB03q98DV22R5C3du3gnzl68WOKzGgo7i7DPwz8cx8FSOPfmCPj6jfm6BfsgcjtBiKeC8ITeHEuQ1NLEVsXbDXpOkS0A44l4tFFSQhdFERs4qVtcIyFLOEwdMqyC8nF0fv6KR1wDXjAz5y6DZpgioLsZKzDb/IxHkfT1A0VTKOHH2MgM2Rid3yw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: mohamed@unpredictable.fr, qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, "Michael S. Tsirkin" , Zhao Liu , Yanan Wang , Pedro Barbuda , Marcel Apfelbaum , Phil Dennis-Jordan , Shannon Zhao , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , Ani Sinha , Richard Henderson , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Mads Ynddal , Igor Mammedov , Alexander Graf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cameron Esfahani , Pierrick Bouvier Subject: [PATCH v14 09/26] whpx: Move around files before introducing AArch64 support Date: Wed, 14 Jan 2026 14:41:26 +0100 Message-ID: <20260114134143.26198-10-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260114134143.26198-1-mohamed@unpredictable.fr> References: <20260114134143.26198-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: t7ygWtOmzYgYIZSa0l8pNrbXNmd4F9Sx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDExNCBTYWx0ZWRfXz++NXQkco7dz ooZhgVS37o1YRPPq0pAUwYq/VnhTr2chhQX0dSIOCxjUpTOyTQ5caMNeI5Z4hXwmJ5ON1tvc73v +/QfmFIyHD3Y74bYgkVeUUzDMJMheZ5zApGLcTAD4sDfUFjwLZ7wFPgM2Ao9kGk55CLhS2sKXCF unU6MfRkfLRKm8XH/8TNx+uFFy3UdDSs0ZtUg+tErQyQWR/RHBOXZbhL4IzOZWZSqL7yZjWvNCY W5cnO8B8cZhv0LVcyxhe0MF8LmBCiAbZ5GB1kFMNAaZbwyAioA4/QsOpbP3/kXanK5odzB2dGNb xIPS2yCoLtBuxk3fT+g X-Authority-Info: v=2.4 cv=GZYaXAXL c=1 sm=1 tr=0 ts=69679d42 cx=c_apl:c_apl_out:c_pps a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=yMhMjlubAAAA:8 a=5-iGLm-LtT_B5TT3xKgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: t7ygWtOmzYgYIZSa0l8pNrbXNmd4F9Sx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_04,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 adultscore=0 spamscore=0 suspectscore=0 clxscore=1030 malwarescore=0 bulkscore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601140114 X-JNJ: AAAAAAABew9jx91tEwmec3l1TbfRPBMiwULRA1f+cuSJraiC8c7pMeJP0uOrjtr+GGmiAKmEBlFhoriAeeMcEqoxBXl0ioGVKGDUcJ7Wbgn0apQRM6owbYg3t3lJCMr66MhkLgdkeI8R0zYxOCJ6jKNzbOaPtXNAO6va0800XLqWM/+6BCV+I/jotOFO/QrNzydO7k5SYxeEriEaT63xFXSbzIpy56QusGkXTKuS+ChqtzrOM0SlasrMOmdHoYxwY1+sb20h1Z1a3X1c4TY7srtTMvKzY0xzljyBeMthaHIOFCAXOAfy7by2MyE9NU2amT1dIs5YoH7jXp+PdHNHaA91yiYfIwwj+40biOs2QQY0wUUDy5MEJnMSdV/RbwQXKlItY2hyHQ0pUJeex1WmaSuXolAbuoUB2HL3jAJSbPAgSbtGDGZoZgtx49wDhC9lsd0Ns5YjI3Oa8BkWJOIo0mbUhGZctIjxq689rmCEC+TACb5PRIeFHXFPr9KuHYfNcn5g7DtqnXaqhVqiPXOa1I+aa8IWELz9bWK5C/dw8uRGER41iiNB4PGyzCzBgvoAUcRyoiXKw+T4WCHAytUF7IOHwyr5nNtPKcQo4pLHfOGCEKWGuPacMtUlr+a4R8iOyJTd1RjB+MVMjvF6F8Yr4/jfAJMc9mWvGTSe2X2g4G90Ud/sGzXVEu8O4FADXZNGT5QTS12rI5jaOV2bv4KbOWmuzWOWFs+pSFz3KJPYA9IzS8IpIYUEs2acQkpwojaanAYGQ027RUmbLR8qD8tfIb7mWzYuKbl9ZH9/OfxzjGiBfHzWhclzVCYoRb3n9iMva5OVjh0Mis7I3VmcVRJZ3ZXpSA30tCgi6/2z6tBeHfGbZymr7UGPeoPsMA4Z+JtBSVf86fZQoyzppEh/X8kmVrpSB4ELxwb6Y0xFnQqAQjeknYr8QVBuQkQQsw== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=57.103.77.178; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1768398224652158500 Switch to a design where we can share whpx code between x86 and AArch64 whe= n it makes sense to do so. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 ++ accel/meson.build | 1 + accel/whpx/meson.build | 6 ++++++ {target/i386 =3D> accel}/whpx/whpx-accel-ops.c | 4 ++-- {target/i386/whpx =3D> include/system}/whpx-accel-ops.h | 4 ++-- {target/i386/whpx =3D> include/system}/whpx-internal.h | 6 ++++-- target/i386/whpx/meson.build | 1 - target/i386/whpx/whpx-all.c | 4 ++-- target/i386/whpx/whpx-apic.c | 2 +- 9 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 accel/whpx/meson.build rename {target/i386 =3D> accel}/whpx/whpx-accel-ops.c (97%) rename {target/i386/whpx =3D> include/system}/whpx-accel-ops.h (92%) rename {target/i386/whpx =3D> include/system}/whpx-internal.h (97%) diff --git a/MAINTAINERS b/MAINTAINERS index 4ddbfba9f0..561f18c8d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -563,9 +563,11 @@ WHPX CPUs M: Pedro Barbuda M: Mohamed Mediouni 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 =20 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 =3D 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" =20 #include "system/whpx.h" -#include "whpx-internal.h" -#include "whpx-accel-ops.h" +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" =20 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. */ =20 -#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 =20 #include "system/cpus.h" =20 diff --git a/target/i386/whpx/whpx-internal.h b/include/system/whpx-interna= l.h similarity index 97% rename from target/i386/whpx/whpx-internal.h rename to include/system/whpx-internal.h index 2dcad1f565..041fa958b4 100644 --- a/target/i386/whpx/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -1,11 +1,13 @@ -#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 =20 #include #include #include =20 #include "hw/i386/apic.h" +#include "exec/vaddr.h" =20 typedef enum WhpxBreakpointState { WHPX_BP_CLEARED =3D 0, 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 db184e1b0d..cef31fc1a8 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 =20 -#include "whpx-internal.h" -#include "whpx-accel-ops.h" +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" =20 #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" =20 struct whpx_lapic_state { struct { --=20 2.50.1 (Apple Git-155)