From nobody Sun Feb 8 18:43:33 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=1768404332; cv=none; d=zohomail.com; s=zohoarc; b=dxCpYEpKu96jiCvom8cNKqGWEtcVVpmMZVAEr+wyh5+NXDTgmM2TiUvi27Mwkb6Yps0Bz7aRFw7oXduXnj3tJt6h3uKWoqm+SHSFibtSVGcMDsnyJYTfen9T5jCUhpg29Venm1SIUGDBb8gsl28drEXbbb4Z8eyDHyvZXZUVfDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768404332; 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=m9ZXmt7lMQ3q3+K2zk/2hkq0QkrElVj2Qwm4nuv6FTEL8x4uQjKdkMeAn/tmpz+3fVyQWo632/kXQxYGmlXZboow4HjTks7TbxwkQUoxi6rs31Yhyscnd5QW0Iq5xT7L/PGHqrxk7YTEMNhZXd53kl+hu1ZLEr+78HMWAWOySpQ= 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 1768404331499685.537827713073; Wed, 14 Jan 2026 07:25:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vg2iC-0000f4-EJ; Wed, 14 Jan 2026 10:23:08 -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 1vg2hd-0000Ft-AU for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:22:38 -0500 Received: from p-east2-cluster4-host2-snip4-9.eps.apple.com ([57.103.78.170] 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 1vg2ha-00007S-VD for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:22:33 -0500 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-20-percent-2 (Postfix) with ESMTPS id 5C3FF1800B93; Wed, 14 Jan 2026 15:22:27 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-20-percent-2 (Postfix) with ESMTPSA id A162718000BB; Wed, 14 Jan 2026 15:22:24 +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=FcuohIUzi34mKqTnIJEBI7H78oPg3uKWuSv1KUa5xB9w3cBUXpILtPA5D9z5lB8F9obdlxlPXCsVcFa5Fs6Igw3t/0ubMvSbBgzlL3fbPvrxPx4ayKJf+EkvGGV+XUKTap8v/wi3aXxGL+gKkyZ991z6TEejqzy44uF5qWl6UZtIAHVtV/CL2hJWYRDi/s+yjsPrI3I1BpmVzj+RJBi+GiCUWAU0JUue22wY4jZWOrXxKF/SyqKxDUIUTWdeAvAZ4ODKcek/l90VOlW4DiUhoLJWnR0vMAzSGdbY0bZZxA0wJ65igJC6/15sFXhGSgdJ8z24DEvFOVguntFUfjcKoA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Peter Maydell , qemu-arm@nongnu.org, Alexander Graf , Cameron Esfahani , Mohamed Mediouni Subject: [PATCH v4 1/3] vmapple: apple-gfx: make it work on the latest macOS release Date: Wed, 14 Jan 2026 16:22:18 +0100 Message-ID: <20260114152220.89640-2-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260114152220.89640-1-mohamed@unpredictable.fr> References: <20260114152220.89640-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: oR71TJI554D-g6OjIc1ED1wR-7pO8Y-k X-Authority-Info: v=2.4 cv=aNH9aL9m c=1 sm=1 tr=0 ts=6967b4b4 cx=c_apl:c_apl_out:c_pps a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=XaNHVGzJZ3ayr3Wv:21 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=qV0ahJ5E5Ghjqxzh6q4A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDEyOCBTYWx0ZWRfX2iBNML6c2ODp xjhLWGg8lUCcvuomyUt+8EG+S20RalJP5QX4R9Wc+8UGWtKEZ7Md1+UpcbIrDthgXS4vel/wGBo cgSJ79WhhE9F2FQT9WdABfNIUMmw8jQWD1QlUyHWzSvBoFMqXjNg4P8MQTOGg4+4PpopGysv9lU OqDKZwbQib3Ow2hB3afp4+lc5JKZpEAG4sm3QZ2L5ckL6ku8Rxx+1C0W3uNH/s5mNq2RoYna1au ikKlIMfBGp5zrw7ynIt84JRSjkHHnygZVy8AhM7vCPoTMxYdDVUWV9v3oaPNHxslFCVXcuaO1AW 5zEEh+mdhET0cmT9G3+ X-Proofpoint-ORIG-GUID: oR71TJI554D-g6OjIc1ED1wR-7pO8Y-k X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_04,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 clxscore=1030 spamscore=0 suspectscore=0 malwarescore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601140128 X-JNJ: AAAAAAABKNO+gPE5GxBrsxXb5fe1/ObWgbuNwDk8k9zJmXh7orkKmbmD/I/hHcEIyXRV2vV4gJT5AFYmivPb6Xy80DemTKQneHfpVxyEbsRb+0Jf9Kv+/KpLBiJmG6TAZUDCDUTookiCXNy5NOubMDoic458df8FXi7ZKsxBBguTQSlSshTticvIRVEoYexH6SWoK1X7B9itzui7MJcv0EWR5w2Di9aF75SOD86/E895zi28YZZgk+Chr9cIKYJkgWSlxc3SsqEs54j02Y8aNhUdenDhOLcLBPrkBuFY5fVb5oIsEeU8wenGyRzOsU2Pz1pf2Tiy4lvS5UGrtOs80zJFmm99p6lNmexiF6cL1skAkksHzX7ZzC2AYu4UFgGKYCcdSNZM0+NhDvLv2FY2pTAdr4uKf6u7F9sgXen+tM3iHeswvvDmZX9x1XZqJFYekBG515+pS7ycT0S6uORKUl1c6d1a9fOPoU9yeLqEfpzYGiQyHnnUjOmo4Ljdz7XO12FtpPPJnreitWFVWmhR2wv37i0JIRhVb3HnMagqWWy6nP7kr/vjcIwDtS9stf74x3Zxr6Fta7wOspgrioypPs8nZVMLna6Sd6dX5MQP8vghaaTWiw/jeyGoAjhF+CrhQgOIEYNV/MZe0brRuEW3aMhNZ1n38ora9wtehQ89BkHewC79s+sAIfmEY3I55eQGMkqL1IGowFHPHNgAGQw= 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.78.170; 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_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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1768404338203158500 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 Sun Feb 8 18:43:33 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=1768404460; cv=none; d=zohomail.com; s=zohoarc; b=MONn9MG1bo03pJJakIwqtc1J7Z3w5Z0qd7goS3fSWDhgrxZAuUvHIaVySbmbaS/7bTB9Qa9wGr7RDcnR7XI8BvtZTPp2DcsJedd6UX0x0jC1iIDbXffDCyVZgzzbQ3gr7gkVoZ54huRTEN2mm7TqSNKqZmOTaN0WcMEcWA1G8ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768404460; 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=i/sEVAlsdo1CFhvWQlWOAtb9X7nokcK35xyWbRhE7VVcYoufr6rTrO3ESbWBQGn6Pnk8djh9GbL0/81HiVwveX2vWc50cl7YwlEVYcgZS2VJo7V5IncqS8gyX4MSanEzS+SIrSus78PQedTJCEDF/sOaOphOn0CddQ8qJATZajc= 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 1768404460494424.92343176439203; Wed, 14 Jan 2026 07:27:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vg2iB-0000bt-Iu; Wed, 14 Jan 2026 10:23:07 -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 1vg2he-0000G0-Mo for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:22:39 -0500 Received: from p-east2-cluster4-host7-snip4-10.eps.apple.com ([57.103.78.241] 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 1vg2hd-00008E-B5 for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:22:34 -0500 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-20-percent-2 (Postfix) with ESMTPS id 5F4491800101; Wed, 14 Jan 2026 15:22:29 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-20-percent-2 (Postfix) with ESMTPSA id 0E788180042C; Wed, 14 Jan 2026 15:22:26 +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=MgkvP/pOPSOLfX86ZahFLOusr2FglU1G8offiCTpQlAR3LXOdn2Yg4FXxj+90/LJeJ+7uMgcAfYjlUD8QyW1J9oIYrpxcsB37cyVwbuMSEo+9jSd2oHClhhhDXNBO6avUEu1Z/y85PjL1Q48fysKTNyLGKyLvJwLItVfcuEvRk+jIUW17hm1hjg6hFSoZVv86vfIGI058HoDWgL+OIbHZiq3AuaiWwRFed9uhbP1lzPy6yjjt48lh1U57ymUTOjRnPyUyDPHqWZeaS+vIA8V8JVFLUq1A6JYvJK2Kw8drUANgrOeZXUb/mDIVu7LQovey/j0WBFd9WyNGAeTcy9kbg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Peter Maydell , qemu-arm@nongnu.org, Alexander Graf , Cameron Esfahani , Mohamed Mediouni Subject: [PATCH v4 2/3] Revert "hw/arm: Do not build VMapple machine by default" Date: Wed, 14 Jan 2026 16:22:19 +0100 Message-ID: <20260114152220.89640-3-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260114152220.89640-1-mohamed@unpredictable.fr> References: <20260114152220.89640-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDEyOCBTYWx0ZWRfX1HHXYUdsYHPk jWcazRd+SEgcR3H38FypHLLNk5iqKUximgUeRw4NfpvAzM6mVb5mqt/23J82Ck+lTcjAYhqvPYT 2rarDlbFR/sOPm9jeZKSQQGbcU5NSZcrFHJKsrsru62UI72Fg22zAXysD4QB/ofPUk3V8TN0LRa mXAtAF0JNHnZlCGS0/F0NtWbigKegqablYVYM2u3KeXF437E8qYPWZUI2lDllWxIfClp1U7hS5o SEZmTxeZoUepXHljGElP+svOKQGXFygphStjDLoUXeajhizq8eNUwmRMTIjYlaJv7FzeFMQyor3 znywwomJLIxZICspKYA X-Proofpoint-ORIG-GUID: FjYN-xGYt_0ip6Mpov7WTe8AnyjNGCwt X-Authority-Info: v=2.4 cv=EYTFgfmC c=1 sm=1 tr=0 ts=6967b4b6 cx=c_apl:c_apl_out:c_pps a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=XkhoILwbEVSdr8iLt8MA:9 X-Proofpoint-GUID: FjYN-xGYt_0ip6Mpov7WTe8AnyjNGCwt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_04,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=819 bulkscore=0 adultscore=0 spamscore=0 mlxscore=0 malwarescore=0 clxscore=1030 phishscore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601140128 X-JNJ: AAAAAAABA3XwEAJpGUMXNYnjqTp+vGG+8Izv0XB6C6i5PNsS5EvMca71LhOWja3Rk5gnn7vwOYB+e/0q4DE/dpzDsGYgUi7jJVq2feCGRRQC9WoQMbqzofj2Fi7tEy06WuxEoE+TYQm4BM5TgCxB6rXMz8gTIkBxharSfNRmoQmdy+38i0voYEg7wAAoNu4Bn7uLtjAvmpzi2rmHfhFzd1E92pyOS+msDVA0tz+0i/x1EJLoCog8b3xPjU5+8765Ii0fiNHW0zZhoF7/fYEXyBsZGn6auS+LIytkpfERShBerisuDQjFMCnSOd5ofI+X+cgHKeG8Q6EeJuJ5oaF9LI4E4lopB2SesN2Xg/XIgNm/LbvsfUCMLZgdf/TNKyqEcchREv77XqIGhIKdzOIgBqfz68dYTTyg+jUTTQy2iiJcvcIoDCEY4V2ZwNJEg0GmnmnvaQv3yATce0L2nV9LOG/HF42/v6wq3uojdkrYJfINpmhRghmnsArh+D9f7osCEG7GAkvZpIixOEREO4da6iIa0lMzXO/cTSJL1yuv7lp1G9mG3OdJtmYL/hMEksP+WCb4ihq7U8oOxD1+KO4E+jijpHeGIpIhgW64bIU8ufeAv/OIiU8j7YWskFrtT5EMZz8ointjKKhRuP6thEvHYXHvLVfakQf/0gsOemZ2rj0ersrBjYfbqQj4nI+DQuaZSu5G2w8M9jTWHbdablsrd52C 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.78.241; 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_H2=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1768404463876158500 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 Sun Feb 8 18:43:33 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=1768404502; cv=none; d=zohomail.com; s=zohoarc; b=Ma38Qyx50CtYwfvV8UnHzkhDVy7t42+ZIdzSzIPbtUK56UXrCF3TrxSqDQJAQInawra7RTn0KU697FtY6YKmsRwZRFZ7b5NK2pG738S62nt6FcGQTbmZvMbsreSqVUo2FceOFV+I/gdfQ4J+Yqdqx7FemmeON+cSHWMk219X64k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768404502; 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=RGu3+FS1dZJOAa5Uw5L8AADLrvZXTQZe1deaA3nLGtm5AKbxuQ3VVd8u4s5/Dg3Or5SWUpFud0m12scKJ8AaXXlMdiS7AH8EbOQPgt1hSNVCUAtOLbKT9QUGy/F1rXJBMF8PYoUeukKzrSdOw2hPxpVEvNDxSfjOQS+WRYaNdwg= 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 1768404501873503.9248581620202; Wed, 14 Jan 2026 07:28:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vg2iA-0000ZD-LF; Wed, 14 Jan 2026 10:23:06 -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 1vg2he-0000Fy-BK for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:22:39 -0500 Received: from p-east2-cluster4-host3-snip4-5.eps.apple.com ([57.103.78.136] 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 1vg2hb-00007f-OS for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:22:33 -0500 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-20-percent-2 (Postfix) with ESMTPS id 0C44118000AC; Wed, 14 Jan 2026 15:22:30 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-20-percent-2 (Postfix) with ESMTPSA id 9B91D1800435; Wed, 14 Jan 2026 15:22:28 +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=PonSutA99FjgbRlz504SAXOKsBLd2vN5964IWVR2flYWuOIu8kyomKNSzYnbJyRfu6UbnUSvghOVn23TJ0ORKW7bPFIhEjD+2OQ8mXI2KC8PhXMKFWz7oT05YtUwFeDNbh70t8pyLPBSW3Pp18U9oJjweVrYgwQwipS555Cz57tpnWnAplu7s05Ou8uI9geq2pt+XETYNbEzYlmyAzOosQxMQTMGlh/vYytBvzUC284t7yaGTZTEXXpCBIfKd7PaUMZr8iwoySDp0r/TNhDjU8zibRDdDuyliUyAS6/Q4aIYmz/IgXOT8QrUkWgostfVmD2YLfbNy2CPslyVe881Cg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mads Ynddal , Phil Dennis-Jordan , Peter Maydell , qemu-arm@nongnu.org, Alexander Graf , Cameron Esfahani , Mohamed Mediouni Subject: [PATCH v4 3/3] vmapple: apple-gfx: move legacy memory management APIs away from inline Date: Wed, 14 Jan 2026 16:22:20 +0100 Message-ID: <20260114152220.89640-4-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260114152220.89640-1-mohamed@unpredictable.fr> References: <20260114152220.89640-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info: v=2.4 cv=YqIChoYX c=1 sm=1 tr=0 ts=6967b4b6 cx=c_apl:c_apl_out:c_pps a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=FpLd5HJXVXburdsqXX0A:9 X-Proofpoint-ORIG-GUID: RZUHg3EUkUvVL3DqdYvnVuamffxs9rzq X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDEyOSBTYWx0ZWRfX9vuVKW7ds83+ fNQ5ZvdwyLwcmhTygNgnbKYcQ+kSDj0HBagmwWONkyItOvLq3K4Vea2+NEHmqUgotVbUZzOLoZk Q9L0pc7xFLEHrx52lc/3PoNASl4/hj5wGGDLaPN0vNg1Df1/BBXpdMOIsSQ2xMOWL8wV0uVBTi8 dqHzUr84SwlM/op7wMpqL1HRaeQKw8C/GNUgm1J3fFUsBf45ZRHCTogniZYqOl+LjLv/3xbikLy 3Gxu4nG5p+Wft0gzLsC8cUz7sNQYLqivIoauGLVVrJZg2oClAYrypqS5ts0yWZ4zK9sqeBj+kZH OMTjIF/d1g44FugJARC X-Proofpoint-GUID: RZUHg3EUkUvVL3DqdYvnVuamffxs9rzq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_04,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 mlxlogscore=936 clxscore=1030 malwarescore=0 phishscore=0 spamscore=0 mlxscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601140129 X-JNJ: AAAAAAABfabA0tP3S9fOM5ncv1dufd2rbYm1SeAIrZk3z735cmDZRzLcR0y5jOe2MnZajLVDWVvQryaJDuO9F8hTkn+zGzPGErxZeWgojH0T68POcCAZ5pVieIIuSk7+zmE3dI1Ambm7BmwDMoLFI9aEpkxA3R+uggmuD9bxmutkpGpX1JgunzWFcms8vSZPb/BIvm/9am+M/SY0WtS+5nFOsdHWpGRozrB0wfIlDw9t0xYY/ZBLRHkvm11uyDcBuBs0FdtDerBp7QYDTRZ/1ax2Rkba2ZH39nglKzYsjQlKWdwkep0AmlQ09M5IahBr/2y5whIm6OH6JYTYHh6VL4/7zVr9OlVi+/O4LuOdnQQgfJO5YQfPKUFcwSni+QmqN4+TxTTUSPGX885UMhy+Q21C/JUUMZyel33phS7x56Q0/oBhQobevO0nf4ZJx4ie3B8fHfJA/IoOEeXJa9aDkh3mDcESNnmKqxm6zAGLdrH/kqE8IsaG5SP8gcn1TQ3J8PjVwaYp+fsYkWDPdMjq8EeySdRAYV0YRynhz4176XyfOTbstXcoWGQsEeHha1yLsoTu4HS7+oz8ZKr2gdXSW5RULCAcgRZHuHVF60wV4O9aMkeVDKVGTY8LPwmx8SUQXMfICmadkfOhhNqavUdtVcfpSstF/EenWRki/6FObZdlrDuEGX7XtE3aUBqG18EcLdL1FS1kIuHhhDaNwt+r3i21CHcKm2+vI2j7ezfs9A== 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.78.136; 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_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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1768404504806158500 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)