From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from outbound.st.icloud.com (p-east2-cluster2-host5-snip4-10.eps.apple.com [57.103.78.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39EBA219E8D for ; Thu, 16 Oct 2025 17:38:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.78.33 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760636314; cv=none; b=cUfMw0mpaZsjzTs59t0jJyfxZce/Et8KO7fEPiw5rmAKnSHs8AUPVp5i7wLx1e1lu98ggJFMgbBE/K0XmzZyEHnzSr73sWwpLooZ+UEQzfHzEeZjYMXH5WYJWoJWWoIDu+e8PjlXmBupgGP91uef/TrFB+3RQRGqZm3STLW/HhA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760636314; c=relaxed/simple; bh=21sx+TAfQ8xo2rH+86D9JV3hyn4bmXrS9c3DCVti0dk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ddk1/h+Hiie4kWg3R2KYtXF94R4abirdN/CC5uleoZo2fVnGk6EhmbI8+UxaButO0hB/8exvkMTu7vlUH5HPIVb6JJM12wmOHZd4DMUcr6/LokcAHOtsTFpANaM5sxAgTMw9CD9LBjwCvSSmJcxnvtD8BTwUp4I9qAvvA+2RAIg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=unpredictable.fr; spf=pass smtp.mailfrom=unpredictable.fr; dkim=pass (2048-bit key) header.d=unpredictable.fr header.i=@unpredictable.fr header.b=ELIoXM0M; arc=none smtp.client-ip=57.103.78.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=unpredictable.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unpredictable.fr Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=unpredictable.fr header.i=@unpredictable.fr header.b="ELIoXM0M" Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-100-percent-6 (Postfix) with ESMTPS id 6CA6A1800141; Thu, 16 Oct 2025 17:38:29 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=/6NY7U3Atkanr4qfTcQ0H73EJM7+21eqXZpVtymAXL0=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=ELIoXM0MsTIRC3rXtmRl3FCZbuGuLO1OngpHMd+pPbGVLdwCZ6/LtwtZsmEGpfngjHxmxQQw5gLVf0PM4ejs/SSjGGj0VSLwjouuBg7DutiOgRRRmgefEM4a6J4a6oVwNzAJ/N22CHqVG/dSixVB5GqsKoUEgRh1C63oMT/8kB72D2kDpF9Oqbw59aOdfdhBlZatIn25ycqB2uDinrw4Ij8aUolGDVlGtKd/u25S19rs8Fv86xw4LZ95xgNCeN7iZYW8gYoHE+8cA4WZ54pI0SwikCL6HI5olodVVHdUgOIk1+STkxOBfVEBKbiayJzMDvkOjhtQ3NZmvMxS3pYsVg== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-100-percent-6 (Postfix) with ESMTPSA id C0E7618002D2; Thu, 16 Oct 2025 17:38:25 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, kvm@vger.kernel.org, Richard Henderson , Sunil Muthuswamy , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Igor Mammedov , Yanan Wang , Ani Sinha , Shannon Zhao , Cameron Esfahani , Mads Ynddal , Zhao Liu , Phil Dennis-Jordan , Roman Bolshakov , Peter Maydell , Marcel Apfelbaum , Mohamed Mediouni , Paolo Bonzini , Alexander Graf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pedro Barbuda , Pierrick Bouvier Subject: [PATCH v8 06/24] whpx: Move around files before introducing AArch64 support Date: Thu, 16 Oct 2025 19:37:45 +0200 Message-ID: <20251016173803.65764-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251016173803.65764-1-mohamed@unpredictable.fr> References: <20251016173803.65764-1-mohamed@unpredictable.fr> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: 5rFM2QL64ru08HDO5gW3wzY0GlFQAZ0F X-Proofpoint-ORIG-GUID: 5rFM2QL64ru08HDO5gW3wzY0GlFQAZ0F X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE2MDEyOCBTYWx0ZWRfX2LQLZ8Hblrqn TXcL6R3t4yebby8PjIHNOePNix5EKmHMMREN87JPyWRd0fpN8iU/dieeTGFJdv2kq3W7yRhDt2z Y+QAPqDkiqns8dpflgjELvg53TgW4k6/qhZnTsTlxsXt4Udf5WgTKLFldQ/+hSbks0pKr6FbhQC nT6kh34wR+Vsg8xIwKSQCpvOVKa1sfcgy8u028oS6oTJdEL+jI48GV8i+sgXHl82LDj8zWvs7U4 dyYA0s1rTm05zf/U8yqHQ+S7879WfXP1i+EhN3AwFJY5p9jo6+jH4GOn5LPQgT1chr8Bvf0og= 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-16_03,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 adultscore=0 spamscore=0 clxscore=1030 suspectscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510160128 X-JNJ: AAAAAAABRPGaJD7x4pIs3HKmoeUPAYRAVuhrIQGyhpCkHpAl48BFwD2Nq5bAVp9w+C4fQQ9eXwKHzRhlnpPr2zpQHtgfN+J0bs1efMR3tMJ25kXiW5WuYlVOsRDkUy/ImZzb0rU8It7GoTND8eYc09+/PE8/jp4Ow6xlT7zOwWecJUmbhHGZO0Y86j+bzdxksopCDQHI4LiAB+dza6/nJkORt/wosJBXKYOnBq2gNJfuFc8yvisJcPP9rZUPmm1YDVeIPGGV6k+RyZysbcmsjTPWXhh600lK9uYHGPRebjuCYfB6ttW7CPs34QbBXYtLPkfm27gy8UeyoXraTpReW4Jv3a+5gcFLqrrxSkgxePT5GT/0l51OBtP4vJ/aoUX8FfzRYh2xW5Z2LllaWyGVhmJxTI7mPB6FoMcD1L64pWRMF8l2RllJ8wCQ4/gggRSG2yisHTIvx9XTi5FCeQATmtFhCWH9H9A0hKDhA24TyelMM/nmGnoM79uFaQu06eNLRCayyWQhR9S8JWI9ups9K6xP33JkqZ1fa/xnHQV06ky3NjnfTOE0u57mKTPFaQpf0WYo+K37GXf9r2M0cCqkg0bp+B41NWcHGTq7KxDDADhoiX7MOLNspv5pqdlPONXqWfXFXdJGaE14ms2LWz4C7FZ2M0w+CZ4h8Jqm0pWCL6rRA+Qv611I2uPlo8Y/MpijHEPEU640vF1WzjVaTdhyBDeay9ZVgkS6FsFToz3+JkxxYNIHKrW8HNiWEC8AXPzk9lp/oGt2jlgWNUwZkgkAO+9p+WIHoUc5x9h+b+L576HfJeb7Mi73tXKy6xrv2OaSgn0R8BPRF0+zWjDF8kE3mEjIGNHG4MPCzSzuyVl3Qkkz3onfJml482y7NrfRZk6EjYMx5JY7cX3n+G38UYiyvVhFbtDmYsTgtY+JdiEanhecxw== 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 0c766961f3..c25e22ffdb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -547,9 +547,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 6633e9c4ca..e61375d554 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 e1ef6d4e6d..badb404b63 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)