From nobody Mon Feb 9 06:21:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 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=1641747981; cv=none; d=zohomail.com; s=zohoarc; b=DhMzC25InmrnrHmUdLEXopRp4xyZc7ZWwNfHf3brOU94nzpK1WaDOF74c/FsZoyPhNJ4bIRKm6pV+RSw0fBlnt4f3C3v1vLyxA7SsVdU//0xOxt1lb3N7ag6sV9KEACu1cYoCvbC5EqcSpnAjOSNdFdCzHOXub2av/OlFXmiSWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641747981; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QdGnzM/yYLdpxDRZQHhZ80EU/HYkDZavCSsJFqRZdoo=; b=jugDY+i6ho5ZcmVwj6o6VXbzZXUV/E41zNMBYEG4KGDJG2Gqay+WGo2VOL9rS3s5GmFtqNYMW5UqfhQzpyE1ohfNbgm59PXEVFzDEnxwtBNU1WYaLtYhwAJfyt7UzAf3Goy1P5witjh59f00Ao/AhW4mH4TONM7NVPONo/turjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1641747981268711.2040468252693; Sun, 9 Jan 2022 09:06:21 -0800 (PST) Received: by mail-wr1-f44.google.com with SMTP id a5so18382062wrh.5 for ; Sun, 09 Jan 2022 09:06:20 -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 p13sm4913192wrr.37.2022.01.09.09.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:19 -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=QdGnzM/yYLdpxDRZQHhZ80EU/HYkDZavCSsJFqRZdoo=; b=j4f5zYCJYEV9AyPx03OclOeM6tqmshNotHiIKiqqkxo/DJ0Mlp5Om01l0lEivrchxg H3sWVLVfaf4/vp/agCPNQwi/eHaZFibnb5axadPTAPSbhziIIGpS9MrD8W0mqQZDfL08 eRJcdrS3nFg4jHAEjdNBrYZcaJvkBXxQIntHzB+3k4+eWSPzoGP3kFjBCpvpL7dJOdYI V5dsrdROP4aWYujP1PrVcPi3HGTZzvtRMTMbunrTc7sl/Cp1mEx/KVl3r/1LFQjZg9Eb lEs8wi3DzZsfaEOrQeGYQr1njNHBgLxWScOGPI1AL+Z3L3r12Zy4zQUWPGjlnzYykNj9 P4xA== 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=QdGnzM/yYLdpxDRZQHhZ80EU/HYkDZavCSsJFqRZdoo=; b=buRTvjjWfZHryIZEvPXgM73vpexD/gFFnQKEJmUAgzaKc5JfTHrnXYVKjsQGBgAgfn MXZSRhh+dMMd3PxxGP1vG4CnNIKDj2OzN1ETkvVaX8G0XOarMgLx1HRm+zY13OA9eerU HPiYCgahywt2oQzChcyfFQ3zID8tWzuJwvgpePL9Gvp9LMHbC2JViysctz3uY3BXYnuo LlDvWrxthMfJlC7xdeqBIhwmAS0gfqJDaX5eEPxpsJpwVwsDSOpy+fP43cQgRL70nKiq KnI6p4Hogm7XWtZaJY9ASybDl5wPrh3nVsukLpPMS/HkSnj0Mj3jQbT/6AHw96FcJFxq x0eQ== X-Gm-Message-State: AOAM530k04JEUJu78mqbB8vlBVKbCa2FsH/ao0Q2ivg9+4DxRS6eHEb4 JMyUmTHkqRIst53gRlhGsQM= X-Google-Smtp-Source: ABdhPJxcnE26PXRXu8M3nQYrTD+x/gb3P7fiH6S/Py7MBbK2xIuGKlImI5qVz2GbcBx3ZG0LVvjyQg== X-Received: by 2002:adf:fac3:: with SMTP id a3mr2705837wrs.369.1641747979547; Sun, 09 Jan 2022 09:06:19 -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?= , Paolo Bonzini Subject: [PATCH v2 1/6] configure: Allow passing extra Objective C compiler flags Date: Sun, 9 Jan 2022 18:06:07 +0100 Message-Id: <20220109170612.574104-2-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: 1641747982769100001 We can pass C/CPP/LD flags via CFLAGS/CXXFLAGS/LDFLAGS environment variables, or via configure --extra-cflags / --extra-cxxflags / --extra-ldflags options. Provide similar behavior for Objective C: use existing flags from $OBJCFLAGS, or passed via --extra-objcflags. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Paolo Bonzini configure | 8 ++++++++ meson.build | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/configure b/configure index 030728d11e9..4cdde1eeb4b 100755 --- a/configure +++ b/configure @@ -288,6 +288,7 @@ done =20 EXTRA_CFLAGS=3D"" EXTRA_CXXFLAGS=3D"" +EXTRA_OBJCFLAGS=3D"" EXTRA_LDFLAGS=3D"" =20 xen_ctrl_version=3D"$default_feature" @@ -400,9 +401,12 @@ for opt do --extra-cflags=3D*) EXTRA_CFLAGS=3D"$EXTRA_CFLAGS $optarg" EXTRA_CXXFLAGS=3D"$EXTRA_CXXFLAGS $optarg" + EXTRA_OBJCFLAGS=3D"$EXTRA_OBJCFLAGS $optarg" ;; --extra-cxxflags=3D*) EXTRA_CXXFLAGS=3D"$EXTRA_CXXFLAGS $optarg" ;; + --extra-objcflags=3D*) EXTRA_OBJCFLAGS=3D"$EXTRA_OBJCFLAGS $optarg" + ;; --extra-ldflags=3D*) EXTRA_LDFLAGS=3D"$EXTRA_LDFLAGS $optarg" ;; --enable-debug-info) debug_info=3D"yes" @@ -781,6 +785,8 @@ for opt do ;; --extra-cxxflags=3D*) ;; + --extra-objcflags=3D*) + ;; --extra-ldflags=3D*) ;; --enable-debug-info) @@ -1332,6 +1338,7 @@ Advanced options (experts only): --objcc=3DOBJCC use Objective-C compiler OBJCC [$objcc] --extra-cflags=3DCFLAGS append extra C compiler flags CFLAGS --extra-cxxflags=3DCXXFLAGS append extra C++ compiler flags CXXFLAGS + --extra-objcflags=3DOBJCFLAGS append extra Objective C compiler flags OB= JCFLAGS --extra-ldflags=3DLDFLAGS append extra linker flags LDFLAGS --cross-cc-ARCH=3DCC use compiler when building ARCH guest test ca= ses --cross-cc-flags-ARCH=3D use compiler flags when building ARCH guest t= ests @@ -3864,6 +3871,7 @@ if test "$skip_meson" =3D no; then echo "[built-in options]" >> $cross echo "c_args =3D [$(meson_quote $CFLAGS $EXTRA_CFLAGS)]" >> $cross echo "cpp_args =3D [$(meson_quote $CXXFLAGS $EXTRA_CXXFLAGS)]" >> $cross + test -n "$objcc" && echo "objc_args =3D [$(meson_quote $OBJCFLAGS $EXTRA= _OBJCFLAGS)]" >> $cross echo "c_link_args =3D [$(meson_quote $CFLAGS $LDFLAGS $EXTRA_CFLAGS $EXT= RA_LDFLAGS)]" >> $cross echo "cpp_link_args =3D [$(meson_quote $CXXFLAGS $LDFLAGS $EXTRA_CXXFLAG= S $EXTRA_LDFLAGS)]" >> $cross echo "[binaries]" >> $cross diff --git a/meson.build b/meson.build index c1b1db1e28c..eb8b560b103 100644 --- a/meson.build +++ b/meson.build @@ -3285,6 +3285,11 @@ + ['-O' + get_option('optim= ization')] + (get_option('debug') ? ['= -g'] : []))} endif +if targetos =3D=3D 'darwin' + summary_info +=3D {'OBJCFLAGS': ' '.join(get_option('objc_args') + + ['-O' + get_option('optim= ization')] + + (get_option('debug') ? ['= -g'] : []))} +endif link_args =3D get_option(link_language + '_link_args') if link_args.length() > 0 summary_info +=3D {'LDFLAGS': ' '.join(link_args)} --=20 2.33.1 From nobody Mon Feb 9 06:21:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.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=1641747986; cv=none; d=zohomail.com; s=zohoarc; b=Q6M3ZI1BBl12fg2YnhC/p8OLHKzJEL03/zfATjwvJn1ipxTWt2qDaeHHobkmSQ0d2Pz+xzfJnzClIvC160Ksg+7JJSfazN1I0i8XXESBN95Sqr6/MrWots+q+bXuGxLG6Rx+HrpyktGFrlb8vaFYfDbmT4flAA7eeNCppe2/u4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641747986; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v1XOO+wU3a7QWA1hgiU3Fs3DmTnRjpKCsIn0H4QIOio=; b=MweBZS0iKsMnyLpMcQ3g4L9Xxlrp9pB9IZFjmrjoo5nA8pf+4N+2GYGncB5d8IFcXJXtsg5+JBRIiWbeb9sznRvWWl64kZTp2NY9npHg6RMC080zrOb1ce32IxZCTtu57vVpW5AUXS2nJuQ+RHxkm1EO4RUBHGJrulAbT0Z8AGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 164174798616777.3878860583178; Sun, 9 Jan 2022 09:06:26 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id r10so14672696wrc.3 for ; Sun, 09 Jan 2022 09:06:25 -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 m35sm8167437wms.1.2022.01.09.09.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:24 -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=v1XOO+wU3a7QWA1hgiU3Fs3DmTnRjpKCsIn0H4QIOio=; b=NYrltQvCSoa/CVjyZ3fPA+u4GfE/KEcxgCX8HeD/utW/iDT7baOnztNXscVSICv3ft YtjyoaNvLlOps9Gy5BQknGH9Y7Udj/c3nkHN9L5k8FX8KrFLJh/bEw35sMD3dpGmrG1B mQB/LXvuEwKGRCiwLOZOsEeo8UVY+e3L5nMRnOGwyg7trM8ierv8rluvrDXiRNctNHo+ 95aHVY2teUdEvTFSvCW4Pkj+mkovkC9eHGql4x4KM0ouM1M+0xKaMUc5APOo9i169tPM /jC8DMz7q1evYyJKJcQRrLI+zyrlzfEqgHvQ+UCAY7NaAn1NzYAh7ZvXCZW+LH0o6lwv jftg== 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=v1XOO+wU3a7QWA1hgiU3Fs3DmTnRjpKCsIn0H4QIOio=; b=1VAnQHFY5LBVQr6hkIKQ+Pot2cfxMnsJVIaNmX9Oqch9+vzImkvy3k6eZoSZgzPEEu fs2c5FuiA8uafRKKWoVnll9Phm4Fe3CRoWgyVAkJuXkjr+X3c8SGMhMZv/sSLvLaTD6t 9kSUKPiGplhntPtBSKngupHDudmMnuDlD8UHIq09e+ny98T7mp4fJ/kgQlnJdz/1UQU/ uWjenkt7w1V3IEeTdiofp3OhnNgrlzNP4VxgAzzpxafD8ohU3+CXzMZgGFjdr9X5YjhJ D2uolbTYwaPNH8XwP1uoIBP6TsDRZobTslqSoTWZQSjUT1NFwE2UmsnAqgMnl3VxluBw cGXw== X-Gm-Message-State: AOAM5317s5DYmRXU1zhVoANRLZGRtlwee19fg7qUEEK8AyWVrnDPLUj3 cyOXKewNy2WkeGRz8R1BSg8= X-Google-Smtp-Source: ABdhPJw26C/oEqJjz/QeytaOKAvwqk4D434ffOfoLvVPEkwO9dBvOX1omaqHrkz7saVfX8o15W6Wpw== X-Received: by 2002:a5d:6908:: with SMTP id t8mr130691wru.382.1641747984438; Sun, 09 Jan 2022 09:06:24 -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 2/6] audio/coreaudio: Remove a deprecation warning on macOS 12 Date: Sun, 9 Jan 2022 18:06:08 +0100 Message-Id: <20220109170612.574104-3-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: 1641747987148100001 When building on macOS 12 we get: audio/coreaudio.c:50:5: error: 'kAudioObjectPropertyElementMaster' is dep= recated: first deprecated in macOS 12.0 [-Werror,-Wdeprecated-declarations] kAudioObjectPropertyElementMaster ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kAudioObjectPropertyElementMain /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Framew= orks/CoreAudio.framework/Headers/AudioHardwareBase.h:208:5: note: 'kAudioOb= jectPropertyElementMaster' has been explicitly marked deprecated here kAudioObjectPropertyElementMaster API_DEPRECATED_WITH_REPLACEMENT("kA= udioObjectPropertyElementMain", macos(10.0, 12.0), ios(2.0, 15.0), watchos(= 1.0, 8.0), tvos(9.0, 15.0)) =3D kAudioObjectPropertyElementMain ^ Use kAudioObjectPropertyElementMain (define it to kAudioObjectPropertyElementMaster on macOS < 12). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- audio/coreaudio.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index d8a21d3e507..c836bc9dd37 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -44,10 +44,14 @@ typedef struct coreaudioVoiceOut { bool enabled; } coreaudioVoiceOut; =20 +#if !defined(MAC_OS_VERSION_12_0) +#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster +#endif + static const AudioObjectPropertyAddress voice_addr =3D { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; =20 static OSStatus coreaudio_get_voice(AudioDeviceID *id) @@ -69,7 +73,7 @@ static OSStatus coreaudio_get_framesizerange(AudioDeviceI= D id, AudioObjectPropertyAddress addr =3D { kAudioDevicePropertyBufferFrameSizeRange, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; =20 return AudioObjectGetPropertyData(id, @@ -86,7 +90,7 @@ static OSStatus coreaudio_get_framesize(AudioDeviceID id,= UInt32 *framesize) AudioObjectPropertyAddress addr =3D { kAudioDevicePropertyBufferFrameSize, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; =20 return AudioObjectGetPropertyData(id, @@ -103,7 +107,7 @@ static OSStatus coreaudio_set_framesize(AudioDeviceID i= d, UInt32 *framesize) AudioObjectPropertyAddress addr =3D { kAudioDevicePropertyBufferFrameSize, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; =20 return AudioObjectSetPropertyData(id, @@ -121,7 +125,7 @@ static OSStatus coreaudio_set_streamformat(AudioDeviceI= D id, AudioObjectPropertyAddress addr =3D { kAudioDevicePropertyStreamFormat, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; =20 return AudioObjectSetPropertyData(id, @@ -138,7 +142,7 @@ static OSStatus coreaudio_get_isrunning(AudioDeviceID i= d, UInt32 *result) AudioObjectPropertyAddress addr =3D { kAudioDevicePropertyDeviceIsRunning, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; =20 return AudioObjectGetPropertyData(id, --=20 2.33.1 From nobody Mon Feb 9 06:21:21 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 From nobody Mon Feb 9 06:21:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 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=1641748011; cv=none; d=zohomail.com; s=zohoarc; b=T5OYc2qPWciA7MQykFhbRM4bIXl3vhIoD8rz1wSSKnRBJ3rDZLAn2wep7qw3vP2+2RS9r/L8wBoT2wA4T/hJ0LUmkGBoW5ig6yqSDRVQncCkJs8OBwcLPwN3hXmeLZHbT4+tazGdqahZNbZQfa9Y/VQkDsmuiAUL2Bst2ASza8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641748011; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F9FAq6nwbgCvDM7C2Sg9iiaLq9FrL+HtewEtG7ypUf8=; b=GT6WwxMOyGI5yc4YwPk/BGTnjnSDglcfFPoFsv8gBOnr2R5bsmlb3BMY2+mNCKA5OmitfE0BKnqX+qKqSxCu9PO7+VTGo0pm69++RoW/vDNZbIn+1TctZL5U5JOI3a6YWRtMUwCTboWWp+WOrroG/CCgKVY0+k/cnMAHEnGuOnk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 164174801102022.65142013887578; Sun, 9 Jan 2022 09:06:51 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id 18-20020a05600c22d200b00347d3a13c7cso3372047wmg.0 for ; Sun, 09 Jan 2022 09:06:50 -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 bd21sm4565503wmb.8.2022.01.09.09.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:49 -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=F9FAq6nwbgCvDM7C2Sg9iiaLq9FrL+HtewEtG7ypUf8=; b=ZreSRK8E8JULy4y6elY3p1BA2kf1xKZOaVH/wCym7FLyGagfFrsLLyGfMCeBNJpIt0 VVF1tiSuWFeNx7Fl1Z3mCjO1dJ/gUKIl+BvW7AJsMex8t4GQMPjwTAFvz+DM7n7DWWyy 67gw79sqHMswnHO+yJesaE9MuAyu0rlkg6X9YpQt08NQ1zaOq2oRqp02lbszH8yRv1cR r+pGx0+1qumwl3NIe6LRW94nIAB6lPH0bgUEB3HRu1wA4fZdSb49vrnycdLmf6MYAqWK b7VnUTdmv9Vg6ceqi+AFH7x9AsF162pocPHe9qfJXtxiKJFmf4AJYQL2o3sWXLfHmTHw SGCg== 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=F9FAq6nwbgCvDM7C2Sg9iiaLq9FrL+HtewEtG7ypUf8=; b=y9U6SaQE1iJzZhje14RC0Y/Mq/KCNqLbKLtIoVg48Bm86AQeHTW5ppBRIwAV0D/jSa HjmV12bXtraInvEvaJbTM0t8AtTZP91uW0uhr1Y2DOgOikPguq1Vtyff+2mXi/qQNyBJ FSrvq2hxfwkJTS6m6kybVZgKCdw7BH/eKKIK1/+p+cBzl8wGgDOURTg8PWYdPyX/P6BC KWTRFx62LI8QHBVkr9uzAXfQNeScRNcfO2HxsvnX/3ToIzQ57qWxkUQ8vUy1LGwOtVhr OvKwJce+zajCdApinCa56D20CM9+xxGR56+KIeeIY9UrhI41VVeuZYdPqm2YYkvEbiCp 84nw== X-Gm-Message-State: AOAM531XkaRTQByJoipzjOnkkyqDTlRc6hbiG5/WiQrvizeAy2mS/4zx dlQNRBw3P8IIZBKldHXa+rw= X-Google-Smtp-Source: ABdhPJy8oi3ieGBIjsY6paWq79Ni7fHjqGYH+yhLMI1wyaEew+eKhRKCxWZrFpxM4uwwXKwCQ13rrg== X-Received: by 2002:a05:600c:2113:: with SMTP id u19mr3979369wml.16.1641748009312; Sun, 09 Jan 2022 09:06:49 -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 4/6] hvf: Make hvf_get_segments() / hvf_put_segments() local Date: Sun, 9 Jan 2022 18:06:10 +0100 Message-Id: <20220109170612.574104-5-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: 1641748013583100001 Both hvf_get_segments/hvf_put_segments() functions are only used within x86hvf.c: do not declare them as public API. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/hvf/x86hvf.h | 2 -- target/i386/hvf/x86hvf.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/i386/hvf/x86hvf.h b/target/i386/hvf/x86hvf.h index 99ed8d608dd..db6003d6bda 100644 --- a/target/i386/hvf/x86hvf.h +++ b/target/i386/hvf/x86hvf.h @@ -26,11 +26,9 @@ void hvf_set_segment(struct CPUState *cpu, struct vmx_se= gment *vmx_seg, SegmentCache *qseg, bool is_tr); void hvf_get_segment(SegmentCache *qseg, struct vmx_segment *vmx_seg); void hvf_put_xsave(CPUState *cpu_state); -void hvf_put_segments(CPUState *cpu_state); void hvf_put_msrs(CPUState *cpu_state); void hvf_get_xsave(CPUState *cpu_state); void hvf_get_msrs(CPUState *cpu_state); void vmx_clear_int_window_exiting(CPUState *cpu); -void hvf_get_segments(CPUState *cpu_state); void vmx_update_tpr(CPUState *cpu); #endif diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 05ec1bddc4e..907f09f1b43 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -83,7 +83,7 @@ void hvf_put_xsave(CPUState *cpu_state) } } =20 -void hvf_put_segments(CPUState *cpu_state) +static void hvf_put_segments(CPUState *cpu_state) { CPUX86State *env =3D &X86_CPU(cpu_state)->env; struct vmx_segment seg; @@ -166,7 +166,7 @@ void hvf_get_xsave(CPUState *cpu_state) x86_cpu_xrstor_all_areas(X86_CPU(cpu_state), xsave, xsave_len); } =20 -void hvf_get_segments(CPUState *cpu_state) +static void hvf_get_segments(CPUState *cpu_state) { CPUX86State *env =3D &X86_CPU(cpu_state)->env; =20 --=20 2.33.1 From nobody Mon Feb 9 06:21:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 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=1641748016; cv=none; d=zohomail.com; s=zohoarc; b=U2naRexF5ey5yyRbep5r/G13y/ldHDPK05TjUFLDVhMn613j2RWWSNXt1NiH+4qISw+drcH1cPjc1QWsi/4RBjhACH46aApgRNQvhma3yM8VOVYjTFPwvMg0N1w2w5N3Km+VmydpDhbRmyFC1cuhCfi264WWtRbqAW4qUb6Txow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641748016; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iN7rmJCyt/9XOylIukKsQBez3yTqjDEoUhXX6uhz6nk=; b=O9QWdfR55wyTRznD0TiQQARz7No6Ze7udYXW0dqKJlxaycqwhYORCVVtz7rXm/HUByODIf92fJI+UEcGBKtN///j3XPHbR8XCk0wEULnhAjjJOmouisVN2F197EdautXFlTIa4ivkMs42Lo5PqIw6sRSUmX8kSxLPpjxbHGFLb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1641748015984255.35803549470154; Sun, 9 Jan 2022 09:06:55 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso7909532wmj.2 for ; Sun, 09 Jan 2022 09:06:55 -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 e13sm4599960wmq.10.2022.01.09.09.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:53 -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=iN7rmJCyt/9XOylIukKsQBez3yTqjDEoUhXX6uhz6nk=; b=Di1keJS+l27M8x/2G1Ma02PH3svXk6aZYshOdEgw8pO5f8c6P5TS+m4zTmRBT6wHT1 HpAFYord7URVOLUT6qOWTEoG5jnilJEpFrFu1ddd8HlDr7iviK1ZEahau0btNWYq5pGZ W3T1zITmOcl1OcMU9dtKFn5hYIjEZx6dyBA/FOnW4N00bw8dF9h0bF9KHTMA5YaEmNiV 6YMq41dytMsZIjQxFZddMOMaJopuJoyb7Sc+Bk2y8T4N15c6j2ms6FISYbUcXk0KGMx6 3JIfKBpsS6q3SnPQWOunnv+sV1nZJer91sONHd/1OJ06ICZG9rbySxialH8s9a0GDbl6 QdPw== 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=iN7rmJCyt/9XOylIukKsQBez3yTqjDEoUhXX6uhz6nk=; b=YW5nxmfeW+Zm0/XFoXYnM4sxoTJubV7TmgYuHLVAgiWz7aCUnEixlCfXnGSi7Kx9qV BehvocdaFd4FWwCmktyK35KrvO5tztVyQD7c250KzXsHPFPvbln9/RQ8KOKyt5L3WVOW SyHH5p9IVt65XH11Sbc7HQwblyWKJI0+ao5xsgWp9FQ43u5XFSywkObZF39nJnm1/zys 3oMLV2Jy2skTZ+VxAXsRWHXtxMII3yOlzE0EP1a5nJhhJx3DmeJjQoulE1L2yWALrlHf aJGmlpZ0JdHMM6ibWkjWqYtJaqRa5xfbE2wCmmeidTaWdoqeqMQXhW+EMLGQU5MYXg5Q izTA== X-Gm-Message-State: AOAM531+t0KoxYBlGulRWolc+YtixNcaI+2HUpRUmDfs4g8U6nzIDrii +2zD7L73qZ8QvsXrXax+WtY= X-Google-Smtp-Source: ABdhPJw3MuOwK9vZxcFIlXVLvNPrCLICTpof4A+kTv79iWz4xF4v2k3c2I+pMcccXWkH1cveYVfkQA== X-Received: by 2002:a1c:44d7:: with SMTP id r206mr12130113wma.79.1641748014215; Sun, 09 Jan 2022 09:06:54 -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 5/6] hvf: Remove deprecated hv_vcpu_flush() calls Date: Sun, 9 Jan 2022 18:06:11 +0100 Message-Id: <20220109170612.574104-6-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: 1641748017839100001 When building on macOS 12, we get: In file included from ../target/i386/hvf/hvf.c:59: ../target/i386/hvf/vmx.h:174:5: error: 'hv_vcpu_flush' is deprecated: fir= st deprecated in macOS 11.0 - This API has no effect and always returns HV_= UNSUPPORTED [-Werror,-Wdeprecated-declarations] hv_vcpu_flush(vcpu); ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Framew= orks/Hypervisor.framework/Headers/hv.h:364:20: note: 'hv_vcpu_flush' has be= en explicitly marked deprecated here extern hv_return_t hv_vcpu_flush(hv_vcpuid_t vcpu) ^ Since this call "has no effect", simply remove it =C2=AF\_(=E3=83=84)_/=C2= =AF Not very useful deprecation doc: https://developer.apple.com/documentation/hypervisor/1441386-hv_vcpu_flush Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/hvf/vmx.h | 2 -- target/i386/hvf/x86_task.c | 1 - target/i386/hvf/x86hvf.c | 2 -- 3 files changed, 5 deletions(-) diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 6df87116f62..094fb9b9dc9 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -159,7 +159,6 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint= 64_t cr0) wvmcs(vcpu, VMCS_GUEST_CR0, cr0 | CR0_NE | CR0_ET); =20 hv_vcpu_invalidate_tlb(vcpu); - hv_vcpu_flush(vcpu); } =20 static inline void macvm_set_cr4(hv_vcpuid_t vcpu, uint64_t cr4) @@ -171,7 +170,6 @@ static inline void macvm_set_cr4(hv_vcpuid_t vcpu, uint= 64_t cr4) wvmcs(vcpu, VMCS_CR4_MASK, CR4_VMXE); =20 hv_vcpu_invalidate_tlb(vcpu); - hv_vcpu_flush(vcpu); } =20 static inline void macvm_set_rip(CPUState *cpu, uint64_t rip) diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c index 422156128b7..c8dc3d48fa8 100644 --- a/target/i386/hvf/x86_task.c +++ b/target/i386/hvf/x86_task.c @@ -181,5 +181,4 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_= selector tss_sel, int rea store_regs(cpu); =20 hv_vcpu_invalidate_tlb(cpu->hvf->fd); - hv_vcpu_flush(cpu->hvf->fd); } diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 907f09f1b43..bec9fc58146 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -125,8 +125,6 @@ static void hvf_put_segments(CPUState *cpu_state) =20 hvf_set_segment(cpu_state, &seg, &env->ldt, false); vmx_write_segment_descriptor(cpu_state, &seg, R_LDTR); - =20 - hv_vcpu_flush(cpu_state->hvf->fd); } =20 void hvf_put_msrs(CPUState *cpu_state) --=20 2.33.1 From nobody Mon Feb 9 06:21:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 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=1641748020; cv=none; d=zohomail.com; s=zohoarc; b=UwRfIHxPQbXqRr1iWZqLkwVU+kyoidMt68jweTxOYErZq2dVYQwazfVm2V30MpLWAaSGiEdyIntO46RWoWGJqPOoI2S8v9qx77twViIwy94p3rvIFJe7L2jB6cWSSFs2YGbnrC2Thjuyo1CxGj2o78P3lGhlp0zMhP/t0RvIXdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641748020; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6klwIMQLm+6gVHzgriEwBCM6jutl8PXL81kAF4kdCvk=; b=BPgDvRSfgZn3ffigssLu4SJ2Wail/k5PDVnpC4ZO7/RokaTe0x77cC0hbXgGZH8OEw4kqhjqZcuRxbBaFDRhTCJKbgATg2J73dg5LKzwCiKQkdL2zs+CRuVhb655jizvOb0TYF8Y9oyeqkcK012XWYMEeQvOfTCoCwK2P2kqVMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1641748020961939.3647754399827; Sun, 9 Jan 2022 09:07:00 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id r10so14674547wrc.3 for ; Sun, 09 Jan 2022 09:07:00 -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 n9sm4856138wmq.37.2022.01.09.09.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:58 -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=6klwIMQLm+6gVHzgriEwBCM6jutl8PXL81kAF4kdCvk=; b=L/MD5HyBGB/nwYGMdwEwDizF5SuvhiHr2jGxZjlJISkBKqUiaPo6Jn7np/ciaWrslN nvKG9IJx6X7pmP5GYoIuM+7PgMJ4C4dKAw3dt0hMO2A2gRAK+WbZBGNTmAwgTIMbp9vX /YwMvvELH5meTWze0/I9dQlyBWuqqxcr1DL4lBiSeCAbwwmQWCDeYbm0o+oH7X5j1EuK HLkhC8ilw+9LRGhOC8wnhWCp/+rDvSzdcRMxYnYL9/GkL3Kg0lRh/PRNvdKx844fbsUG KD0EIoACtO4jiEGL2ZacyHr/pzGgFgMtYWuRhbwF8OIXcB/YqOxz4dBOFnlqsyKtMBVf gKgg== 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=6klwIMQLm+6gVHzgriEwBCM6jutl8PXL81kAF4kdCvk=; b=JixpWUjhp3Qjn11kzDCKBzDLpNucxg6rD1YN2KtMUE0q4Wh4PqpetOrUhjEW7wn4FH 6zBnmOmExLbxbk4ZGcG1td66EZBgOQOjbdqB7kC8Gk4FZek0LVZ3rH983yK3yfVl08Ru 4EohVl+0WFnWSeHAG+8yNArXiFJldXyVcMfVOebRvKyJ8406sZ4rIuu+34R0wReWygxK c/F7eD5HGlbG8KeIu/FdO9tN9bzIPfIPDOdq2bJNX6gluKD7Qb42btd6ez2CqkZD97ZK hADRHjzqqSelTmXkehJV0IPgWKxXw5rQS0DnuhjlDX8ivWaBLT+FXR38Y+jJ3CvxXwUm WHmw== X-Gm-Message-State: AOAM5316+Z3IkP6uI5/EPHOl+h6KEsLgWunwFjcK08f/lUSU+ASyhgnX LBkAIksLZa/UazHQVrKV7rY= X-Google-Smtp-Source: ABdhPJwHcsimFh9wi+htaafurpQtRH+AjwxWaBXhD4L2wGqlpdZcbpG86MXrY22iXv+87HJQQazBtQ== X-Received: by 2002:adf:ffcd:: with SMTP id x13mr3069248wrs.672.1641748019169; Sun, 09 Jan 2022 09:06:59 -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: [PATCH v2 6/6] gitlab-ci: Support macOS 12 via cirrus-run Date: Sun, 9 Jan 2022 18:06:12 +0100 Message-Id: <20220109170612.574104-7-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: 1641748022597100001 Add support for macOS 12 build on Cirrus-CI, similarly to commit 0e103a65ba1 ("gitlab: support for ... macOS 11 via cirrus-run"). Disable deprecation warnings on Objective C to avoid: [2789/6622] Compiling Objective-C object libcommon.fa.p/ui_cocoa.m.o ui/cocoa.m:1411:16: error: 'setAllowedFileTypes:' is deprecated: first de= precated in macOS 12.0 - Use -allowedContentTypes instead [-Werror,-Wdeprec= ated-declarations] [openPanel setAllowedFileTypes: supportedImageFileTypes]; ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Framew= orks/AppKit.framework/Headers/NSSavePanel.h:215:49: note: property 'allowed= FileTypes' is declared deprecated here @property (nullable, copy) NSArray *allowedFileTypes API_DEPR= ECATED("Use -allowedContentTypes instead", macos(10.3,12.0)); ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Framew= orks/AppKit.framework/Headers/NSSavePanel.h:215:49: note: 'setAllowedFileTy= pes:' has been explicitly marked deprecated here FAILED: libcommon.fa.p/ui_cocoa.m.o Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Generated using lcitool from: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/210 --- .gitlab-ci.d/cirrus.yml | 16 ++++++++++++++++ .gitlab-ci.d/cirrus/macos-12.vars | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 .gitlab-ci.d/cirrus/macos-12.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 19e6c21401b..719008b13ca 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -90,6 +90,22 @@ x64-macos-11-base-build: PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 =20 +x64-macos-12-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-12 + CIRRUS_VM_INSTANCE_TYPE: osx_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: monterey-base + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 + CONFIGURE_ARGS: --extra-objcflags=3D-Wno-deprecated-declarations + =20 # The following jobs run VM-based tests via KVM on a Linux-based Cirrus-CI= job .cirrus_kvm_job: diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-= 12.vars new file mode 100644 index 00000000000..997dbc762c8 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-12 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +CCACHE=3D'/usr/local/bin/ccache' +CPAN_PKGS=3D'Test::Harness' +CROSS_PKGS=3D'' +MAKE=3D'/usr/local/bin/gmake' +NINJA=3D'/usr/local/bin/ninja' +PACKAGING_COMMAND=3D'brew' +PIP3=3D'/usr/local/bin/pip3' +PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepox= y libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb l= ibxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config pyth= on3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo= usbredir vde vte3 zlib zstd' +PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' +PYTHON=3D'/usr/local/bin/python3' --=20 2.33.1