From nobody Mon Feb 9 11:30:48 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=1768571640; cv=none; d=zohomail.com; s=zohoarc; b=bdABn3KKvE5dOT4MCP/8m4yrPKrGIxOTeGObrzHeAIF8DoeBTHbab3+3Bam5mygT4do0+EQh/TKqHGSldyHQIOCZV6H7nDZBtW8pv76DJp5xi3f3918/2kFlzZPw3II3bQ7hmtZ6nzSOntjVN4mdLQENuJl81SXqFcRxLCj45hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768571640; 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=kY0T8z/MBSVW4Qvo8YL2+j+aa2FE+3xTaY3r3PxXVGU=; b=C6FlDFp9/fMCona9WqSQQ5ku853PDJNl+6RnzhXY/T5Cbcen2HQvCwKeg2OKejYgdxexOv+pvV53dSGf2pbJbXlztePjtqUV+1HdaGzTyZ4+5/vvXGg1UKjUx+Xy2rR8vaZcnVhmbmp8BVRUiZi5Be1rCr4OXx/2S8+zIt309W8= 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 1768571640805429.6610258198916; Fri, 16 Jan 2026 05:54:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgkGQ-0003IZ-BT; Fri, 16 Jan 2026 08:53:22 -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 1vgkGF-0003CT-5C for qemu-devel@nongnu.org; Fri, 16 Jan 2026 08:53:11 -0500 Received: from ci-2004a-snip4-6.eps.apple.com ([57.103.89.9] 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 1vgkGB-00027Y-TG for qemu-devel@nongnu.org; Fri, 16 Jan 2026 08:53:10 -0500 Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-60-percent-15 (Postfix) with ESMTPS id A57721800215; Fri, 16 Jan 2026 13:53:03 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-60-percent-15 (Postfix) with ESMTPSA id B90F418007F1; Fri, 16 Jan 2026 13:53:00 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=kY0T8z/MBSVW4Qvo8YL2+j+aa2FE+3xTaY3r3PxXVGU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=S2hHBXd0VaimbnLe7VN8B0z02XH7z2pqhzmVSwlyU1KdhFk/YfcRFUJh9kfpfaaUFDyzrpNuy5/U6WJN625/x6hs7d27DwMVSlgFPGsOI0Q8T7hHEOfygx4GXUuygJ7pydCIUZzggG+67z9XAZ/2QF/Arw03rt0kpHxKAxmHoA9c2ouaytAMM6cwSTMThdK3toe/BeQ1vWgJ7EpEjdXH9vDSnDWmF96Fi9zm2/Ph5tHITyZof5b/NC68rBrmwx5XLabQcCq4CS9anwx24reZ7s1/oD3nPGtpAhiQ661myXVBCFjyFRSNfOCbb/4zYyKRKjUiaiTUTiBE2gK+y0Ls/Q== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: mohamed@unpredictable.fr, qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pedro Barbuda , Peter Maydell , Eduardo Habkost , Marcel Apfelbaum , Phil Dennis-Jordan , Akihiko Odaki , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Shannon Zhao , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier Subject: [PATCH v16 09/26] whpx: Move around files before introducing AArch64 support Date: Fri, 16 Jan 2026 14:52:18 +0100 Message-ID: <20260116135235.38092-10-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260116135235.38092-1-mohamed@unpredictable.fr> References: <20260116135235.38092-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Info: v=2.4 cv=CcEFJbrl c=1 sm=1 tr=0 ts=696a42c1 cx=c_apl:c_apl_out:c_pps a=2G65uMN5HjSv0sBfM2Yj2w==:117 a=2G65uMN5HjSv0sBfM2Yj2w==: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: BBRLS7HN79QN-HRY6rKgOGMpZgSf1iAt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE2MDA5NyBTYWx0ZWRfXwr1QlkqWk1ID eNFW3Vc0oLVdS2KYoLXGu1gLUuc/pJa8BRhvG0FjkCH0BFQmohxgr2n9vNh27R8J5t9WhXwAI03 AGo5jBWZH+6XAB9SEdZjusqII2RaW0G6VibTZNGMCP76PVWqKncmmt7trNn5xD1IqhxVq3Z+bsT QgjtfxoYRmkOa1MmTfhaqPLc3gza9kktnRBe1H/bgBiOpA9ddthvFAeHXPS0HtgYaWrLmm6Pz0R dmUDbkBDZkwlDCScRA1PoGhMVIbZJR3eoCNvQUbiuA/iq3r1yyyBHugQZYeSPlFd1Ka+O6x2i7p pOzXwaHtw18p23/Wjxe X-Proofpoint-ORIG-GUID: BBRLS7HN79QN-HRY6rKgOGMpZgSf1iAt 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-16_05,2026-01-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 spamscore=0 suspectscore=0 clxscore=1030 adultscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601160097 X-JNJ: AAAAAAABqCmsyALQcPX+rlCOn+kumDc31xr+joWN+dDpEUcfmBT2GGjxRiQRwGnPpcOA59SKtTmvBS3+UAI360U4hGkh3rHQfYovt1jJgdWAdSUlTOMKX+YRr+mmuQ8R/peui9AH4fJAcbqTjJM2XxnKc3IpZyV2wX5k5Li05z77yg64g7bnoP6C6/I2lQ0Z8c5ojO4+bkccY+RSpuyXDGpaC+qdZqOy6G4Jjlm+Bid3/QjNIt0GXY5nHpJGNz3bZnnnA61MMgt7O+gFR0lh7I2vzUTTtZaOnkPxtiZWfsxYEbfrvpAeHzowYStfhJ4i7maQHxqzbOFEAJ37P0nvEXgA/KR+lYtPNrR6zz4d/5sg4XbhOmZiwb18g6WdZ/petTm6rLDEB5w/I+HBdSiEAthTuBi1t31Zx8lrxiULv+2oTie2iPzrh8rSBXO3x0qSiWG0cqCV9td/cXPYEq/AYs3g1Alzn8Eg0sDNzxjeIiVP/vwc2uXbIP3wAhsW6nzOgNjX6YzY2KMh36KdBngBNaQbzYqCQZlyNSxOLZq6r0IqrNLJrmv0CFwzoS3Vc9x/6PKgh2tKChD1J4sTp0muW8o4+MA6ZyO+MRVltSZz22m5TMnwR+I87g9oWVoM36mwO1NfqJUG8WJloW9oQoAoD/pTzk6d65h0PEEa/1u9tyeykz1aDOMaUtVGde0ymBcHuCt607fRHqyT6zgXcwB+me7oM5Td9HEGuEoXk2OUUivAvHh6jL3dFVwKeDEjZ5srbnjxPjYIw2qeS55Qkp8Q0iISzuzPGMwJ6QlmQQJ9TUMY+Cs9zfV2/x/1t/V7vq7aBKrmUjdE/A== 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.89.9; envelope-from=mohamed@unpredictable.fr; helo=outbound.ci.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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 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: 1768571643407158500 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 de8246c3ff..356ede09da 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)