From nobody Mon Feb 9 05:13:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 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=1641820235; cv=none; d=zohomail.com; s=zohoarc; b=FtuvLiupAXufGIK/fixeHbSj9JvBZa7B8C1rKGWHPnrZsIGetwxEMHqoQP5TyOUC5aG6Fesw8QAe66L05MmvcY4Jqc3GfUOiaakFrngm/TdZIU0T6E+ic13ftbpETGCrITMXNo7vqy+U6Q/wYKaUfthXRYlnxnL5NC0Atpm6HH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820235; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oetO7aKXzKFQoezQrscPJAT1pLRp71rd97o5y+AiOV8=; b=nyZuV7zQnpfoHwUGoeyt1nHYTAqERAZg7JuNarC0X6uuQZ9vwYsYdRtmlzFv9sFN3I677mJieN+mfuLLoz1jC2JiDDs4tFn19PQhD9xXear9afdORqmoVrVnH1mqW6KTAv+CW+HiCjRbbj/UlD2r2zywk0SyOf3HXoJis0uXozY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1641820235297285.1578325666093; Mon, 10 Jan 2022 05:10:35 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id o203-20020a1ca5d4000000b003477d032384so5614317wme.2 for ; Mon, 10 Jan 2022 05:10:34 -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 r7sm1772695wmq.18.2022.01.10.05.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:33 -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=oetO7aKXzKFQoezQrscPJAT1pLRp71rd97o5y+AiOV8=; b=GRfIyIG7ulqJq3Z5yS6bimdOqy8VFjA48bsj3Ao5ByZ/Qd9lIoXEGm/sKUB7ECX5sy qy4LDr11Er7jQ4w0RCpFVVl4dS4a1Wwhsic7zr55GRLGLzaddjYvKTotxz+KqRMhgRDI CTiKfrm8ypnwQ4B0ki98Of/CIcgpqFtj263KlYyTl5DbrFxW6OIx/EoYWhClKfF+sqB+ l2aqH0LnF1HbIn0R3uew05/vU95Ez6ELwGYOKVNLwxdSJ5y67hNo7duwuJZWHLg/uRC4 IIpKEwALSi08lIhSplsiTP7wGA1sLypHqmXCLo6z4SDYNelUbOE5IdohL4uZuElomelM gCIw== 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=oetO7aKXzKFQoezQrscPJAT1pLRp71rd97o5y+AiOV8=; b=t1+Z2j+nt7EI72qNhaZ+Vf8mMM8Y5fv9A86gmfAM5uGTLRbmWKsRUpXEh/EiciREJ0 QBHX3WRH+l+nIdfJiZfzTdn4TpWotloL571aZdpcVWeJfV2BZrNXIaYzLpU8dkM9Rw18 WXBoSL4rQCyAADT2CcDZJuqtkVz4AA+92MeaSRYUPi/Ec8aTiaJ7xgNoZASucP5J+d8h QXsBbsNrHTE9ncxpkNUo+xpSOZKXFxYecT46Fs+NvsCxYj4SQpvyoZnC6VspqUMPnb1O WN6BU3+jJx1asb62oWzsUEf3ea2YQEz0F1OM7Jig/DgZr0oAQY8LHVVE8+D5pRLYqctx YEdw== X-Gm-Message-State: AOAM531N80FqDXaYBuueU8GBNSRp9qkOYqZ4aEkr11/3V/mxqjf98e/O AAQfIJLmt/uHUSi2QW/b3JQ= X-Google-Smtp-Source: ABdhPJyPSuhJ3fYfyaf7gutir+WDeGD+9B/Q87or6zMgyLoaudA6ag2GP5NP4D+spY1Cs6kL9DZJMQ== X-Received: by 2002:a05:600c:1e8f:: with SMTP id be15mr21940249wmb.83.1641820233579; Mon, 10 Jan 2022 05:10:33 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alexander Graf , Christian Schoenebeck , Cameron Esfahani , Roman Bolshakov , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Peter Maydell , Akihiko Odaki , Thomas Huth Subject: [RFC PATCH v3 6/7] block/file-posix: Remove a deprecation warning on macOS 12 Date: Mon, 10 Jan 2022 14:10:00 +0100 Message-Id: <20220110131001.614319-7-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110131001.614319-1-f4bug@amsat.org> References: <20220110131001.614319-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: 1641820236055100001 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 Replace by IOMainPort, redefining it to IOMasterPort if not available, using Clang __is_identifier() feature (this code is guarded by __APPLE__ #ifdef'ry). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Checkpatch: WARNING: architecture specific defines should be avoided 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..1d0512026c5 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 !__is_identifier(IOMainPort) /* macOS >=3D 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