From nobody Tue Feb 10 00:57:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641747991; cv=none; d=zohomail.com; s=zohoarc; b=G1WmK2s6kmSjPgt1ppXf04gm+rEhTKLSaJ70X7nbFv3s6qi8k7eqlRbZWaZMdXUKOJ2DKfRLIG0amOuiNT2OLyeWDUIa1v7HIDH2VQI0bXI3yRDVTP8ADJsEfdUP1jqnJTF3EnqGuzzW99GQjeBKp5XefOM6jzxDYFpF+ZwTR5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641747991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BvizcPyJXRDbEKDoEF6OUp8KHuw0PdyJuPEvaqkkl0w=; b=CtM1+HHaEOl0lkz5+eJ51IF7IFc4zYjyiiObPNrhG4Q1yO5oG/ZlzfB4PDTvJm1kJPw0/9ETkMCbXJKDz1sM9AOYlXLkvxEFUb2RxJMgv6nWa0q65jUcd4sBBf6kiWtnjzqNmsjFoxDke+dAwu+IoPfGbWUgv+o+0EZHRdlRIt4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1641747990995222.20127366969314; Sun, 9 Jan 2022 09:06:30 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id r9so20562896wrg.0 for ; Sun, 09 Jan 2022 09:06:30 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id u11sm4677994wmq.2.2022.01.09.09.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BvizcPyJXRDbEKDoEF6OUp8KHuw0PdyJuPEvaqkkl0w=; b=NF2J5CS8tMT/4FV2D7ftDYZ1zq7tC7rhNMiEDItdYizUf6tLrE5i8dHR/IEW2h1Fpd orClXpxntdS5Bg/MwmMJeS8XPmD0DsNJTeWIngO7umjBOpfvLb+HWcafiD3KJUQld/uc 4rd2zBxb81Svg5KKeCSwXk4AjU5U7s0fb49hcmyUBVfss8MQRF/sSBCHdnhOYaQ7mHa7 WAAlRsisrUFMy0G6IvDXoRRAg7xGwggPBnErpGNM7rw9o9CtObkKZ1mBAWRHdCPKmg98 yhg6k31Ry8tfT6Hm4xDNX4mbtrk6haSNp7quagaPwQLS8pyrbAfAbiQGzVyiO07Bnnqj B30w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BvizcPyJXRDbEKDoEF6OUp8KHuw0PdyJuPEvaqkkl0w=; b=z+rVeqOnDGHH/xZU01Ecv2FaIGHupl066WLiJRukchDnt9n689Sn+orapXyxMuZdR2 HLBcodKom8FLCpr8iekgZMJvDxnyKBXQ3ugL5BcJ5qMl6LirvP/q5oHn/WCEdc+j1VUC UyWn1O7JPPEVhMMvIgNTHBzveWqfShjJBsqRNojBkf79KUcrR7YecrmMjquXR/eu9q7V BNsM2sGYywaYeOZdqiLowkz4FFSFV28/4L6X9YM37NiFR1u3/8vsm2nI9EGivP06Y6bE sfU5G4ZmPD9wwP+gXdVnV7LpaJM7WUqV28X0JIYguKa6XXVwKRoJFAfQzw/w9W2DBo+o 00Dw== X-Gm-Message-State: AOAM533ecW5Lh6koeJZsZNqnyOEKAjghMdgcw5LH0oa0oUNOKiLm04br Occqxh1sFdKssB9qZsQiPNw= X-Google-Smtp-Source: ABdhPJyLZ2Td9pOahE6az/xtHZzw6Xny9POl4vIAP3RHWjBG6tIJheA4AC92E2LQId3F0xwMrmZxbQ== X-Received: by 2002:adf:fbcd:: with SMTP id d13mr50694610wrs.170.1641747989256; Sun, 09 Jan 2022 09:06:29 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Schoenebeck , qemu-block@nongnu.org, Alexander Graf , Roman Bolshakov , Gerd Hoffmann , Akihiko Odaki , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 3/6] block/file-posix: Remove a deprecation warning on macOS 12 Date: Sun, 9 Jan 2022 18:06:09 +0100 Message-Id: <20220109170612.574104-4-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220109170612.574104-1-f4bug@amsat.org> References: <20220109170612.574104-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641747993121100001 When building on macOS 12 we get: block/file-posix.c:3335:18: warning: 'IOMasterPort' is deprecated: first = deprecated in macOS 12.0 [-Wdeprecated-declarations] kernResult =3D IOMasterPort( MACH_PORT_NULL, &masterPort ); ^~~~~~~~~~~~ IOMainPort Use IOMainPort (define it to IOMasterPort on macOS < 12), and replace 'master' by 'main' in a variable name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/file-posix.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index b283093e5b7..0dcfce18560 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3324,17 +3324,22 @@ BlockDriver bdrv_file =3D { #if defined(__APPLE__) && defined(__MACH__) static kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath, CFIndex maxPathSize, int flags); + +#if !defined(MAC_OS_VERSION_12_0) +#define IOMainPort IOMasterPort +#endif + static char *FindEjectableOpticalMedia(io_iterator_t *mediaIterator) { kern_return_t kernResult =3D KERN_FAILURE; - mach_port_t masterPort; + mach_port_t mainPort; CFMutableDictionaryRef classesToMatch; const char *matching_array[] =3D {kIODVDMediaClass, kIOCDMediaClass}; char *mediaType =3D NULL; =20 - kernResult =3D IOMasterPort( MACH_PORT_NULL, &masterPort ); + kernResult =3D IOMainPort(MACH_PORT_NULL, &mainPort); if ( KERN_SUCCESS !=3D kernResult ) { - printf( "IOMasterPort returned %d\n", kernResult ); + printf("IOMainPort returned %d\n", kernResult); } =20 int index; @@ -3347,7 +3352,7 @@ static char *FindEjectableOpticalMedia(io_iterator_t = *mediaIterator) } CFDictionarySetValue(classesToMatch, CFSTR(kIOMediaEjectableKey), kCFBooleanTrue); - kernResult =3D IOServiceGetMatchingServices(masterPort, classesToM= atch, + kernResult =3D IOServiceGetMatchingServices(mainPort, classesToMat= ch, mediaIterator); if (kernResult !=3D KERN_SUCCESS) { error_report("Note: IOServiceGetMatchingServices returned %d", --=20 2.33.1