From nobody Fri Nov 14 22:21:12 2025 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=1759869203; cv=none; d=zohomail.com; s=zohoarc; b=MgLC/1CZX2xAq1ePJryyIToodGqxeFG5Mgx5Dd2HVK9DPoIFdijQTXzRprWchApLv0KCtcOoYd1NOHF+dNvF52iJ3P6bGJTa9Sg60n+a74g6Mz6xSQJiE71nInYqmu7n8wV3TCh/citXP8xhAUQhqgLmAYZ3rQQ8sfKdZLDH4+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759869203; h=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=J8OhuCjv+2oy4nktuLDKnA5ap+1pgvyd7eCHpQ6L08c=; b=A78XTBWAycvscAGNZSgIstJ53jzgMLFUK/tmK2XsWUwaogyP9SZXhY37/Y4/lPVg/4lGarZXhCMUO7/4Sz+4NcDvuarqYKuWhq41xoLka5NK+3yx/b5nEq0zKa378SFOhyTM4rW3owk6vYOsBTQ7bE3dr9OtP5OJwebl/rrSpdg= 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 1759869203015418.8331482368774; Tue, 7 Oct 2025 13:33:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6ELu-0001Fg-HI; Tue, 07 Oct 2025 16:32:06 -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 1v6ELs-0001Eo-DC for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:04 -0400 Received: from npq-east2-cluster1-host5-snip4-1.eps.apple.com ([57.103.77.84] 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 1v6ELq-00019u-Ng for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:04 -0400 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 F3FEF1801714; Tue, 7 Oct 2025 20:31:58 +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 E64C2180016A; Tue, 7 Oct 2025 20:31:56 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=J8OhuCjv+2oy4nktuLDKnA5ap+1pgvyd7eCHpQ6L08c=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=RPaG4cUFjo/ASTpsA67kHPhmHSwgqOiqI1ZsrEyvbhSh12DAtCUyGydeWQB3H+datKhuvRsEDX3AcoM9T55iKffWDFoaLELSAnOs0UyjmfgRQDcKUagVo+NCoth16V0QmiWLdDcAufajufb06gFPPXjyBtyB03yYRHwyHaC9OcwQsADHc+MDa6yASvF6I7cr4Rs6jfcEHHxm+Fl0wuVbcM5bqkjfkcjoxNZsxoMww/+U1mO9u9FC8XJNzQxuXvJ87m0zwpqp/lHjryZG7xM3uu76WueIT/HqTew1OHmUhU9F0slenatin2gBRk5dlXz29XN5kcoWuEeNNv7lr0vzzg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mads Ynddal , qemu-arm@nongnu.org, Cameron Esfahani , Peter Maydell , Roman Bolshakov , Alexander Graf , Phil Dennis-Jordan , Mohamed Mediouni Subject: [RFC v2 1/4] hw: vmapple: include missing headers Date: Tue, 7 Oct 2025 22:31:50 +0200 Message-ID: <20251007203153.30136-2-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251007203153.30136-1-mohamed@unpredictable.fr> References: <20251007203153.30136-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA3MDE1OSBTYWx0ZWRfX5G5/h04z7jWU XfBGXLWryoXDY/diA6roWsmGihtJH33ZwkJsnQxWng9lr4GAVo0U2+lm7ar1zPWpki+lH//PrUc J3vmuxk8H+nn+vwpTGASmdwjG4WelZKgDWtyUnYeVjJg3gTzJEkUwGcqV7Dm0PuK08ufy4Oni7N NESv5Abk7ztvB1IgnFM4NxM2kb+nf/PC7evMu4IAdFSQbmS+f9pap74clwVz6D9PCuwtqTZIB/B 7D4tBdKGGaEXodzm35IbuLgMzxnGvtZRlhJ9kO1AdsbfV39/uFinCZO7hfJxZQOElRqETvWsU= X-Proofpoint-ORIG-GUID: e8RpWn3S0oOR-TMGdFS5nSXneFLuSYYD X-Proofpoint-GUID: e8RpWn3S0oOR-TMGdFS5nSXneFLuSYYD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-07_02,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 clxscore=1030 malwarescore=0 mlxscore=0 suspectscore=0 adultscore=0 phishscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510070159 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.84; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1759869208428116600 Content-Type: text/plain; charset="utf-8" Disablement by default led to: ../hw/vmapple/vmapple.c:276:39: error: use of undeclared identifier 'GTIMER= _VIRT' 276 | qdev_connect_gpio_out(cpudev, GTIMER_VIRT, | ^ ../hw/vmapple/vmapple.c:479:54: error: use of undeclared identifier 'QEMU_P= SCI_CONDUIT_HVC' 479 | object_property_set_int(cpu, "psci-conduit", QEMU_PSCI_COND= UIT_HVC, | ^ ../hw/vmapple/vmapple.c:556:13: error: call to undeclared function 'arm_bui= ld_mp_affinity'; ISO C99 and later do not support implicit function declara= tions [-Wimplicit-function-declaration] 556 | arm_build_mp_affinity(n, GICV3_TARGETLIST_BITS); | ^ 3 errors generated. pretty quickly. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/vmapple/vmapple.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 16e6110b68..5928df4411 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -51,6 +51,8 @@ #include "system/reset.h" #include "system/runstate.h" #include "system/system.h" +#include "gtimer.h" +#include "cpu.h" =20 struct VMAppleMachineState { MachineState parent; --=20 2.50.1 (Apple Git-155) From nobody Fri Nov 14 22:21:12 2025 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=1759869185; cv=none; d=zohomail.com; s=zohoarc; b=c4zJoSNPQzEExELLp9ayFdl3R2Ff+50X4AjVUvpDOLaYcGjkaRYDo37ZXDhxm3OlO6wZZw0z6/SOqKLnMokQ/tIQnax1Mi7Wnl9r3iFjrIjSOdTiymhySBCr/f/EZ1YLG+5XEbIy4KCQVokmRdP4Sh/1nOC1Erl8PljZkRWCNvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759869185; h=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=Q1aapM9XKCFqIJhUWzmEK/f+r6L1U4rtPRfzS3K3DFY=; b=ScwVbWVm0q4cuqqwj++PkTJ96LCPcK/CVn7BoluX+bScKwTL77xBrDoP0TD8wm6mtBk4oXN1+s7qPRHQJHcwXq26dFqRjRI9HgyApzhJhDo36G6INnYf6LkANOubmX1HVzZ6mezBNW8kwNHbmvjKUIodbPpIdoMgoDCYJp+m9/Y= 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 1759869185987759.8748977955723; Tue, 7 Oct 2025 13:33:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6ELv-0001GS-8s; Tue, 07 Oct 2025 16:32:07 -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 1v6ELu-0001Fb-AP for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:06 -0400 Received: from npq-east2-cluster1-host1-snip4-6.eps.apple.com ([57.103.77.29] 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 1v6ELs-0001AK-Ge for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:06 -0400 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 B60E41801719; Tue, 7 Oct 2025 20:32:00 +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 77FD918001F1; Tue, 7 Oct 2025 20:31:58 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=Q1aapM9XKCFqIJhUWzmEK/f+r6L1U4rtPRfzS3K3DFY=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=gQMN60VFPduiMAbPtn2OH3vakIvtV9EQXVx1C4ScZXL9v0vXvz85dB6Va1AxGfoUQ8jA7fv19OmS3Enh3rILffGFAYTNHzsZzxu5NsDXahb1HsvcY+CNokxa2D9rGXDwZpB8c+bdKLptv0d5+ROcrbbfsdV0JGUukowMmIgL6VBnBuCVp778U67uRyLJofd/LUGYINsbWkBCrd5UCm7joIy2pG2FyGIiOiQ67qtp38XHCHEcf/ozmnOyosTjWc1B8AStdhX6VlOZG9vg1VEEo1YlMhZtLErHjaXPkcvRUroKhWVxRHXG13VNOcbJjcXZqCKA+BP3lmI+tKvPoKtHQg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mads Ynddal , qemu-arm@nongnu.org, Cameron Esfahani , Peter Maydell , Roman Bolshakov , Alexander Graf , Phil Dennis-Jordan , Mohamed Mediouni Subject: [RFC v2 2/4] hvf: arm64: add workaround for Apple M4 to run older macOS versions Date: Tue, 7 Oct 2025 22:31:51 +0200 Message-ID: <20251007203153.30136-3-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251007203153.30136-1-mohamed@unpredictable.fr> References: <20251007203153.30136-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: Ct5suKJ5wIHbZtE4U-JSPPcZ5WEQGL15 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA3MDE1OSBTYWx0ZWRfX22/QAwmFPhPy ZPukIq4dI98RkGnZ3UGVTnyzGbNh3IcZ/gbUt2f2gitGwh8LoxgGRs0mAvgBgm1p/QxQmb/66T3 JQoEOHn+d9lUtxXCIKBFvuGodejOjSXEHMFmWHSYiROnOikgQb7fs7Keo3pziAhZTsXYHcqQ3tj a5SLRFq7CejSUh6XO54pCnRihAiW01/2boaLrIIiumY4RLvVIAr3AFZ6oYViau1m2CZv0o5byr5 Zv+cKqwO3VucBNs5mG9e9YihxA6vY8lFdKOuV6tS3h5aaDycSJG+yuxF9iQFQK8zq41+IFqS8= X-Proofpoint-GUID: Ct5suKJ5wIHbZtE4U-JSPPcZ5WEQGL15 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-07_02,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 malwarescore=0 phishscore=0 clxscore=1030 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510070159 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.29; 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1759869188011154100 Content-Type: text/plain; charset="utf-8" Apple M4 removes FEAT_SSBS. However, older macOS releases do misbehave in such a configuration and do not boot. Use private API to trap SCTLR_EL1 accesses through FGT. Signed-off-by: Mohamed Mediouni --- accel/hvf/hvf-accel-ops.c | 4 +-- include/system/hvf_int.h | 4 +++ target/arm/hvf/hvf.c | 68 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 8b794c2d41..64d7afc3bf 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -152,8 +152,8 @@ static int hvf_init_vcpu(CPUState *cpu) sigdelset(&cpu->accel->unblock_ipi_mask, SIG_IPI); =20 #ifdef __aarch64__ - r =3D hv_vcpu_create(&cpu->accel->fd, - (hv_vcpu_exit_t **)&cpu->accel->exit, NULL); + r =3D hvf_vcpu_create(&cpu->accel->fd, + (hv_vcpu_exit_t **)&cpu->accel->exit); #else r =3D hv_vcpu_create(&cpu->accel->fd, HV_VCPU_DEFAULT); #endif diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h index a3b06a3e75..baee11d478 100644 --- a/include/system/hvf_int.h +++ b/include/system/hvf_int.h @@ -111,4 +111,8 @@ void hvf_arch_update_guest_debug(CPUState *cpu); */ bool hvf_arch_supports_guest_debug(void); =20 +#ifdef __aarch64__ +hv_return_t hvf_vcpu_create(hv_vcpu_t* vcpu_ptr, hv_vcpu_exit_t ** exit); +#endif + #endif diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 0658a99a2d..f503e1d1b8 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -22,6 +22,7 @@ #include "cpu-sysregs.h" =20 #include +#include =20 #include "system/address-spaces.h" #include "system/memory.h" @@ -292,6 +293,8 @@ void hvf_arm_init_debug(void) #define SYSREG_DBGWVR15_EL1 SYSREG(2, 0, 0, 15, 6) #define SYSREG_DBGWCR15_EL1 SYSREG(2, 0, 0, 15, 7) =20 +#define SYSREG_SCTLR_EL1 SYSREG(3, 0, 1, 0, 0) + #define WFX_IS_WFE (1 << 0) =20 #define TMR_CTL_ENABLE (1 << 0) @@ -1320,6 +1323,9 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t re= g, uint64_t *val) case SYSREG_DBGWCR15_EL1: *val =3D env->cp15.dbgwcr[SYSREG_CRM(reg)]; return 0; + case SYSREG_SCTLR_EL1: + *val =3D env->cp15.sctlr_el[1] | SCTLR_DSSBS_64; + return 0; default: if (is_id_sysreg(reg)) { /* ID system registers read as RES0 */ @@ -1643,6 +1649,10 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t = reg, uint64_t val) case SYSREG_DBGWCR15_EL1: env->cp15.dbgwcr[SYSREG_CRM(reg)] =3D val; return 0; + case SYSREG_SCTLR_EL1: + env->cp15.sctlr_el[1] =3D val; + assert_hvf_ok(hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_SCTLR= _EL1, val & ~SCTLR_DSSBS_64)); + return 0; } =20 cpu_synchronize_state(cpu); @@ -2244,3 +2254,61 @@ bool hvf_arch_supports_guest_debug(void) { return true; } + +/* + * Apple M4 removes FEAT_SSBS. However, older macOS releases + * do misbehave in such a configuration and do not boot. + * + * Using private API to trap SCTLR_EL1 accesses through FGT. + */ + +void _hv_vcpu_config_set_fgt_enabled(hv_vcpu_config_t cfg, bool enabled); +#define HV_CONTROL_FIELD_HFGRTR 0xb +#define HV_CONTROL_FIELD_HFGWTR 0xc +hv_return_t _hv_vcpu_get_control_field(hv_vcpu_t vcpu, int field, uint64_t= * value); +hv_return_t _hv_vcpu_set_control_field(hv_vcpu_t vcpu, int field, uint64_t= value); + +static bool hvf_is_ssbs_implemented(void) { + int has_ssbs =3D -1; + size_t has_ssbs_sz =3D sizeof(has_ssbs); + if (sysctlbyname("hw.optional.arm.FEAT_SSBS", &has_ssbs, &has_ssbs_sz,= NULL, 0) =3D=3D -1) { + has_ssbs =3D 0; + } + return has_ssbs; +} + +hv_return_t hvf_vcpu_create(hv_vcpu_t* vcpu_ptr, hv_vcpu_exit_t ** exit) +{ + hv_return_t r; + hv_vcpu_t vcpu; + uint64_t hfgwtr_el1, hfgrtr_el1; + + hv_vcpu_config_t config; + config =3D hv_vcpu_config_create(); + if (!hvf_is_ssbs_implemented()) { + _hv_vcpu_config_set_fgt_enabled(config, true); + } + + r =3D hv_vcpu_create(&vcpu, (hv_vcpu_exit_t **)exit, config); + + if (hvf_is_ssbs_implemented()) { + return r; + } + + assert_hvf_ok(_hv_vcpu_get_control_field(vcpu, HV_CONTROL_FIELD_HFGWTR= ,&hfgwtr_el1)); + assert_hvf_ok(_hv_vcpu_set_control_field(vcpu, HV_CONTROL_FIELD_HFGWTR, + hfgwtr_el1 | R_HFGWTR_EL2_SCTLR_EL1_MASK)); + assert_hvf_ok(_hv_vcpu_get_control_field(vcpu, HV_CONTROL_FIELD_HFGWTR, + &hfgwtr_el1)); + + assert_hvf_ok(_hv_vcpu_get_control_field(vcpu, HV_CONTROL_FIELD_HFGRTR, + &hfgrtr_el1)); + assert_hvf_ok(_hv_vcpu_set_control_field(vcpu, HV_CONTROL_FIELD_HFGRTR, + hfgrtr_el1 | R_HFGRTR_EL2_SCTLR_EL1_MASK)); + assert_hvf_ok(_hv_vcpu_get_control_field(vcpu, HV_CONTROL_FIELD_HFGRTR, + &hfgrtr_el1)); + + *vcpu_ptr =3D vcpu; + + return r; +} --=20 2.50.1 (Apple Git-155) From nobody Fri Nov 14 22:21:12 2025 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=1759869179; cv=none; d=zohomail.com; s=zohoarc; b=LvpyFp4aKIcaNx1/KClxx16XbrWgEHXo6aUoXXoQ2Xnkp/RQv3CZCmisZjCfyoYZ2cSWDFulPwqOXGyCXa0Gq0lR+CuRso67IXIYbpJVHTltedDRxTbO6qoppSPa4fi78xItFlIkzk8uAEbOwDQmW8xDDfPZeO1KnLM259aZukU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759869179; h=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=ntxelPjhpVZB8GftH09msxrtN1JthPRbSyeSqaae2eM=; b=DG2KGf2TQHcdmTlvqKRSYYfLTIPV64lR+La2eihYd3dg11HSFiETudEeJthNkVlWZYgNMYUwAQGPeJhK4TSBdibPykBd/hA/1d9eLzGwZBkmp6V/FB7E4gd/ePY8okfW5G/CztM53MNVOmD/ceBdg/Mh65OWW9+Ft2lNqEZz0q4= 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 1759869179066314.32566448768625; Tue, 7 Oct 2025 13:32:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6ELy-0001Hh-Aa; Tue, 07 Oct 2025 16:32:10 -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 1v6ELw-0001Gk-S1 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:08 -0400 Received: from npq-east2-cluster1-host6-snip4-6.eps.apple.com ([57.103.77.99] 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 1v6ELu-0001An-P1 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:08 -0400 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 057641801723; Tue, 7 Oct 2025 20:32:02 +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 550971800492; Tue, 7 Oct 2025 20:32:00 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=ntxelPjhpVZB8GftH09msxrtN1JthPRbSyeSqaae2eM=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=IAehDacpmafjC0ZvXU7sP8QT+oCwGLOQTPCEgbopeO2RAM15/hM6SJ3+h66KKiRAfXal363kRdH8lOMu1vl6V0bbhPvKs3NHzQxy3pd5K4Xbv1mFdkgoli0LIFkha+opM9/GsdDJlhDNDFIlOcAoj+xOKdqjhzLLUBugXHXStPFxD/P14PBvCClv6+phJmaGe5khhgwISEe2r4eExGuCuRnk4zXs2aVtcSxi4mjiwWO2WZztMJViw2DmIvMIr6O8lUyiyYADG/tkX2iy0sB0/oC+ewfJUHXUEPiIw+XVjWLdNpj/Asoe6EFF6ZNjWmAN0eTNEU8q4okY77PTR1xr6g== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mads Ynddal , qemu-arm@nongnu.org, Cameron Esfahani , Peter Maydell , Roman Bolshakov , Alexander Graf , Phil Dennis-Jordan , Mohamed Mediouni Subject: [RFC v2 3/4] vmapple: apple-gfx: make it work on the latest macOS release Date: Tue, 7 Oct 2025 22:31:52 +0200 Message-ID: <20251007203153.30136-4-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251007203153.30136-1-mohamed@unpredictable.fr> References: <20251007203153.30136-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: o5m7Hu8SiU0hzxD-WSTPZ54RyO5_mm_x X-Proofpoint-GUID: o5m7Hu8SiU0hzxD-WSTPZ54RyO5_mm_x X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA3MDE1OSBTYWx0ZWRfXxhkA3hLgWmmD brJ1i15bVVjBPHGgDTOwuBNc0/19Bg/lwTOtzLig+cTP5UHNTq5JAqUaSoriVa2pDe2rV5a8sDj SMRet8hcaNz4r8FzoD2CGoWIyO+IHH6p+tcnA004S0HBj2jpTUUodkmShW24L/GMuw/kGIXNyOE iPxt1mmy7s7AWigI/ne+EdquAXGUv2d69lddbheG1yrj9JNv13nP4QhmvPT1rH4JRjvtIxGoYeR fOtFyYUnPy5g2/wa8zxss/3V7cP4lyFzcqgqbeQ4MeNqD4zG+2Le24N3Hv6fcKVcaXfXA/anU= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-07_02,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 clxscore=1030 bulkscore=0 mlxscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510070159 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.99; 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1759869188837116600 Content-Type: text/plain; charset="utf-8" Follow changes in memory management, and enable process isolation for a san= dboxed GPU process when on a new OS. Signed-off-by: Mohamed Mediouni --- hw/display/apple-gfx-mmio.m | 56 +++++++++++++++++++++++++++---------- hw/display/apple-gfx.h | 13 +++++++++ hw/display/apple-gfx.m | 42 +++++++++++++++++++++++++++- 3 files changed, 95 insertions(+), 16 deletions(-) diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m index b0b6e2993e..728441d490 100644 --- a/hw/display/apple-gfx-mmio.m +++ b/hw/display/apple-gfx-mmio.m @@ -19,6 +19,7 @@ #include "hw/irq.h" #include "apple-gfx.h" #include "trace.h" +#include "system/address-spaces.h" =20 #import =20 @@ -34,14 +35,25 @@ typedef bool(^IOSFCMapMemory)(uint64_t phys, uint64_t len, bool ro, void *= *va, void *, void *); =20 +@interface PGMemoryMapDescriptor : NSObject +-(void)addRange:(struct PGGuestPhysicalRange_s) range; +@end + @interface PGDeviceDescriptor (IOSurfaceMapper) @property (readwrite, nonatomic) bool usingIOSurfaceMapper; +@property (readwrite, nonatomic) bool enableArgumentBuffers; +@property (readwrite, nonatomic) bool enableProcessIsolation; +@property (readwrite, nonatomic) bool enableProtectedContent; + +@property (readwrite, nonatomic, copy, nullable) PGMemoryMapDescriptor* me= moryMapDescriptor; @end =20 @interface PGIOSurfaceHostDeviceDescriptor : NSObject -(PGIOSurfaceHostDeviceDescriptor *)init; @property (readwrite, nonatomic, copy, nullable) IOSFCMapMemory mapMemory; @property (readwrite, nonatomic, copy, nullable) IOSFCUnmapMemory unmapMem= ory; +@property (readwrite, nonatomic, copy, nullable) PGMemoryMapDescriptor* me= moryMapDescriptor; +@property (readwrite, nonatomic) unsigned long long mmioLength; @property (readwrite, nonatomic, copy, nullable) IOSFCRaiseInterrupt raise= Interrupt; @end =20 @@ -182,20 +194,28 @@ static bool apple_gfx_mmio_unmap_surface_memory(void = *ptr) PGIOSurfaceHostDeviceDescriptor *iosfc_desc =3D [PGIOSurfaceHostDeviceDescriptor new]; PGIOSurfaceHostDevice *iosfc_host_dev; - - iosfc_desc.mapMemory =3D - ^bool(uint64_t phys, uint64_t len, bool ro, void **va, void *e, vo= id *f) { - *va =3D apple_gfx_mmio_map_surface_memory(phys, len, ro); - - trace_apple_gfx_iosfc_map_memory(phys, len, ro, va, e, f, *va); - - return *va !=3D NULL; - }; - - iosfc_desc.unmapMemory =3D - ^bool(void *va, void *b, void *c, void *d, void *e, void *f) { - return apple_gfx_mmio_unmap_surface_memory(va); - }; + PGMemoryMapDescriptor* memoryMapDescriptor =3D [PGMemoryMapDescriptor = new]; + + if (@available(macOS 15.4, *)) { + FlatView* fv =3D address_space_to_flatview(&address_space_memory); + flatview_for_each_range(fv, apple_gfx_register_memory_cb, memoryMa= pDescriptor); + iosfc_desc.mmioLength =3D 0x10000; + iosfc_desc.memoryMapDescriptor =3D memoryMapDescriptor; + } else { + iosfc_desc.mapMemory =3D + ^bool(uint64_t phys, uint64_t len, bool ro, void **va, void *e= , void *f) { + *va =3D apple_gfx_mmio_map_surface_memory(phys, len, ro); + + trace_apple_gfx_iosfc_map_memory(phys, len, ro, va, e, f, = *va); + + return *va !=3D NULL; + }; + + iosfc_desc.unmapMemory =3D + ^bool(void *va, void *b, void *c, void *d, void *e, void *f) { + return apple_gfx_mmio_unmap_surface_memory(va); + }; + } =20 iosfc_desc.raiseInterrupt =3D ^bool(uint32_t vector) { trace_apple_gfx_iosfc_raise_irq(vector); @@ -223,13 +243,19 @@ static void apple_gfx_mmio_realize(DeviceState *dev, = Error **errp) }; =20 desc.usingIOSurfaceMapper =3D true; - s->pgiosfc =3D apple_gfx_prepare_iosurface_host_device(s); + desc.enableArgumentBuffers =3D true; + // Process isolation needs to go through PGMemoryMapDescriptor + if (@available(macOS 15.4, *)) { + desc.enableProcessIsolation =3D true; + } =20 if (!apple_gfx_common_realize(&s->common, dev, desc, errp)) { [s->pgiosfc release]; s->pgiosfc =3D nil; } =20 + s->pgiosfc =3D apple_gfx_prepare_iosurface_host_device(s); + [desc release]; desc =3D nil; } diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h index a8b1d1efc0..0f7cf33adf 100644 --- a/hw/display/apple-gfx.h +++ b/hw/display/apple-gfx.h @@ -23,6 +23,13 @@ @protocol MTLTexture; @protocol MTLCommandQueue; =20 +typedef struct PGGuestPhysicalRange_s +{ + uint64_t physicalAddress; + uint64_t physicalLength; + void *hostAddress; +} PGGuestPhysicalRange_t; + typedef QTAILQ_HEAD(, PGTask_s) PGTaskList; =20 typedef struct AppleGFXDisplayMode { @@ -68,6 +75,12 @@ void *apple_gfx_host_ptr_for_gpa_range(uint64_t guest_ph= ysical, uint64_t length, bool read_only, MemoryRegion **mapping_in_region); =20 +bool apple_gfx_register_memory_cb(Int128 start, + Int128 len, + const MemoryRegion *mr, + hwaddr offset_in_region, + void *opaque); + extern const PropertyInfo qdev_prop_apple_gfx_display_mode; =20 #endif diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m index 174d56ae05..238b227176 100644 --- a/hw/display/apple-gfx.m +++ b/hw/display/apple-gfx.m @@ -21,6 +21,7 @@ #include "system/address-spaces.h" #include "system/dma.h" #include "migration/blocker.h" +#include "system/memory.h" #include "ui/console.h" #include "apple-gfx.h" #include "trace.h" @@ -596,6 +597,41 @@ void apple_gfx_common_init(Object *obj, AppleGFXState = *s, const char* obj_name) /* TODO: PVG framework supports serialising device state: integrate it= ! */ } =20 +@interface PGMemoryMapDescriptor : NSObject +-(void)addRange:(struct PGGuestPhysicalRange_s) range; +@end + +@interface PGDeviceDescriptor (IOSurfaceMapper) +@property (readwrite, nonatomic, copy, nullable) PGMemoryMapDescriptor* me= moryMapDescriptor; +@end + +bool apple_gfx_register_memory_cb(Int128 start, + Int128 len, + const MemoryRegion *mr, + hwaddr offset_in_region, + void *opaque) { + PGGuestPhysicalRange_t range; + PGMemoryMapDescriptor* memoryMapDescriptor =3D opaque; + if (mr->ram) { + range.physicalAddress =3D start; + range.physicalLength =3D len; + range.hostAddress =3D memory_region_get_ram_ptr(mr); + [memoryMapDescriptor addRange:range]; + } + return false; +} + +static void apple_gfx_register_memory(AppleGFXState *s, + PGDeviceDescriptor *d= esc) +{ + PGMemoryMapDescriptor* memoryMapDescriptor =3D [PGMemoryMapDescriptor = new]; + + FlatView* fv =3D address_space_to_flatview(&address_space_memory); + flatview_for_each_range(fv, apple_gfx_register_memory_cb, memoryMapDes= criptor); + + desc.memoryMapDescriptor =3D memoryMapDescriptor; +} + static void apple_gfx_register_task_mapping_handlers(AppleGFXState *s, PGDeviceDescriptor *d= esc) { @@ -763,7 +799,11 @@ bool apple_gfx_common_realize(AppleGFXState *s, Device= State *dev, =20 desc.device =3D s->mtl; =20 - apple_gfx_register_task_mapping_handlers(s, desc); + if (@available(macOS 15.4, *)) { + apple_gfx_register_memory(s, desc); + } else { + apple_gfx_register_task_mapping_handlers(s, desc); + } =20 s->cursor_show =3D true; =20 --=20 2.50.1 (Apple Git-155) From nobody Fri Nov 14 22:21:12 2025 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=1759869172; cv=none; d=zohomail.com; s=zohoarc; b=jszrRXd05UU0zDqPQuAmSujM8bSOYK2ghAyPhgNByAZocz7uAQB2RVKzdjCkYjI7KJ5D3VoEUhQR4/dZn6SVFwlyloQt7mnX/topxcWwyZPY9kwRrxaC5NaTYx6nP1t0GLFJSzGuJ+/1l8ztJUAgL1ZCLtCKnebx8ElZcYK3+ZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759869172; h=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=OSfJsyCDwAqS7oFBBDNRe2fV3jYPTUsP549HW/w547Y=; b=VkTNgWmV/YdHAF2IPpAiQqDFLEi6QJxeYSfNtROwK3u9T52r0CEiT8W/5+2hZ4Eusjei1QruCp/mlliDDZz4F2IaSD6CjFQE1vsIFuR/T7Rmor3ws2YD+TRalj7/j7GVBCMVRYbsA078vkW/pMu4Cxr5q5g3BALOP7VgiSh9FBo= 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 1759869172759707.4381315024561; Tue, 7 Oct 2025 13:32:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6ELz-0001IH-I3; Tue, 07 Oct 2025 16:32:11 -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 1v6ELy-0001Hi-9v for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:10 -0400 Received: from npq-east2-cluster1-host5-snip4-2.eps.apple.com ([57.103.77.85] 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 1v6ELw-0001BC-8z for qemu-devel@nongnu.org; Tue, 07 Oct 2025 16:32:10 -0400 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 9EFEB180172C; Tue, 7 Oct 2025 20:32:04 +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 8A73E180058C; Tue, 7 Oct 2025 20:32:02 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=OSfJsyCDwAqS7oFBBDNRe2fV3jYPTUsP549HW/w547Y=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=FMBFmAz0/b/C0co0iFCz87S3GsFudzPa76JhWtr1d7dCoOq9pyAkSpsSuYkpMiUofMpqau1Ue8ITLxuO3FLVws34SdnC8zy0Ps7zZr45ksm2QdkpH720vISpGBbY5YJtk9c/a7b4djaYYWmC7yAmet95OnhnQq6pfBqs4tYIG7JBVmUlkDayjchlQhIt3EXcruDPBGG0mJ4G7my4WxNVsaqe1WdNFt6gTF0QtJ40bZH4Mw3wz3+4p79Vd9l74e0eM+iuSDALPekL7vbjXTCxQmUXuMh82xElBVNyBE/GlmGbKZskvLZ1Qniv/8dl/rJEw2vRgQ4oJ/Ouo0LbAMzibg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mads Ynddal , qemu-arm@nongnu.org, Cameron Esfahani , Peter Maydell , Roman Bolshakov , Alexander Graf , Phil Dennis-Jordan , Mohamed Mediouni Subject: [RFC v2 4/4] Revert "hw/arm: Do not build VMapple machine by default" Date: Tue, 7 Oct 2025 22:31:53 +0200 Message-ID: <20251007203153.30136-5-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251007203153.30136-1-mohamed@unpredictable.fr> References: <20251007203153.30136-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Qj_kxa-INi_6ILbsCBfgCRdVMAD9Fh62 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA3MDE1OSBTYWx0ZWRfXyDT7KJrunQzx dUUiOfyxEWn+WyBDoil7UzfBe0QsITTuvO8S6Mm2gTZWTGMJ2KHuNuaQKeq6jBGVd/QqIDvqkt4 eP11Izhxo++3O4vHN4AQTPIm04ip12hNR9gpsM96Owi0pa0fm3pNE2RRQFukN/EukW7A2o1pplA uRNnC4FVJHQ2rBr/8k33Idn4BnODAEyPTB8Z1gbUjWLJjTYcLsYiKyPCGmUAzVMIRDN1iQF25/M Gb3KLbOwOfZoVOFG0zHhyWuxuL1GH49Xv5MIrHRAqhpQIWkAN+4DgOuZ5XZ5W7mDdt8YhWiuM= X-Proofpoint-ORIG-GUID: Qj_kxa-INi_6ILbsCBfgCRdVMAD9Fh62 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-07_02,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 clxscore=1030 bulkscore=0 mlxlogscore=620 phishscore=0 suspectscore=0 mlxscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510070159 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.85; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1759869174427154100 Content-Type: text/plain; charset="utf-8" This reverts commit 49551752e860f5e403cdacac11ee1d218141fd3d. Signed-off-by: Mohamed Mediouni --- configs/devices/aarch64-softmmu/default.mak | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/devices/aarch64-softmmu/default.mak b/configs/devices/= aarch64-softmmu/default.mak index ad8028cfd4..93f4022ad6 100644 --- a/configs/devices/aarch64-softmmu/default.mak +++ b/configs/devices/aarch64-softmmu/default.mak @@ -9,4 +9,3 @@ include ../arm-softmmu/default.mak # CONFIG_XLNX_VERSAL=3Dn # CONFIG_SBSA_REF=3Dn # CONFIG_NPCM8XX=3Dn -CONFIG_VMAPPLE=3Dn --=20 2.50.1 (Apple Git-155)