From nobody Thu Jan 8 13:17:12 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)