From nobody Wed Jan 7 09:26:51 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=1767021649; cv=none; d=zohomail.com; s=zohoarc; b=fMoBQxIQkm3kQct6c5E6GC002OBhGomxjVO2DOZYYqhI+sk84Upnei8mWsR9snyQkykk5Zszir1IW+JNF0cQtPtYLblQdBbxsEgK4Dm8fASWdUcaaWZkibh46RqPnbe8L48ATQlKWgMveAV9lhg7J4UCKhUd2xNUoG2d53jA+Bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767021649; 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=szFA/LKTL8zYcXa07dWwkVr1kJdkuzI3VcaFYOV+ul4=; b=Tm1Y1i+ljmTYwNqYz2EoIqq5KMlUvmpjVWuMbUq2sgKrOqJA9Wn+DQ1IpdkWGoZj18lweTNyOA8QgOGDXIe+pwi0eAKV/B6IrwzsJZ43CUZ5K/RQU/zVWTIwCy+RATPsbM5IJEF9g32kGvaX4hzdcSsywBzdmLlgu/M1Y8ZyU/w= 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 1767021649026923.8448057272003; Mon, 29 Dec 2025 07:20:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaF1n-0001XK-63; Mon, 29 Dec 2025 10:19:23 -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 1vaF1h-0001Vl-Bg for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:19 -0500 Received: from p-west1-cluster4-host10-snip4-10.eps.apple.com ([57.103.65.171] helo=outbound.pv.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vaF1e-0004dJ-T6 for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:16 -0500 Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPS id B66C51800143; Mon, 29 Dec 2025 15:19:09 +0000 (UTC) Received: from localhost.localdomain (unknown [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPSA id CB29018005B1; Mon, 29 Dec 2025 15:19:06 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=szFA/LKTL8zYcXa07dWwkVr1kJdkuzI3VcaFYOV+ul4=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=HaSxMyiVkw6tdBsU/Nm74gQcxYHjH9afpSzVDz7jWZ+3wC7w31KsL1XmJud8mrDNfNgbomv4YRGgz86oGXtHa7uovwV5dF2L3yBTCd/qCEuj+3xk2uoCQAt3Q2MwgeHEWtCnyXwx2TPjB3boQnYsyaTutWSu1ymogLKbMDz5s5p4T5zAGULOr7p8hLMM5ieZJRbu76w51Nn98ZxFmx6v/EuqMkhNV295z1U2eYTF/DbcMhlDSLyRB0i28zDLcTQcmYTqhb4CxyAVI0FjyK1TTQRZ2V9PIRKJUBxFayIZKnXybM8fxos+9O4KrZKc7rVkvJ9GfdutwM0bMvutsywoxA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Alexander Graf , Peter Maydell , Cameron Esfahani , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [RFC v3 1/4] vmapple: add gicv2m Date: Mon, 29 Dec 2025 16:18:47 +0100 Message-ID: <20251229151850.96852-2-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251229151850.96852-1-mohamed@unpredictable.fr> References: <20251229151850.96852-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: RIEjxuMWSsA07UFRTdNFqFO4ecZ7ihjr X-Proofpoint-ORIG-GUID: RIEjxuMWSsA07UFRTdNFqFO4ecZ7ihjr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDE0MCBTYWx0ZWRfX7CjdVtL7N9g1 XCZylIMcIgLcm3x9cT3J2H7doodBLGV1aCO3VDeOURRxvH0aQ2m1r8U+iKrwQqIB0KzUIIr59Wn YYEKE/FDWJOLhPgt/qkr8xuqlNzrJyzQ46OnbtUt9fZ0OnIMh/b4DRKqTbY3TxHCo5z0TEw2DUV 9xsFBcODU5xtPYzg1Mb5+CrQQ9EWBfiUGv4Sqax9Ack6m2i+KSTx0GwXYNgoNBix0eg0wT/T4NM LQEwyCwuAALYcePvu4Z9pSxIIumz/HIVkDlCb/U++B3P8JmQyu8id8y4mQPGM+iSYcou3zIylls shkSENDC7MOS/HjZkij X-Authority-Info: v=2.4 cv=JNo2csKb c=1 sm=1 tr=0 ts=69529bef cx=c_apl:c_pps a=azHRBMxVc17uSn+fyuI/eg==:117 a=azHRBMxVc17uSn+fyuI/eg==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=sAlVIecbGMDsLuTEZI0A:9 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=2025-12-29_04,2025-12-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 phishscore=0 suspectscore=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=859 adultscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512290140 X-JNJ: AAAAAAABiiQYHiswxJVzJRd7t73xdrkLyRNNQC5dwPPgcZzLkhbnDqVDWNAKnNnSQCEpTcdTr2wvhm2P3AvtM+q+fcWxNmIxOEdCHA5qgPnjtWAlfS8BZCjXgNXfPro3KoGuSw09nDXQaL3Ioblxd4mB8Ht4THMc0Ys3m09lEJnPh2XDr5WtIqv7WEMpGgJuoxcQaGeunnvoNAn889qvmTBkdWD7lx04xHi+GuUSskixxlHv9OImiSP/qxUhg3uaDIVAzeSsI23wiGGrqgg73+o/grqwqhDFYHr+2oT2DuYyvEpuCTRieXi0u91VWJ69GenFgpamDhXbN0nPxc143Apw8YIlOHXjLP8/Gr33UIejpFnVHTsR7F+xjOzFJFJOGic/Cv2oAuzHikgC2/bJ/LIcbpq876wJiQpnWyVqIzqt0/MoNlR7CNhA44tqYY1U9aEIhU0VVqcwHLFXbTFo5hzzN3BXpjE7mnlWdmghMT2Qe+mrExkRl1Ul2SPsgBaQBjsh3t/ezFodR7Yo9Hck21KQIiWIGKZZ+ZqHCvIlg0V2plzBunwfgGBdQMd+lf+I6Q6iyGsDI4D0yFLWOvLQdA05n9hGkkrmeKvEwnnm5KjAKSk2STsX0Bplv7igwTYDDtk7JaR+UTukfoj4hFhdk/ZzPCpssBu14DHAcN73lQbbR3Eb7xajzw+dbNewYqDQQbvN1K4= 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.65.171; envelope-from=mohamed@unpredictable.fr; helo=outbound.pv.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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 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: 1767021651479158501 Content-Type: text/plain; charset="utf-8" This device is used by newer macOS guest releases. Note that macOS does memory accesses through LDP to this device that don't meet isv=3D1 conditions. Signed-off-by: Mohamed Mediouni --- hw/vmapple/vmapple.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index b1379eafef..8de7bbe6cd 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -83,6 +83,7 @@ enum { VMAPPLE_MEM, VMAPPLE_GIC_DIST, VMAPPLE_GIC_REDIST, + VMAPPLE_GICV2M, VMAPPLE_UART, VMAPPLE_RTC, VMAPPLE_PCIE, @@ -104,6 +105,7 @@ static const MemMapEntry memmap[] =3D { =20 [VMAPPLE_GIC_DIST] =3D { 0x10000000, 0x00010000 }, [VMAPPLE_GIC_REDIST] =3D { 0x10010000, 0x00400000 }, + [VMAPPLE_GICV2M] =3D { 0x1FFF0000, 0x00010000 }, =20 [VMAPPLE_UART] =3D { 0x20010000, 0x00010000 }, [VMAPPLE_RTC] =3D { 0x20050000, 0x00001000 }, @@ -286,6 +288,26 @@ static void create_gic(VMAppleMachineState *vms, Memor= yRegion *mem) } } =20 +#define NUM_GICV2M_SPIS 128 + +static void create_gicv2m(VMAppleMachineState *vms) +{ + int i; + int irq =3D vms->irqmap[VMAPPLE_GICV2M]; + DeviceState *dev; + + dev =3D qdev_new("arm-gicv2m"); + qdev_prop_set_uint32(dev, "base-spi", irq); + qdev_prop_set_uint32(dev, "num-spi", NUM_GICV2M_SPIS); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, vms->memmap[VMAPPLE_GICV2M].ba= se); + + for (i =3D 0; i < NUM_GICV2M_SPIS; i++) { + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, + qdev_get_gpio_in(vms->gic, irq + i)); + } +} + static void create_uart(const VMAppleMachineState *vms, int uart, MemoryRegion *mem, Chardev *chr) { @@ -496,6 +518,7 @@ static void mach_vmapple_init(MachineState *machine) machine->ram); =20 create_gic(vms, sysmem); + create_gicv2m(vms); create_bdif(vms, sysmem); create_pvpanic(vms, sysmem); create_aes(vms, sysmem); --=20 2.50.1 (Apple Git-155) From nobody Wed Jan 7 09:26:51 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=1767021624; cv=none; d=zohomail.com; s=zohoarc; b=ms8WOJLqtNRG2bdbcha1S19NiDnpExs/AoCkft83s/Tv3ZTMAyuAkS2JD9bqORyFzA8bDGYMtzg6kMZTYr2uczMmuIbqhShKfHv/M2C7/OXgZxfrt4bCT7fwgMkG6V7AUv8MIbhuvEpqwHLx0ewQowu3WRtu1R+QiMEMD3EVcPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767021624; 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=lgwCp5DfxciUDn8r7r6up05OxWfXTLGq2WF/7T24a1c=; b=fkXWbq77fongrbCaOVWhlAgCz/wRDXcZiWckZQB9tVW/ufnYAsOZfJnbx7eTvnMGTecOsnhc5BFXH4cHPRdiB1uekhTZ9Et05sc7VIyB10wjgiBgr5xcuzDE01hGcza0v5Nsz0UC5kLreUGEvcKPg1AXkcc3HaqUrf1iw0bhBys= 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 176702162390976.94848151050292; Mon, 29 Dec 2025 07:20:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaF1q-0001Zi-TG; Mon, 29 Dec 2025 10:19:26 -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 1vaF1j-0001WB-9I for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:20 -0500 Received: from p-west1-cluster3-host6-snip4-5.eps.apple.com ([57.103.66.18] helo=outbound.pv.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vaF1h-0004dZ-3o for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:18 -0500 Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPS id D755E1800293; Mon, 29 Dec 2025 15:19:12 +0000 (UTC) Received: from localhost.localdomain (unknown [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPSA id 000DC18005BC; Mon, 29 Dec 2025 15:19:08 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=lgwCp5DfxciUDn8r7r6up05OxWfXTLGq2WF/7T24a1c=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=UGc8MIpoYBZBd4ub7fNh0nRxV50+2j8/kmK+Wc1g0OSdnAFmVjGilIjOLhVyAXlMFApDlUFk/fmW3OoLeKAxRKrCPve8kS8GKngzJe6qbnZxDw5ClEafzY0VQwWWdAaqFiYJ3PartGWoHajRfwIdUlW8K8CiDROyzUyF6BeEABvI8PdT4h3cDVFhhbgfcmOVxs0pZmJY0ZC67aULQc/wyNcBL/ubK3jxK+IuOuHCtHkhCjDwNJnfBRdjV8E5GE4PFX6MmRGpHwjjtCI4vljrFbZO+eSX+whke0j/bdXQKwd/TuJxjUZF9HTDiHbOlsed9wYwmGayQGVVKAlyxh6jdw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Alexander Graf , Peter Maydell , Cameron Esfahani , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [RFC v3 2/4] vmapple: apple-gfx: make it work on the latest macOS release Date: Mon, 29 Dec 2025 16:18:48 +0100 Message-ID: <20251229151850.96852-3-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251229151850.96852-1-mohamed@unpredictable.fr> References: <20251229151850.96852-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDE0MCBTYWx0ZWRfXyMGK16BH7AJH QFR/P2A4xCGjYRgCmSmFIpi6X9URvYfqrPyHIcyM/1KZxECNzWxzj9Fm0E5g6igGXfNVefxwguy 4AXw29GARW0KGHYrPAVw1HszrPshUZUzYSxT8rIVVHtUdOW6t6XVkqYGDKkmMA3+juS3wDqmNFF aryRjyvKUEaebh2OW4Bm0bp5VQ/JjM1rWicvz+k/MDw/5SpD33TOA84S7px9zDkaE+6D/w/Xl8Z BV8kCEG8FqzZy1zWX9YvaXZgsrSM16Sl6zHajc/970AZZiAswntTl3FvfqDrjQnTaBZrzyCd+P6 GZwKUrowtWxui+RBmh+ X-Proofpoint-GUID: jTB4IL4EJfCznX7_eMSjKVNkxBWFjiEO X-Authority-Info: v=2.4 cv=d+b4CBjE c=1 sm=1 tr=0 ts=69529bf1 cx=c_apl:c_pps a=azHRBMxVc17uSn+fyuI/eg==:117 a=azHRBMxVc17uSn+fyuI/eg==:17 a=XaNHVGzJZ3ayr3Wv:21 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=qV0ahJ5E5Ghjqxzh6q4A:9 X-Proofpoint-ORIG-GUID: jTB4IL4EJfCznX7_eMSjKVNkxBWFjiEO 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=2025-12-29_04,2025-12-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 suspectscore=0 bulkscore=0 spamscore=0 clxscore=1030 adultscore=0 phishscore=0 mlxlogscore=999 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512290140 X-JNJ: AAAAAAAB+FbBXeRK+XBThZrM7nu/u6Xy8c7jSQGFNR5Rd+mrXOnCyLIEbawzsKPjzuJHVRj8LzJRyfp/JpsAl4/sEdtydlVGcjpJPr+IaUQLG5w34AT3WRNbagWGaU1WcTH58GUfTczPWyKiZKNwAXTkDTGMDX4gL/ucUPDG/KNXTK/InxwDwvVv5rGdunQQ1xwU/fHI3ad69STk99u1TFF2itZIaAQFAIajhXn1BUQ8oslhnfstJOqB85LPkPZkFCdfQBPpLxp/SoXuTpfN7BL1wbpDeEoyEzzMnseIDJTZPO3RHTfFIlCKpmphLOsFT/q3ttz6SoiWyIQRyl5Hfpka/xA/7KPokGQ6ZifVRjSxDmvsqtCkR4TXxOD5u88ISLs9r/0rekTmC6AFZ6aKxvP9JLJq75Gkh7ScP9+GT1MTj/qtWm3aiCWPq89cSUXhZjRRyOM99YsGqbAWWq4XnP1Za5lsGoByN/fj84Fp4oJ3UKy9cGtJ4a9tvgvvfFgGzMWnbWmmg/vg5GtJpylCwx42wSitNROT/yH3ZH0RzJeBU/5W2+dYz0qs9WZJ6Y/v4al0JjzBqU6owWNFslEsy7TZkNiJoinQ1P4iaofi6WeKtheviCON/f113SEKh+YicL5RqDYdHG36BSvbLsUUC3/8QDdB8VprT2eRwgRgk2x0QzTp+vjmkcdQ8dQBnT71jQ6ISdqMF9thd2FK 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.66.18; envelope-from=mohamed@unpredictable.fr; helo=outbound.pv.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=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: 1767021630142158500 Content-Type: text/plain; charset="utf-8" Follow changes in memory management introduced on macOS 15.4. The legacy memory management API has been removed for the IOSurface mapper = on that macOS version. Also enable process isolation for a sandboxed GPU process when on a new OS. Signed-off-by: Mohamed Mediouni --- hw/display/apple-gfx-mmio.m | 65 ++++++++++++++++++++++++++++--------- hw/display/apple-gfx.h | 13 ++++++++ hw/display/apple-gfx.m | 47 ++++++++++++++++++++++++++- 3 files changed, 109 insertions(+), 16 deletions(-) diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m index 58beaadd1f..2031baceda 100644 --- a/hw/display/apple-gfx-mmio.m +++ b/hw/display/apple-gfx-mmio.m @@ -19,6 +19,7 @@ #include "hw/core/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,33 @@ 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]; + + /* + * The legacy memory management API is no longer present + * for the IOSurface mapper as of macOS 15.4. + */ + 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); + /* Single-page MMIO region: 16KB */ + 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 +248,23 @@ 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; + /*=20 + * Process isolation needs PGMemoryMapDescriptor instead of + * the legacy memory management interface present in releases + * older than macOS 15.4. + */ + 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 3197bd853d..1b94a55a7d 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 e0a765fcb1..68ca8e93b6 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,16 @@ 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); + /*=20 + * The legacy memory management interface doesn't allow for + * vGPU sandboxing. As such, always use the new interface + * on macOS 15.4 onwards.=20 + */ + 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 Wed Jan 7 09:26:51 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=1767021638; cv=none; d=zohomail.com; s=zohoarc; b=eSBgJ7UC5A4r+91OtCy4qiP6MriQjIWbg1Mmp0bh3t6D6VPoqBnbaCPPE+PENyYRx/6QpcTmz4ksl2uuaT6P/x7uvHCGf2/TFPQM1V/5R9tirop3Dt4luUOStS5F12jrJ8wHX4eHOyRUidtxbhkvs6Cxn4+V1q4x7h8GogjEZbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767021638; 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=uL7SH/8eLEnNDGttJV810T7r+i9fS8o6dskAKag2GG4=; b=aE0p03PE853a01r4KZrhytypwDZXShfhp4rUa/rccudR4HY36iiPT0yair8SbEYi8JXrQnFwjmPG9K5qDLvmTs25Ho/cuN3qziLtx/Z9jc4w+Jy/xOi0qmCtqJ2cHQohBAcLmSs8QXk/YB0T7rY87QGoG3T87numNOcDzn2Hi88= 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 1767021637874146.91663272923313; Mon, 29 Dec 2025 07:20:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaF1p-0001Yh-BH; Mon, 29 Dec 2025 10:19:25 -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 1vaF1n-0001XW-5u for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:23 -0500 Received: from p-west1-cluster3-host8-snip4-3.eps.apple.com ([57.103.66.56] helo=outbound.pv.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vaF1l-0004ev-Lm for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:22 -0500 Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPS id 1A2951800954; Mon, 29 Dec 2025 15:19:15 +0000 (UTC) Received: from localhost.localdomain (unknown [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPSA id 58BD21800941; Mon, 29 Dec 2025 15:19:12 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=uL7SH/8eLEnNDGttJV810T7r+i9fS8o6dskAKag2GG4=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=MBf/3yvnf+VFahpeiDnbESlGAcAsVdsvlGiX03gxBD7X7u7NEhdnidMX/EEuvQ4i2M1B4wEbeyTuQrW7Ldp3CzxaOsFDPxobIYC0MYygPpuCcvUVebMFkADIVzseRpi4HSiSXNgkFTtKqkVxSci1HbIynrFoic7j5WWHWwYbVDhP9Bn4GspvlYTEwyxktSafdtKiW2NyZIkPFBMAxG690BXKVWK9fVv5BDFYBeecxyNolpvn0s7qnC7urOJTCPWhQdVorZzAgXp27s2aL1Ha/++1Wop8XkdjwSCiLFg3OkMTLvhzM4VTyPvTvUORxa0kzP/i82MnwlKgKd71s0AP/w== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Alexander Graf , Peter Maydell , Cameron Esfahani , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [RFC v3 3/4] Revert "hw/arm: Do not build VMapple machine by default" Date: Mon, 29 Dec 2025 16:18:49 +0100 Message-ID: <20251229151850.96852-4-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251229151850.96852-1-mohamed@unpredictable.fr> References: <20251229151850.96852-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: N6D747HQFlNLkDwW5PGYPXr9R5bWp5Jz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDE0MCBTYWx0ZWRfX0XJX/j9dqz3/ exfw6WkvSf+O+IlEocJQTx9dvhivIQipKBu7rCKfPxflGAv58fyUDYj6xpjJXPbPVyRazC9m394 bbgJeKHd4BeI4NjYqB/bDZhez0HBwEB7Fv3FvdFOdL1J5gaOYXkaBnWUBQaaVEeiRhbuj5+cOGg Yr9GHgu+HGaKtse7ainaJBShEcZk+PyJhs1SQUTrTbAomGeZ+KBM8gfJA75GA7aAO+uPxABOQZQ bMK6LdQqRQAiqWpAGeWDCGgBotyPe/nbaZ/aN6E1yL8wDOEs6skwvpc55fhxPo4XJY287Ok5HJD yFRkKbvTrUYXKBU6eVu X-Authority-Info: v=2.4 cv=SLJPlevH c=1 sm=1 tr=0 ts=69529bf5 cx=c_apl:c_pps a=azHRBMxVc17uSn+fyuI/eg==:117 a=azHRBMxVc17uSn+fyuI/eg==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=XkhoILwbEVSdr8iLt8MA:9 X-Proofpoint-GUID: N6D747HQFlNLkDwW5PGYPXr9R5bWp5Jz 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=2025-12-29_04,2025-12-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 bulkscore=0 mlxlogscore=756 suspectscore=0 clxscore=1030 spamscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512290140 X-JNJ: AAAAAAABMVgA1w67tcE7Ds/X035+v6zi7zq5qvuef2OrEh9WbSOB6+yb4BTkxD+6mnXGjRJxL3P5MI1Ue3CNvUX8g5xEHjckvDO+zbMzTMWOuwy7juMfhUXLKEs7QXKF8i3BkywWntbVehIxeu6Exhns/z85JOQ7ybB5CdcdvaQNRXDnPEI9Ec08BsxJqDjmFAhg8d+PZQCgSrzvEhsUSfEuHXJe3WpswwjQTDlSU2qlpjN4xrgWf6Z//94eFq680RYsKnDAztewTL5fEtYRCgQdK5LTFcFkd+4Afj9GAKMSaAna28sW4BY4C4p1r/eHu9+QEvFpbEvWeL32828JsBt02hH/rvpqHPX5/NfbaBC0ZuECLDhW2WAtdgzhzvwSKV5sWjgzA/Vk1xZkHNU27CLzVE28UcK16u4J7rePfUTR36SfwoEyYENeNJlBfLD+zGed15XHKQeQMpmxRiaY9BQzid7XyQvbwZKcdJNA1et+CRcdPVw/mHjyuDIZQPMUHR/Fgr4zD2nGsB9+6oWRmTQU/FxLRCjZKg8Rf9PWg4+CYC5I1GBa9R2nnxSEzFLnZ8ncKSpt3CJ/5kfMt8p8RglYdcDxaGJJQVq1mhf5x9s18yftQak9ge8QKaCXUgDe0o7B3uUE06uFpObmzfCym+bqgXU87QpQWJZJCNi6Sy9y/HEPeFkoIjrtW4rqZ9/rB0tRk+m/T/2mxNGYssiF3i4= 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.66.56; envelope-from=mohamed@unpredictable.fr; helo=outbound.pv.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=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: 1767021641514158500 Content-Type: text/plain; charset="utf-8" The vmapple virtual machine is now functional on newer macOS host releases. Revert 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) From nobody Wed Jan 7 09:26:51 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=1767021624; cv=none; d=zohomail.com; s=zohoarc; b=eFjE0yCa6DOReQFJamTuywjW+yZwGzehOO3u3IZMGU9IrNmOeVev4X2mtwGcijGVpe3U+BU2IQJzyV0B1rRrZH+3SlKg3hOxswpFsNZ7MSkKNpy1YOjcWg7F7FK7ns/PYm4mYPbfVJuw527l+ogndkmodudsym/yFZecNiIS/ys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767021624; 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=FNuw/1w+nGWHVOq38C1g66qh9K4tOBSity8k1sxxShU=; b=gFm07DbjLGgZVCwllq4g+nZaC+KxdcPqIU1OGrA+0oHAGObOsstyhItnni+jIxfULTBRwJmNj4Qbl8J9m1ZFm4wExWZZWlCw4TXFFYeDFBjrEOyA8c8OjtKYB6uAnXLAHsMcst6pZGYC2+jUAFIr7S2FGhnGS4K/fgJSdFI15pk= 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 1767021623683167.46883020094162; Mon, 29 Dec 2025 07:20:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaF1s-0001bP-W0; Mon, 29 Dec 2025 10:19:29 -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 1vaF1q-0001ZU-HU for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:26 -0500 Received: from p-west1-cluster3-host9-snip4-4.eps.apple.com ([57.103.66.87] helo=outbound.pv.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vaF1n-0004fB-Ba for qemu-devel@nongnu.org; Mon, 29 Dec 2025 10:19:26 -0500 Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPS id 87933180059F; Mon, 29 Dec 2025 15:19:18 +0000 (UTC) Received: from localhost.localdomain (unknown [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-10-percent-1 (Postfix) with ESMTPSA id 663EF180017E; Mon, 29 Dec 2025 15:19:15 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=FNuw/1w+nGWHVOq38C1g66qh9K4tOBSity8k1sxxShU=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=ToiMIoahNlipkaJm78I1AI0Md/uyZqC6ql1RZsbOxlQ2G4P/UoFVLaeed4I3NbjsTn4Sd1mRVJarhOsMl5Gw349zBibKwUZKm927JXd4mRmDNAVRIC2YmbyJrzqzbB8TWFnLWfCfanlkIEH/qP8R26UiO0Ob+ZUxL7ClAHn4lMqFpJUIDKCA8gLMYaLiH/XnZc+VbYChheZkVmJyxJVfcrmFtstY+d48h/iXPHo7nLae/iriP/SQutxRyxb6tHH08Q5cikrdlfPIEPbazr+vDh1PK/2Ej/pyeuSvqpCSOZDapjTxmB4SypqSR4p9AxemZ7DwCryps9tLDgjGc2LQfg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Alexander Graf , Peter Maydell , Cameron Esfahani , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [RFC v3 4/4] vmapple: apple-gfx: move legacy memory management APIs away from inline Date: Mon, 29 Dec 2025 16:18:50 +0100 Message-ID: <20251229151850.96852-5-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251229151850.96852-1-mohamed@unpredictable.fr> References: <20251229151850.96852-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDE0MCBTYWx0ZWRfX71Ri1LYNKNOz uDFJB74T1xSXfjZ/NkVDbmmxxFfpYZEinBs//hgc8xMUbin2OcasFYhk81l2HmMwt5YRT9Fz9AI gAH948AzhNPn0GvHsvC5kTwiYYZ9MRHYfMNuDy3HVCrC+5qTOizq0thkM3pmJ1eWHR6Bilkdw/9 0mNAcMJT3PwYYQ0LcueUeZXOFw4Tam3YL1xjO6q4R4WjvbQKMqNjJGGt+gMKyKXmSlD1hD8WqJ3 jWNlsdYIObBJg/xWJDRmTFwX8jL+Pi9egDTEr2FfDNn/bWSjLuCMylG/sIN2HA6vUim225Slo9f rDSuLUYv2HRz/VAyk5u X-Proofpoint-GUID: bY1_-ADT44DDryR-Mxtfl0iz4gVDaC9W X-Authority-Info: v=2.4 cv=d+b4CBjE c=1 sm=1 tr=0 ts=69529bf8 cx=c_apl:c_pps a=azHRBMxVc17uSn+fyuI/eg==:117 a=azHRBMxVc17uSn+fyuI/eg==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=FpLd5HJXVXburdsqXX0A:9 X-Proofpoint-ORIG-GUID: bY1_-ADT44DDryR-Mxtfl0iz4gVDaC9W 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=2025-12-29_04,2025-12-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 suspectscore=0 bulkscore=0 spamscore=0 clxscore=1030 adultscore=0 phishscore=0 mlxlogscore=873 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512290140 X-JNJ: AAAAAAABktGsXMBwZy3ujeKEHyvxF4hasdvONxMh7/iPdXA+oioWOe07sTjhLIqrKnx6B8Tbt0x38F93Vyn5P+4Dec/1qrWyEELLQt9y5TsyCm9V/620fDabeV3fGpoIrcmPHEz4HF2+MfYrag/MS33K5LyCXxcCyxwnTD/BXH8S4WNQOE6MRY/BFWWO/di6RnPEfvTt/k5x+tPXhY9YKlYmoPQ08rq0MR47PFWvPwmErMreHyrD4TG2k0a/0tEHxxt245Y3pUWiifZPua6U5pka2Lt4U/f8KQbigM9NT5Q/UqGmqQiYKeGFdFv0GccIjr54YKWROwNGpSwsX1CoLt9BhGuTxZ3HIqc+0kcfspp77aP8SNFNIWFVPlHuqYPOjR0YeAbVVWdfF1NXyt92CRlzFOzAB2gfraH61IH5FJAJti7SHiM751WCVwsfaI1hzmRKzNZjKPeH00X5v7n5Aae/24qtP8E6LCiokMVaWBbdfUCPujVtGnpb5yddg3shgA2H5ryrXQLSZoBUyyyb+h3fcWBE8nxEIvfXAl85mO6FF5K3iHoXHEujfMSvhX1T52xsRIej6ma4AOSmet2iQArqUf9tp1yfFM9F8ISSXmRMqTxQf4M+mxiU0/wNhuXv2tOlrt9pq0woutT+CCWax2HTscdrfLM2hIssP7OpoK+LtZmieiVAMtTxyUVdO9FFxr0jTCyBCr7rHjMe/E3XR2a51yg0jvjk2yBovv+glryNdg== 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.66.87; envelope-from=mohamed@unpredictable.fr; helo=outbound.pv.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: 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: 1767021629906158500 Content-Type: text/plain; charset="utf-8" They're not function pointers but blocks. Adding this to address review comments but I don't think it's worthwhile. Signed-off-by: Mohamed Mediouni --- hw/display/apple-gfx-mmio.m | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m index 2031baceda..fa4362653b 100644 --- a/hw/display/apple-gfx-mmio.m +++ b/hw/display/apple-gfx-mmio.m @@ -188,6 +188,22 @@ static bool apple_gfx_mmio_unmap_surface_memory(void *= ptr) return true; } =20 +/* Legacy memory management API: Gone in macOS 15.4 and later. */ +static bool (^apple_gfx_map_memory) + (uint64_t phys, uint64_t len, bool ro, void **va, void *e, void *f) + =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; +}; + +static bool (^apple_gfx_unmap_memory)(void *va, void *b, void *c, void *d,= void *e, void *f) + =3D ^bool(void *va, void *b, void *c, void *d, void *e, void *f){ + return apple_gfx_mmio_unmap_surface_memory(va); +}; + static PGIOSurfaceHostDevice *apple_gfx_prepare_iosurface_host_device( AppleGFXMMIOState *s) { @@ -207,19 +223,8 @@ static bool apple_gfx_mmio_unmap_surface_memory(void *= ptr) 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); - }; + iosfc_desc.mapMemory =3D apple_gfx_map_memory; + iosfc_desc.unmapMemory =3D apple_gfx_unmap_memory; } =20 iosfc_desc.raiseInterrupt =3D ^bool(uint32_t vector) { --=20 2.50.1 (Apple Git-155)