From nobody Wed May 15 18:45:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.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=1641820210; cv=none; d=zohomail.com; s=zohoarc; b=mZmFxfp3EWggaxZUM2EeNscZ6iSKmmYmoj455c8zpWPXxO08tJWqNaZ4f4MozQDcg8lT5dlzIbjiKImFzC5HfGBMvk/QDiypljbN/Q/aTwlJGaLb3vONZT/D6xdifDEdQ1satGtOrt6/kGjEqURv2izncRy/JyD2Fs80yi1bYpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oyq4zDE+6UEeLvk8aIlP6RN2H+fI0F9i12xnj4+kSn4=; b=ijQ3FvBdgq9VMDXk9x0kwbBCmvTMk3Iu5IFxlaAMlINLEdwV5UyiVEdzF8Wbnx91Y8Pm/rWtz5dxJ12+eUVYanhuinRer+vLYX6Ka/1U+RdsSqMQef42lp/2A6mwqTKw2hgT+3CPuNMr55eHolx1RtwoaRgFkDCBb1Kc1TMOtzk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1641820210392181.33005324784665; Mon, 10 Jan 2022 05:10:10 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id 25-20020a05600c231900b003497473a9c4so789664wmo.5 for ; Mon, 10 Jan 2022 05:10:09 -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 l4sm5153719wru.74.2022.01.10.05.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:08 -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=oyq4zDE+6UEeLvk8aIlP6RN2H+fI0F9i12xnj4+kSn4=; b=UHsoOzl4axun4fXfBThPY7bVDxREESBkqgi7n2ad5h6oI7yXcB3bKJTl22YgS4C+79 sjkKMYlyfZ35qA6e4LVEU+rASEhN2q6IZmy54Bz72+eLLoPXUWSPQQSzUcuxhsAa0m// b/1shjAZyjh40UjgqulZL9tBvWQLHS1IXk0tQQab2gp6v1wOFRqf0xBvF//EIHjIzk0H /GcQz/QTYh+xuOmjlyLS5OQxwMicSbjvsLArZt+800HPuTzemb0IT5IpTb8UkE9Jshog bknDqUD6PsePdeWNpouqMs8D54SD6ACbNtA7ncTx7FAi0UFbCdm1KN0qH9ltI9cNwtZX 7W9w== 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=oyq4zDE+6UEeLvk8aIlP6RN2H+fI0F9i12xnj4+kSn4=; b=6nWtgoa1D5FnSmo8Xw8NGd4G7H5Pj6g7SX5ChipLLrUqsc8xFXxadfsJsvOjzlAblF H0dKiF/qK8/avDSIXDY3BZT5g5WDF5sC+rhveTMD2FyAuut/r7JOI5i270Wbs8iZ9djM HcxIfKLcIomPTd+A/fQU48BZdjF2+NLnCDzFBY2161rasP1cCTxvJ2sjh03Cgyx6X9m9 69Mz0jh7oGpk/o48RRhhwngbHe7TFhci/5VN/tQaeI0pNga+jCM9O30a0XJr6x+t8uiH Rowqxcm+Yb9cCsH758q+A6I0JpDypbzNt5FeClIWu1PItEYVWhq6Uqt2vTgbX8hnwh5h 7iFw== X-Gm-Message-State: AOAM530Bl9D2DPyKwb95ehj4WHMFhJTc9t3aokQ3DCQUXxoUiYMrlDBr 3MNkUvUQu+ROzKB5z+urPFg= X-Google-Smtp-Source: ABdhPJx6u3ejU5wvWrGdAwYSOzqrN0CprvfSELAAiKo26Pu+xnulDfoUW2/v/IQbHvctlE5n9BCPSw== X-Received: by 2002:a05:600c:1d28:: with SMTP id l40mr12346768wms.174.1641820208688; Mon, 10 Jan 2022 05:10:08 -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 1/7] configure: Allow passing extra Objective C compiler flags Date: Mon, 10 Jan 2022 14:09:55 +0100 Message-Id: <20220110131001.614319-2-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: 1641820211135100001 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 --- configure | 8 ++++++++ meson.build | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/configure b/configure index 0c57a063c66..adb42d8beb1 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) @@ -1318,6 +1324,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 @@ -3843,6 +3850,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 0e52f54b100..a21305d62c1 100644 --- a/meson.build +++ b/meson.build @@ -3286,6 +3286,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 Wed May 15 18:45:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.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=1641820215; cv=none; d=zohomail.com; s=zohoarc; b=dctvGg25eKb3tX962d9S+NdKmsIRrtr8UZFmNy+wQ/Bo50X36eV7umv5rptQMrY2SeTJy8reb1Ux+VJp6BdAaklZt6EutawzHw/IIkA4QIJTjFFAMQanEZzFvaJtndCxZ1OYJQRI8t5ZmNDzfH7BE3DMcXUc5dSRKHCCNZW8pbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820215; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7J38PA7fo5uOi1FDkTH3MlYdSdNJH0Ez5wJ7c5zRjGA=; b=ny0HzyUnv7Fb8UjNiKSelTJzn3gI0frF+WWJpMxsCnAchm2o1G45DUlDahJ7LmKoXefJzvYNCbWy17JTZICa+0ycT8vePmWpkONl95pOZS2fIApet68+68sb92GYErj0l5s3yUEHiWKC+8mj9ysu/OoM7nCa89BIFnJ1LWX8NZI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1641820215167282.5609051478108; Mon, 10 Jan 2022 05:10:15 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id f141-20020a1c1f93000000b003497aec3f86so2986wmf.3 for ; Mon, 10 Jan 2022 05:10:14 -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 l4sm6632689wrm.62.2022.01.10.05.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:13 -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=7J38PA7fo5uOi1FDkTH3MlYdSdNJH0Ez5wJ7c5zRjGA=; b=SaZoKm9S3wqSqADbVJ+0ZoWzk4nljHmuLkxbidOglgscrdbGbzC6GvxX1Mu7moH3e7 yYPFx38FpJjrkeFzS5RP0wpa/31ePpf/PPOSQbcqWL6KRivZ0qdGodc7KW0v9RHSJBrQ G/dGDhFVlAh7vJ1hz3p8PuxlaaUGzK3D50TM3YUbgtgp/mfiQunAIYj+C3bBW3oTj6ce egbWERUALBhCWQQe3ApDx0eWaha/F7sl7VDdBvmESnOYRrPRVrgOR4Ik2Qi0zRpyLp6k DQLKOWku5LWqlFWSNPAJa4Y9FBX3bJQsJlP2WZ0Wcm1tnK+yZFfLQpk8iwIDj1VAx+YD GXBg== 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=7J38PA7fo5uOi1FDkTH3MlYdSdNJH0Ez5wJ7c5zRjGA=; b=TXUg6zftjcTXpWNsR7UyJsaTwW5pCj/1TRld+EwEhLkGxoUixiEhTbcjMG5IYN96qU W0FJjEKxqMwZj54iknDZI9OfdH/XNr6ies+83MSEmpgnRWeYj+pSRXxJ/zTtuCutjm3b wpsZg0oSZBWe4wSK1tgx3U2QDDNtF5Ns5PEA4zMNuU5XRc21GAshqIpbiGPlM9P3qliu zDNtYK7UxG4AOTmzMYtoLd5d5J158EIzqP3nkwnOaZlcROAON+RFT/sHBMkUB3QftftH oGLurk55KzhOtudU1wr5YjbeqNMrb5a+Ea7k8wAzMut3jjnpv+XOmrSCTeNtX7dkuET3 bjqg== X-Gm-Message-State: AOAM530LfZuUv8ERw0Uv8NGUURLZ0iS8uLlHphidey4W7/+QpAy/J6o3 Gu3yzUJMFTweqVFTC7YAsLY= X-Google-Smtp-Source: ABdhPJxr8MoHgU5OZVvs/hmm5M11/b9B2wOkr5WtXqVonyuNzlu7v3cEPr0dZadAmgnyuOyfxhAx1A== X-Received: by 2002:a1c:545b:: with SMTP id p27mr12228387wmi.178.1641820213499; Mon, 10 Jan 2022 05:10:13 -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 2/7] ui/cocoa: Remove allowedFileTypes restriction in SavePanel Date: Mon, 10 Jan 2022 14:09:56 +0100 Message-Id: <20220110131001.614319-3-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: 1641820216670100001 setAllowedFileTypes is deprecated in macOS 12. Per Akihiko Odaki [*]: An image file, which is being chosen by the panel, can be a raw file and have a variety of file extensions and many are not covered by the provided list (e.g. "udf"). Other platforms like GTK can provide an option to open a file with an extension not listed, but Cocoa can't. It forces the user to rename the file to give an extension in the list. Moreover, Cocoa does not tell which extensions are in the list so the user needs to read the source code, which is pretty bad. Since this code is harming the usability rather than improving it, simply remove the [NSSavePanel allowedFileTypes:] call, fixing: [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 [*] https://lore.kernel.org/qemu-devel/4dde2e66-63cb-4390-9538-c032310db3e3= @gmail.com/ Suggested-by: Akihiko Odaki Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- ui/cocoa.m | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 69745c483b4..dec22968815 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -100,7 +100,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, static char **gArgv; static bool stretch_video; static NSTextField *pauseLabel; -static NSArray * supportedImageFileTypes; =20 static QemuSemaphore display_init_sem; static QemuSemaphore app_started_sem; @@ -1162,10 +1161,6 @@ - (id) init [pauseLabel setTextColor: [NSColor blackColor]]; [pauseLabel sizeToFit]; =20 - // set the supported image file types that can be opened - supportedImageFileTypes =3D [NSArray arrayWithObjects: @"img", @"i= so", @"dmg", - @"qcow", @"qcow2", @"cloop", @"vmdk", @"c= dr", - @"toast", nil]; [self make_about_window]; } return self; @@ -1408,7 +1403,6 @@ - (void)changeDeviceMedia:(id)sender openPanel =3D [NSOpenPanel openPanel]; [openPanel setCanChooseFiles: YES]; [openPanel setAllowsMultipleSelection: NO]; - [openPanel setAllowedFileTypes: supportedImageFileTypes]; if([openPanel runModal] =3D=3D NSModalResponseOK) { NSString * file =3D [[[openPanel URLs] objectAtIndex: 0] path]; if(file =3D=3D nil) { --=20 2.33.1 From nobody Wed May 15 18:45:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 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=1641820220; cv=none; d=zohomail.com; s=zohoarc; b=NL9Unyc9Zo7xQBnvOj3Cc2O5n4Fk5GC/TvjJI4obrU8YIwo4QlR/DMKI6lvzcogvbD98yRjMQg+Oa55AAxUArDWQUUGGn8hCkHP+0T0FZ3aXFSp2IE0HcbUclqCfQMrzQVX7HQrQYwV5RVWlW64+vdx3+6TOO49w4tRSq1pOirY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820220; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F9FAq6nwbgCvDM7C2Sg9iiaLq9FrL+HtewEtG7ypUf8=; b=M/BjyKg/ITe3vJCNLXuU1jYf8ntrP1uk3XCAntFXVKHgl7R3ELPh1wio98wQs0BEThnNNvjfKmdCohhn5N44LHYU7mTydNeb7sdwSWmdB4yYT4XUxAJbYzwYDftyDOLRZ7lFJ/aGuAVIJrzsofnRm8jaTtm7khyr1Ua+pkDPOrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 16418202203114.814530208155475; Mon, 10 Jan 2022 05:10:20 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so5153500wme.0 for ; Mon, 10 Jan 2022 05:10:19 -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 n9sm7196491wmq.37.2022.01.10.05.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:18 -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=NTT7NtWWNk6WEO4Z/1SLkxfP3QwsnhbkxSqrOJEY0Zm8Qep1/RbIG0Et2SRYmIQLJO PodF702S+K3soNxt3xEjqjRimb6o3k88huBYE3Wh1LMKiWfVEcAZWuqf5Qj9OdWqZ3Km Y/MvfmxbTFIeocC+XMiaPSEj4SuzGyfVBqTHiT+iKUOQSqH06kKMrQ1XLc3TzHX3cRuV UrP5CQ8Xupv4UCIDEolakrzIYVf5AX5HjwJ37FHv+yIcERT0ZsYF1nelHhv7/rVLt/Qd pWNskPL+h0hppOcU4W3blhFjNdy9AKlDqniaUYmpnKc0AQPYJ05vmB4xcIksx2am6lY8 rI5w== 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=XDytp/+xpnwgesESa7qzRjSt8Bzm8Ae+hv5F1W+y6axKdwCh/tXiw3ApS8DNmFdHCE jYlb35GYHCObZyuYwFGSmKcZALn4eetKjx+CxNZsGa47Wwz/Qlo1Ja7hYrZkiMbJUSVo WapW3NLSS0et5bR+Wvgi33zGYYc0G5nHoff/4oIUgWFsw5ZA94DCIiP+AcvRmQUSJ+vb NzlZtgKHi7413yQIXjcv7Ywa6IUSEgLc1BpVaf95krSSSNy1dwXT0mqPQ330hVua7paf Hl/11lUzH2S5pUJ7hYy32xHRbNFhCCHYcnm5CQSCdnbuNzLbyfClVCzseeN4TV+9aopr 13Yw== X-Gm-Message-State: AOAM533G3yRw2y4liCwKLUIaOTWTpKwS4TX71xDWzlRkax+M50wKxNiK L9llD1TUspvULmfuJ42/BLE= X-Google-Smtp-Source: ABdhPJwHuyLQVs9qiq6enIw0W0jOkkg9tJ7+g1zrzFjcIOV7/d/RzIrKP7wd8eTqQJesBV+ruk6U4Q== X-Received: by 2002:a1c:a94e:: with SMTP id s75mr11294806wme.34.1641820218633; Mon, 10 Jan 2022 05:10:18 -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 3/7] hvf: Make hvf_get_segments() / hvf_put_segments() local Date: Mon, 10 Jan 2022 14:09:57 +0100 Message-Id: <20220110131001.614319-4-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: 1641820222312100003 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 Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- 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 Wed May 15 18:45:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.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=1641820225; cv=none; d=zohomail.com; s=zohoarc; b=FJ/TiVHPS93mRJuRM8r4wUUBclCW6P7/LskQM9grTsnBGrbaZ0mFlYqgGgQ0OV9GsIIpNyuAo+/PvVVYn1hqwqYxouxdVOKXAIztYqH15T4D3yIzbdM9JtkbKJWQdLnQxBipbjVZPaJO6fqdBb18FgSKr/oNGeJu8q/TMl0ubsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820225; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iN7rmJCyt/9XOylIukKsQBez3yTqjDEoUhXX6uhz6nk=; b=elYYAPYvQ16b65tQ/tMefI3xjZXZ8KAkrb/ENuNIV2G76/jYA4L5eGJVyOwVeUktcvqrdVtXK8y+h3/je47y+FmeReJD56c2X0We2dGqUkTm0g6Z8gdmTawyY20NuZqbBQ1PaajLKHx1N3nreiBvZreCM0PAdsQJJyBOqMSB2a0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1641820225454429.0643223189785; Mon, 10 Jan 2022 05:10:25 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id c126-20020a1c9a84000000b00346f9ebee43so7180949wme.4 for ; Mon, 10 Jan 2022 05:10:24 -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 o15sm6930798wro.70.2022.01.10.05.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:23 -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=lff4p114YEVct2vn7c/af0gN+4CpPp4U/Yph4r2HMbiUnSsnx/JatYA8sqJZ6WtIJE tNRhINXYCFMBPKDia2c4VvEgfggRASktfqbG5fxYTLlVaLZJOnbqayzny+zZFNunPpv7 uP5OR3u/YvUh5L3v6TF2DNUMIludloS2aa09nTITdHrn86oi+dNw5+IBC3HbdT9ZwQNW cS6rD4iJKvK7cEPauMSR+x4LkOZqbQ0RJe9Wd014TszGPvrmb5ZEigi4KqlUSYEaU8ST c1wYtewZm6FU8QYx5Sak5PuBGdfv9JcIOEDLwnp9ntuI+PcirIDHAUmw2eWZjyJ5hPzr hNEA== 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=psOZ3b4OOo4PGH3oGJlUKW2hhxmKL/cIB+Nsll3BIZxbNRZjJLjFHfmcJnONEHYiKy j7X+PNE/FiAdWIfm0vJteaqapytbohc7idxeZoR4V13m+wwR4pd2BJh1JmvzWNgTRziz /D5tRQSqXAuV1DkP68Oul55m6K7NNP3MxAVGvnvU56ZujyMbhTvGmT5tPcqrrLhp3D7k z6imb7mZowY9MCm5VwvFdhdlCGDZgPJYFhFaSQdAQnuolWx+Us1bjRDseVJVQJVZppve 8sC/+CpFr/yph8ZTzNW2irBW3XbVfF499t8mdOxHr6Eka1zLJdYzF/ZWqnDHKcsCuAp4 aQrg== X-Gm-Message-State: AOAM533Z1JKA3tuSGiaeuDDFwJBdva5Gr3hOQq9bchtMhsBh3BpYiN2d rO7f+Ut5R63x2mJUZviYHGQ= X-Google-Smtp-Source: ABdhPJwWVS3okc2AzQo3F2ukXhTa0R+QCTHvcFj/kq4eYgjBstvycGMOzovO8m0vFo9iX2aPb/N3dg== X-Received: by 2002:a05:600c:6009:: with SMTP id az9mr21993042wmb.32.1641820223655; Mon, 10 Jan 2022 05:10:23 -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 4/7] hvf: Remove deprecated hv_vcpu_flush() calls Date: Mon, 10 Jan 2022 14:09:58 +0100 Message-Id: <20220110131001.614319-5-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: 1641820225997100001 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 Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- 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 Wed May 15 18:45:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 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=1641820230; cv=none; d=zohomail.com; s=zohoarc; b=lEcw6UQ9jKcPUUeqDHxtRPX4EVYNGHOEb5I36YZeOGO5aBBiYKRuna3s43oSi1vfDjO3MFPXiCJ6GDCJUlC7y77B6dp2LFqx61O/OmpmnZBzFh+4kC+IIK7w7EkF8cNQTLhX1JH3NsqIiGSgRsu+bgi2Ge3qCTpPO/IaJPvVr6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820230; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ytK9KYzbdIauT6uBw9oxJi+tTQp7kAtiRaxptTl3zRc=; b=RwFBX1QSYmPwgNGMPVxieGjCtuBxZLFEmd3nYK5vxotJjwxLkWmNsaPo3H4N8m8B9lNqQG+WrFqN7x4IrbinlqVKapmKUvzCXHkrhseuuw3FbnTkVZWd4e6hsmkeiJKBJXtkI4MZwafWop929Yl8fkLscJ1Og6dvhIvoMXptjWY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1641820230308244.28679020041443; Mon, 10 Jan 2022 05:10:30 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id s1so26699506wra.6 for ; Mon, 10 Jan 2022 05:10:29 -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 az1sm6762949wrb.104.2022.01.10.05.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10: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=ytK9KYzbdIauT6uBw9oxJi+tTQp7kAtiRaxptTl3zRc=; b=fXUdvQvOlCSS0lFG+V1hPvdhRjB3er6VvruMzqCWzWxX+Ba+meW81nj7JmXOpPAFzf 5jl5UfDCaEi6lhBRyZJzNF8CrDV6v3ZmZtjtoZ8OT8PhpqmOiTT/50hPN6amC5GMjUau TBDrpI4B7uE+c6WEzScqJd8eANyfLkgzYbf6jQVSvCMxrXlF69m99Lg4LdjOne7x+sGV Dhu8gbIbCwotdBicjJqfwwzCziis/YmrEjv/gWbj4AvcHMPH+VOJpOrQJNawMqe2tt8+ 2PxHX+9B2pXFmk/HH/YbIdcotEfQSlqYoWIfr6brYHaEZiA1ioSAAJikVAe09p3dg2Ka p7zA== 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=ytK9KYzbdIauT6uBw9oxJi+tTQp7kAtiRaxptTl3zRc=; b=sKVtJKxjvNmUw+a/569aaEDkpD1fEe1x9lj1zNQIKZyTpPKFHKqMcoIn77IBU7Q2TF QlK+jU/hnrrdcTnsN35+BV5QDZkP2YNyZPpU09vBy4FLGP96mFpiN81XB5urBZ/hr2ys SiHEbv7V9DATVYoAUsajpHzFF7SynaSlQKilgkAZp/CALYBH+/s5F8W+JGyOi8IPsqNo /a8DxrjoFynxJz/u8bWZBZVjmGMYVFRe1MrFnQIvJv1oz3CVLpqgdEOdWnOthIdBqZzq J675T0it98O8iLaudzFFkDKJrjQLMCqEEp1NKa/YBcFFs4noC60XC+AMDKF5OlOlwQlN Eu0Q== X-Gm-Message-State: AOAM532/v9hRM5x/UkxgHs/Du4VNtaAj5WcHd5+zlyxoV9vegHlTHmqc EdTbBwbtmhcNTGuOEOi5NRI= X-Google-Smtp-Source: ABdhPJw2uW5XGtzfsdrBthGNN4PwgF3o+F0s+1GxM2p+u+7V3YlBRynnlOznPYdlYcjxvOSErNXH3Q== X-Received: by 2002:a5d:560e:: with SMTP id l14mr3587578wrv.619.1641820228577; Mon, 10 Jan 2022 05:10:28 -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 5/7] audio/coreaudio: Remove a deprecation warning on macOS 12 Date: Mon, 10 Jan 2022 14:09:59 +0100 Message-Id: <20220110131001.614319-6-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: 1641820232767100001 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 ^ Replace by kAudioObjectPropertyElementMain, redefining it to kAudioObjectPropertyElementMaster if not available, using Clang __is_identifier() feature (coreaudio is restricted to macOS). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Checkpatch: WARNING: architecture specific defines should be avoided #10: FILE: audio/coreaudio.c:47: +#if !__is_identifier(kAudioObjectPropertyElementMain) /* macOS >=3D 12.0 = */ Should we define __is_identifier() to 0 for GCC on macOS? --- audio/coreaudio.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index d8a21d3e507..73cbfd479ac 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -44,10 +44,14 @@ typedef struct coreaudioVoiceOut { bool enabled; } coreaudioVoiceOut; =20 +#if !__is_identifier(kAudioObjectPropertyElementMain) /* macOS >=3D 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 Wed May 15 18:45:25 2024 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 From nobody Wed May 15 18:45:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 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=1641820240; cv=none; d=zohomail.com; s=zohoarc; b=PliPmYZQf8TGa98VJaDwSXcQwV0GAxR6egxAGdy7DnJS860N0E1nNwHysgN0nW0zPCF7vk00YmD2oldy6C3HdIAT3MMkZki0OrjiwUWeOnKpH448NZaGk9u0H5uZ4LAkVFiXhYD9f4C09sb6wNMStmcd/3mgrjirqTns+wZ/KK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641820240; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MyQw0vRvhpYAru8FNSMFrr5l9kS0HF1eFpUQdevfGzQ=; b=B9cP9+DHQx4JZ+XBkQQ4VbL4EMpF2NUdXHG0QgwfX3Z2/qjCcC7QdzpDFud6MT08R7zlVyjrWFaJMjuVN7Xrni3LN7zMfx5TBdjWGCRf8+kuAMV2hbe9FMCSvruL5WzMupTYSLRHvN3orYccLmD37V2psZctM+Jwu3lVv4WV+cs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 164182024020260.81353648134507; Mon, 10 Jan 2022 05:10:40 -0800 (PST) Received: by mail-wr1-f54.google.com with SMTP id x4so1496959wru.7 for ; Mon, 10 Jan 2022 05:10:39 -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 f10sm6982246wmq.16.2022.01.10.05.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:10:38 -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=MyQw0vRvhpYAru8FNSMFrr5l9kS0HF1eFpUQdevfGzQ=; b=M882QNNLuRpiWJpL3GRKsWNZX8Nf+rt5b2TTNV51iq8S63CAzOJhxJl2mokCQkwhNE DQLL+5rmHH3xqKBwauo/dEKo2IY/KHO47srrZ5lpt8kghPQb2Iv+lmrb63E2+A/vAqkf xUdVAmpL9Y+ulARySrzw9rrhHFAF4ssaRcPUVr+c4gHctQN/Oh0nfgW+YQojjr9RdNBh carUAfYjoQa3Nc9HWMo9TXNA6QAAxXIt7VlIdODfy9qwBRbfxMfuoChvmiN07vxdcwJQ WHxCVg410a/5STmtnFHKqHAxr7GadfdSDOH8wwtsgAZiwT/GzUuOa/7ZPTYUAIbRwKhG dWew== 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=MyQw0vRvhpYAru8FNSMFrr5l9kS0HF1eFpUQdevfGzQ=; b=iSO8KPJ9rh1AiqcqjDIkNorPkUPWw+0kdQHjnmIeK4kLasOIQVVbdG8MfXEMcd3Txw 52tLGAAhfyTTOWMeLpZ4kkj3KWPE4fc70zEI5G7n+8u6mhT5kmKlST9OKLif3sLxuo2z gvie+jvOpiIodriR4oICLYHCb9Ma3eYSCfucTliVQxkG9uP62/ryW9bVGy3zHX9BGs9c uXCEU8kaKI2UtACxS4cdockVJUCyI20rOZn+3TpsWKJf24JhInI4eDi4Qcm8XEejUbja 61AqERSTD/vRBm8zd+LpLn/I5bEUljOroZEKNKPLEqqPkFpwZecZNB6d359bkziAUKF3 xTWQ== X-Gm-Message-State: AOAM530h/jkpKiBqI26RpAXfUhBC31vIK9wqoi6dWayiPW1/4h8rxMCL k264YSLg/cX4xkyXMS1qnVE= X-Google-Smtp-Source: ABdhPJy+IxRIbBNTQz753+p3412ULp3QvjWGaDTmTMDw9rpY7KLbehlsHyRmGweqwMb2Vzq5Hz0rGg== X-Received: by 2002:a5d:42d2:: with SMTP id t18mr64394695wrr.271.1641820238426; Mon, 10 Jan 2022 05:10:38 -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 7/7] gitlab-ci: Support macOS 12 via cirrus-run Date: Mon, 10 Jan 2022 14:10:01 +0100 Message-Id: <20220110131001.614319-8-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: 1641820241687100001 Add support for macOS 12 build on Cirrus-CI, similarly to commit 0e103a65ba1 ("gitlab: support for ... macOS 11 via cirrus-run"). Update the lcitool repository to get the macos12 mappings, and generate the vars file by calling 'make lcitool-refresh'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Pending on libvirt-ci MR #210: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/210 --- .gitlab-ci.d/cirrus.yml | 15 +++++++++++++++ .gitlab-ci.d/cirrus/macos-12.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) 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 b96b22e2697..b7662959070 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -87,6 +87,21 @@ 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 + =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' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 8f48e54238d..e91e83fed20 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 8f48e54238d28d7a427a541d6dbe56432e3c4660 +Subproject commit e91e83fed2086163013242e8a33c74fbfba7f729 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223d..6ac8b888927 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -89,6 +89,7 @@ try: generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") generate_cirrus("macos-11") + generate_cirrus("macos-12") =20 sys.exit(0) except Exception as ex: --=20 2.33.1