From patchwork Tue Feb 15 08:02:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746662 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB5D6C433F5 for ; Tue, 15 Feb 2022 08:17:16 +0000 (UTC) Received: from localhost ([::1]:43396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt1P-0006YM-MJ for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:17:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJso0-0001nc-Tc for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:03:25 -0500 Received: from [2607:f8b0:4864:20::631] (port=34555 helo=mail-pl1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsnz-00028v-2j for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:03:24 -0500 Received: by mail-pl1-x631.google.com with SMTP id 10so12529417plj.1 for ; Tue, 15 Feb 2022 00:03:22 -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=DZ6HMC/awLS1AtcPS+4P+ISmJMCsR4IlAO4kOPlAwl4=; b=oQY6/YRaEf6gdQ/3KCKaVYP3np6B9W4I81+FBgiSyR4Uyx/xLhpF8xV+8yNBg6dcpj 57H8Irwi1RooDY1j9ffhv0SiBU97osAYKOaszlIX5KHIn5RK0odmCGZxDnGm7xCxVTED qpMK2lru0OJzhoACAh4YfXBCRfyWUEbCUpcd71xCqe1Yds0VJhlBtKycoBI+TSvM6IuJ UQnllC/eXwNK+SUPj2QzMxvJqFe9vZGQBiLTF8518i8IQnnLN17hwG/U8OjeGsPxTCQW 4Ck1KrLaU9u6FZytNApCcGRguc2mAYxaxyyX5thaf8ntmPAw+B4AEVH90dXTlSCE7BZs S2mA== 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=DZ6HMC/awLS1AtcPS+4P+ISmJMCsR4IlAO4kOPlAwl4=; b=4u+GT631zyX5sFrLcUo6hn9oYf/zJQicabgbqf/LK+IYoAR5/ziPeSIdsjdYkzTcvA JUNfojcdDtQTsVZC+ei2lT9mOkeCODLA56VtagXN37auentXIN6Rn6Itt9T1eXANqHCf ydYJN1cK7RhAoSriwlx5C3SvSbfmj7uCQpq5FsVV6atDVA8tXhlB6OergUi/BPh2dE+S 11D4UaSCAGHNPdjJfZC71nEsrswM6iap5LpNLP7xqn2LQueBMbvoeDoTzXN5T53OFr+g +dEeDtOTmcwrtSMSOFu0mOn2fqAPxyerj2xkvfFgmXT7z/c/UtxHRymNb9xSqTm6zjjj lcAQ== X-Gm-Message-State: AOAM532TukZV1WPB773ztyZfivb6rPqhZJ6c5kGdhDzQFYmsqhrjs+1u UlFBl+DpDnZbEIaHp15byKZdsUdrcwA= X-Google-Smtp-Source: ABdhPJzvpCVodzTdhoNyTi/9v61kltYhrulAf40BzL/uYeCdLBrO3anUQ3Qgl+XqLM5qd28XtzG6cw== X-Received: by 2002:a17:903:2cf:: with SMTP id s15mr3049356plk.150.1644912201701; Tue, 15 Feb 2022 00:03:21 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id p4sm1718681pgh.53.2022.02.15.00.03.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:03:21 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 01/15] MAINTAINERS: Add Akihiko Odaki to macOS-relateds Date: Tue, 15 Feb 2022 09:02:53 +0100 Message-Id: <20220215080307.69550-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::631 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x631.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Akihiko Odaki Signed-off-by: Akihiko Odaki Reviewed-by: Christian Schoenebeck Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220213021215.1974-1-akihiko.odaki@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b0b845f445..ce6f4f9228 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2406,6 +2406,7 @@ F: audio/alsaaudio.c Core Audio framework backend M: Gerd Hoffmann R: Christian Schoenebeck +R: Akihiko Odaki S: Odd Fixes F: audio/coreaudio.c @@ -2658,6 +2659,7 @@ F: util/drm.c Cocoa graphics M: Peter Maydell +R: Akihiko Odaki S: Odd Fixes F: ui/cocoa.m From patchwork Tue Feb 15 08:02:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B01FCC433EF for ; Tue, 15 Feb 2022 08:07:42 +0000 (UTC) Received: from localhost ([::1]:56858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJss9-0004jN-LU for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:07:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJso9-0001vb-LF for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:03:34 -0500 Received: from [2607:f8b0:4864:20::42d] (port=37858 helo=mail-pf1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJso7-00029O-OK for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:03:33 -0500 Received: by mail-pf1-x42d.google.com with SMTP id y5so33598076pfe.4 for ; Tue, 15 Feb 2022 00:03:31 -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=9AHl4PWSxPKlzGOmJiwTT/tCSVVYvFbKDzeLrCswrLU=; b=HOmcBDoyXXJ5aCtGwnPH7zvSP3029NYtwB2lom87Pm2a3TzRCqsiXCOPUl9qziL69d RX/wvRdi8UTPd2/ktcF58XdgNNclHPJHiUlf861AiA/AnE1Q1wlu6ZRXqWICTOQWInJF +L6E58BZuHaCR7yoeVILQzvH76eS7e6hJdEk7j1bskIeIBG0R2f5UXEexGc9igcMF5BE yqq+fQStr62OG1HDr30ud0R6FIg+4A+PjY4FVdZO3sCsNI/2boT96xa0UvFwh0bKP7XK EcFl4IuSkGCTZ+xPf2Q3KSxPhwGJFBeh1Pf1UI8rA1KCgnoB4dNvuojTkieQsflIWuW3 zirQ== 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=9AHl4PWSxPKlzGOmJiwTT/tCSVVYvFbKDzeLrCswrLU=; b=09mJ+Ogw324gpaaO2wl+LBIM0ddxTBrvXJAN8KgxnnHw+hRt7oTSIpWDc9whab9ZhR UfF2P/61Eb2hiDOc4YSQSu9X5fVLyAMsqjjmLjoh0Cr3O4ZVqvCYyvKhBVKQWaUKffJR pivGTsOYklYhBBgIx0wKJH90z3IDOfn10tm4LoVdR7yGZqttmOJQUVZqlOJeG45tSfho LBWZQkS3V/vg0L2j2oAvEjiki3h2ul6cR0yO1+hgY4pC1/OmMJ4RuzWiZZxJMEEJMgot ymoTD3VqCFWvM/K8exBcDzHrFHj9BL+l2TGwi43ZfWoERoZEA0m0H9Ek4F0Mj7cnol/q a52A== X-Gm-Message-State: AOAM531cwBDBTk6UlFOPH6J8fZXoYn32GrHMZsmPNapkQB5CBBNjVcAu saI8y2Xepq1E6yxyXx8BTfjmeOYlLhQ= X-Google-Smtp-Source: ABdhPJyzrZ6VsJvKoio8ZPNs5+qFzHUfDXc4dUV84eHaRLl9EI3q7IlrBICPi9ZTRkbic8xD5rl5TA== X-Received: by 2002:a63:2bc8:: with SMTP id r191mr2488263pgr.347.1644912210243; Tue, 15 Feb 2022 00:03:30 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id q11sm42256334pfk.149.2022.02.15.00.03.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:03:29 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 02/15] configure: Allow passing extra Objective C compiler flags Date: Tue, 15 Feb 2022 09:02:54 +0100 Message-Id: <20220215080307.69550-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42d.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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é Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- configure | 8 ++++++++ meson.build | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/configure b/configure index 3a29eff5cc..06c03cebd3 100755 --- a/configure +++ b/configure @@ -287,6 +287,7 @@ done EXTRA_CFLAGS="" EXTRA_CXXFLAGS="" +EXTRA_OBJCFLAGS="" EXTRA_LDFLAGS="" xen_ctrl_version="$default_feature" @@ -391,9 +392,12 @@ for opt do --extra-cflags=*) EXTRA_CFLAGS="$EXTRA_CFLAGS $optarg" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS $optarg" + EXTRA_OBJCFLAGS="$EXTRA_OBJCFLAGS $optarg" ;; --extra-cxxflags=*) EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS $optarg" ;; + --extra-objcflags=*) EXTRA_OBJCFLAGS="$EXTRA_OBJCFLAGS $optarg" + ;; --extra-ldflags=*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $optarg" ;; --enable-debug-info) debug_info="yes" @@ -774,6 +778,8 @@ for opt do ;; --extra-cxxflags=*) ;; + --extra-objcflags=*) + ;; --extra-ldflags=*) ;; --enable-debug-info) @@ -1312,6 +1318,7 @@ Advanced options (experts only): --objcc=OBJCC use Objective-C compiler OBJCC [$objcc] --extra-cflags=CFLAGS append extra C compiler flags CFLAGS --extra-cxxflags=CXXFLAGS append extra C++ compiler flags CXXFLAGS + --extra-objcflags=OBJCFLAGS append extra Objective C compiler flags OBJCFLAGS --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS --cross-cc-ARCH=CC use compiler when building ARCH guest test cases --cross-cc-cflags-ARCH= use compiler flags when building ARCH guest tests @@ -3724,6 +3731,7 @@ if test "$skip_meson" = no; then echo "[built-in options]" >> $cross echo "c_args = [$(meson_quote $CFLAGS $EXTRA_CFLAGS)]" >> $cross echo "cpp_args = [$(meson_quote $CXXFLAGS $EXTRA_CXXFLAGS)]" >> $cross + test -n "$objcc" && echo "objc_args = [$(meson_quote $OBJCFLAGS $EXTRA_OBJCFLAGS)]" >> $cross echo "c_link_args = [$(meson_quote $CFLAGS $LDFLAGS $EXTRA_CFLAGS $EXTRA_LDFLAGS)]" >> $cross echo "cpp_link_args = [$(meson_quote $CXXFLAGS $LDFLAGS $EXTRA_CXXFLAGS $EXTRA_LDFLAGS)]" >> $cross echo "[binaries]" >> $cross diff --git a/meson.build b/meson.build index ae5f7eec6e..df25e7a5e7 100644 --- a/meson.build +++ b/meson.build @@ -3292,6 +3292,11 @@ if link_language == 'cpp' + ['-O' + get_option('optimization')] + (get_option('debug') ? ['-g'] : []))} endif +if targetos == 'darwin' + summary_info += {'OBJCFLAGS': ' '.join(get_option('objc_args') + + ['-O' + get_option('optimization')] + + (get_option('debug') ? ['-g'] : []))} +endif link_args = get_option(link_language + '_link_args') if link_args.length() > 0 summary_info += {'LDFLAGS': ' '.join(link_args)} From patchwork Tue Feb 15 08:02:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9A892C433EF for ; Tue, 15 Feb 2022 08:14:04 +0000 (UTC) Received: from localhost ([::1]:37302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJsyJ-0002Mv-DK for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:14:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJsoY-00021r-Vx for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:03:59 -0500 Received: from [2607:f8b0:4864:20::635] (port=42635 helo=mail-pl1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsoQ-00029r-Oo for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:03:53 -0500 Received: by mail-pl1-x635.google.com with SMTP id z17so12499908plb.9 for ; Tue, 15 Feb 2022 00:03:39 -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=Nu4DUrbIWXAn4pHgWXMlADFVEGOdcq7Po3cgGBBjqHs=; b=N7NHPhS3i4LprApVCgRvDg7OkZeBY6Q6o2+rpXcy7u8dIyhJe0L3du3g3LVfbSovjd UKPJGa4r7fh5YolDFaKTXWhKjG+UOgzw5iC8r9GXyhknHrHkr1+Q7FWgeZNFRHcdq2ck SAQczRBuFcpDQ7dSwL5Ez525t64PUysj9/Uce1RnwQTjc3H7MBd/3+bTaBCBX7P4HnBg palmq7yWzZoHBvoeMvFGUr/q3DgbYANQl6Tidttu3Mo43WE2BlP1sOr68CTOHTYcpkfD 44/B3qsU/FOcEBgInZR1LAe7Eggs2nfxIjuvlAAUynLVIvDNGBoj7afZnqqdpijPNGWL EAqQ== 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=Nu4DUrbIWXAn4pHgWXMlADFVEGOdcq7Po3cgGBBjqHs=; b=nDF1BPDBVE2/mRO5LFCWGHW5ACvDtqXaIexynLlgEcqTvubnRiTzTbGp3rebK4Bv5d LeI3XNOHfTX9KNMi/rx5YVqaX1ucUFm8TRTzuAgjBnHljjNwWnEvhzY2lGojugV8COPH koe2fgAzdLs73tLkF8yevt2DiOFbo5wxdCv+3PRukPDsHcqI6zfUgA4l914DE/zizyYB Jels/cwxtsLNqzZ51upE/2laDZxARAqx03SpCv/NkHe33zi1e9Ix3VZKRTSZlgA0/9Ij n4XmNIc93rL7XGDd5WMCLwJaL49VmdRdy/IdwW63GtytM+7cn93eaHh2yu2FvCdmA1W3 fxuQ== X-Gm-Message-State: AOAM532fOoK2OxCchyrjDAFisxLf5qF/edG1C7ZP0G0l/+hpYuz8JN6F YLWFZQ48QCNCNrPEImA1kbqlGepWFqo= X-Google-Smtp-Source: ABdhPJxL+RtnkMyZpa4qkpaDTWWtgfVeD0g1h0nvuTBhOAueS3nwtQWOgliAKCYXWRgKGGXKVbBqDA== X-Received: by 2002:a17:902:6502:: with SMTP id b2mr3037965plk.43.1644912218568; Tue, 15 Feb 2022 00:03:38 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id k3sm1778525pgt.29.2022.02.15.00.03.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:03:38 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 03/15] tests/fp/berkeley-testfloat-3: Ignore ignored #pragma directives Date: Tue, 15 Feb 2022 09:02:55 +0100 Message-Id: <20220215080307.69550-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::635 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Since we already use -Wno-unknown-pragmas, we can also use -Wno-ignored-pragmas. This silences hundred of warnings using clang 13 on macOS Monterey: [409/771] Compiling C object tests/fp/libtestfloat.a.p/berkeley-testfloat-3_source_test_az_f128_rx.c.o ../tests/fp/berkeley-testfloat-3/source/test_az_f128_rx.c:49:14: warning: '#pragma FENV_ACCESS' is not supported on this target - ignored [-Wignored-pragmas] #pragma STDC FENV_ACCESS ON ^ 1 warning generated. Having: $ cc -v Apple clang version 13.0.0 (clang-1300.0.29.30) Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- tests/fp/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 59776a00a7..5192264a08 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -30,6 +30,7 @@ tfcflags = [ '-Wno-implicit-fallthrough', '-Wno-strict-prototypes', '-Wno-unknown-pragmas', + '-Wno-ignored-pragmas', '-Wno-uninitialized', '-Wno-missing-prototypes', '-Wno-return-type', From patchwork Tue Feb 15 08:02:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B826C433F5 for ; Tue, 15 Feb 2022 08:08:15 +0000 (UTC) Received: from localhost ([::1]:57160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJssg-0004v1-4E for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:08:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJsoc-00025a-0Y for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:04 -0500 Received: from [2607:f8b0:4864:20::1031] (port=36594 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsoS-0002AE-TM for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:00 -0500 Received: by mail-pj1-x1031.google.com with SMTP id c5-20020a17090a1d0500b001b904a7046dso1974409pjd.1 for ; Tue, 15 Feb 2022 00:03:48 -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=3zqaK9s5/raZ8zuTcIzPJOQG8kwceFqw1+s0bbIn7Ok=; b=ZOO8guZCdvEhh9PgJeWtVbHJzKtzZ8W9VhHWh4TDAEAiwb1/xwLBEKUqdUjj8w6Sen Fm/vrgRzuZzlSmA85XG5x/EEnJ3YTW86ob1ATUJXjozKySGLYlqKB3zYGjFcIn4tHRRh Sr+39aQe4GrhORsxdH3r/W1RZv5U8iyPbqpWO1QO2z98QLAKFU7bHfSeTZ/VyT3g2Fjm 8XcRd+pXnrApyZCkgpaRwTPWjw3Ksb/6UA5y87ciHph1QJEPkyocphMCnYAdecPmlEgA BdOAj3E0Njs9TdZ5NAbKqYSD6sr3oDNXpjilimjoQUy+KX47tXS+SbpJP1wh49In9DFH IxoQ== 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=3zqaK9s5/raZ8zuTcIzPJOQG8kwceFqw1+s0bbIn7Ok=; b=4kgVgF4T0Y/H+T/vC7eOpm9VlI628c8dJPR61zF6GmnmIXCeyMRL/lVvserr2YKa1o zg73dCIcHZmLme1NeygwF3Dw5E4R/wWDB+29D5KLci5NMpFRGKUsg75YZ+3enE3fr7eI dmil1CNIwTnur0sgUwkR2D3AI8ehzxhX/eaLeRxYxHu6WprOFuEuWey1qP2CEhfjOgzZ NF560N0t4Q+B2lX5z03vWGG2VGsjBbH4BJOPwwqzegFHuxVyNeaJ54zUG/gbeExrLPwa xqx57rNu3X1YmX0aLycvaa3KCoNMlFtY87RJf1va4GT0Rlo2kt6N3pb+en6eOIgDHN47 ZUwg== X-Gm-Message-State: AOAM53307n0Ac3ePshkPa0WDP+JG4nRa/79L2wdbPCYoQ2nTiNcn1R2o ai7aHKReoOz6jepD0fhDDAbbfcTshJ4= X-Google-Smtp-Source: ABdhPJz2aTrYgjP/oLk6iYPbGmwGp2d2QmOQx7BejTFbgXaUeUbIBt006NCgU9BOFEtYJb6mT6xHOg== X-Received: by 2002:a17:902:dad0:: with SMTP id q16mr3082468plx.41.1644912227346; Tue, 15 Feb 2022 00:03:47 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id p1sm5241994pfo.212.2022.02.15.00.03.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:03:47 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v6 04/15] hvf: Use standard CR0 and CR4 register definitions Date: Tue, 15 Feb 2022 09:02:56 +0100 Message-Id: <20220215080307.69550-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1031 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Cameron Esfahani No need to have our own definitions of these registers. Signed-off-by: Cameron Esfahani Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé --- target/i386/hvf/vmx.h | 17 +++++++++-------- target/i386/hvf/x86.c | 6 +++--- target/i386/hvf/x86.h | 34 ---------------------------------- target/i386/hvf/x86_mmu.c | 2 +- target/i386/hvf/x86_task.c | 3 ++- 5 files changed, 15 insertions(+), 47 deletions(-) diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 6df87116f6..29b7deed3c 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -124,10 +124,11 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0) uint64_t efer = rvmcs(vcpu, VMCS_GUEST_IA32_EFER); uint64_t old_cr0 = rvmcs(vcpu, VMCS_GUEST_CR0); uint64_t changed_cr0 = old_cr0 ^ cr0; - uint64_t mask = CR0_PG | CR0_CD | CR0_NW | CR0_NE | CR0_ET; + uint64_t mask = CR0_PG_MASK | CR0_CD_MASK | CR0_NW_MASK | + CR0_NE_MASK | CR0_ET_MASK; uint64_t entry_ctls; - if ((cr0 & CR0_PG) && (rvmcs(vcpu, VMCS_GUEST_CR4) & CR4_PAE) && + if ((cr0 & CR0_PG_MASK) && (rvmcs(vcpu, VMCS_GUEST_CR4) & CR4_PAE_MASK) && !(efer & MSR_EFER_LME)) { address_space_read(&address_space_memory, rvmcs(vcpu, VMCS_GUEST_CR3) & ~0x1f, @@ -142,8 +143,8 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0) wvmcs(vcpu, VMCS_CR0_SHADOW, cr0); if (efer & MSR_EFER_LME) { - if (changed_cr0 & CR0_PG) { - if (cr0 & CR0_PG) { + if (changed_cr0 & CR0_PG_MASK) { + if (cr0 & CR0_PG_MASK) { enter_long_mode(vcpu, cr0, efer); } else { exit_long_mode(vcpu, cr0, efer); @@ -155,8 +156,8 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0) } /* Filter new CR0 after we are finished examining it above. */ - cr0 = (cr0 & ~(mask & ~CR0_PG)); - wvmcs(vcpu, VMCS_GUEST_CR0, cr0 | CR0_NE | CR0_ET); + cr0 = (cr0 & ~(mask & ~CR0_PG_MASK)); + wvmcs(vcpu, VMCS_GUEST_CR0, cr0 | CR0_NE_MASK | CR0_ET_MASK); hv_vcpu_invalidate_tlb(vcpu); hv_vcpu_flush(vcpu); @@ -164,11 +165,11 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0) static inline void macvm_set_cr4(hv_vcpuid_t vcpu, uint64_t cr4) { - uint64_t guest_cr4 = cr4 | CR4_VMXE; + uint64_t guest_cr4 = cr4 | CR4_VMXE_MASK; wvmcs(vcpu, VMCS_GUEST_CR4, guest_cr4); wvmcs(vcpu, VMCS_CR4_SHADOW, cr4); - wvmcs(vcpu, VMCS_CR4_MASK, CR4_VMXE); + wvmcs(vcpu, VMCS_CR4_MASK, CR4_VMXE_MASK); hv_vcpu_invalidate_tlb(vcpu); hv_vcpu_flush(vcpu); diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c index 2898bb70a8..91a3fe002c 100644 --- a/target/i386/hvf/x86.c +++ b/target/i386/hvf/x86.c @@ -119,7 +119,7 @@ bool x86_read_call_gate(struct CPUState *cpu, struct x86_call_gate *idt_desc, bool x86_is_protected(struct CPUState *cpu) { uint64_t cr0 = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR0); - return cr0 & CR0_PE; + return cr0 & CR0_PE_MASK; } bool x86_is_real(struct CPUState *cpu) @@ -150,13 +150,13 @@ bool x86_is_long64_mode(struct CPUState *cpu) bool x86_is_paging_mode(struct CPUState *cpu) { uint64_t cr0 = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR0); - return cr0 & CR0_PG; + return cr0 & CR0_PG_MASK; } bool x86_is_pae_enabled(struct CPUState *cpu) { uint64_t cr4 = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR4); - return cr4 & CR4_PAE; + return cr4 & CR4_PAE_MASK; } target_ulong linear_addr(struct CPUState *cpu, target_ulong addr, X86Seg seg) diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h index 782664c2ea..947b98da41 100644 --- a/target/i386/hvf/x86.h +++ b/target/i386/hvf/x86.h @@ -42,40 +42,6 @@ typedef struct x86_register { }; } __attribute__ ((__packed__)) x86_register; -typedef enum x86_reg_cr0 { - CR0_PE = (1L << 0), - CR0_MP = (1L << 1), - CR0_EM = (1L << 2), - CR0_TS = (1L << 3), - CR0_ET = (1L << 4), - CR0_NE = (1L << 5), - CR0_WP = (1L << 16), - CR0_AM = (1L << 18), - CR0_NW = (1L << 29), - CR0_CD = (1L << 30), - CR0_PG = (1L << 31), -} x86_reg_cr0; - -typedef enum x86_reg_cr4 { - CR4_VME = (1L << 0), - CR4_PVI = (1L << 1), - CR4_TSD = (1L << 2), - CR4_DE = (1L << 3), - CR4_PSE = (1L << 4), - CR4_PAE = (1L << 5), - CR4_MSE = (1L << 6), - CR4_PGE = (1L << 7), - CR4_PCE = (1L << 8), - CR4_OSFXSR = (1L << 9), - CR4_OSXMMEXCPT = (1L << 10), - CR4_VMXE = (1L << 13), - CR4_SMXE = (1L << 14), - CR4_FSGSBASE = (1L << 16), - CR4_PCIDE = (1L << 17), - CR4_OSXSAVE = (1L << 18), - CR4_SMEP = (1L << 20), -} x86_reg_cr4; - /* 16 bit Task State Segment */ typedef struct x86_tss_segment16 { uint16_t link; diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c index e9ed0f5aa1..df0b91cd42 100644 --- a/target/i386/hvf/x86_mmu.c +++ b/target/i386/hvf/x86_mmu.c @@ -129,7 +129,7 @@ static bool test_pt_entry(struct CPUState *cpu, struct gpt_translation *pt, uint32_t cr0 = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR0); /* check protection */ - if (cr0 & CR0_WP) { + if (cr0 & CR0_WP_MASK) { if (pt->write_access && !pte_write_access(pte)) { return false; } diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c index 422156128b..e1301599e9 100644 --- a/target/i386/hvf/x86_task.c +++ b/target/i386/hvf/x86_task.c @@ -174,7 +174,8 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea //ret = task_switch_16(cpu, tss_sel, old_tss_sel, old_tss_base, &next_tss_desc); VM_PANIC("task_switch_16"); - macvm_set_cr0(cpu->hvf->fd, rvmcs(cpu->hvf->fd, VMCS_GUEST_CR0) | CR0_TS); + macvm_set_cr0(cpu->hvf->fd, rvmcs(cpu->hvf->fd, VMCS_GUEST_CR0) | + CR0_TS_MASK); x86_segment_descriptor_to_vmx(cpu, tss_sel, &next_tss_desc, &vmx_seg); vmx_write_segment_descriptor(cpu, &vmx_seg, R_TR); From patchwork Tue Feb 15 08:02:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B5B0CC433EF for ; Tue, 15 Feb 2022 08:08:17 +0000 (UTC) Received: from localhost ([::1]:57430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJssi-00056T-KE for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:08:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJsob-00025Z-VY for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:04 -0500 Received: from [2607:f8b0:4864:20::62c] (port=36393 helo=mail-pl1-x62c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsoY-0002Ae-LU for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:01 -0500 Received: by mail-pl1-x62c.google.com with SMTP id u5so1328105ple.3 for ; Tue, 15 Feb 2022 00:03:57 -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=yNwQWcROv1TG5S2Qw4iwbs1DWfRgKeSzxs3LLnK2L7c=; b=DyNeRG53iTzqc2vFZJ2yVu6CylTKhUmRo4wQuRu1blFBNfxlr98aVYJ7nlFHD1hEv+ LbvadMpe/lsjoBhYIQAhpSrFY8dZfJXIUeQt63raXE7t+1MYo5hGHIVPhLkdlWApqTA4 nZlON7itn0DwWvwk9oK+8kr5GSvn6iTp1QAxpWtHs7jW5YbwFsLb1Gwbfk0vypMsjEho KM/pEuROjd/5CtQVo5l6ZOD2W0lQTunPf7nf1MPPdmIDLf2xqZGULesSvFn9a2hbXOFX OjOYEecgLHyEnp9hlUfQMwVLWfNBifQlUhh5Bk/WNOrXdEDfBL596zmUqRWXv8gjIBSC Shzg== 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=yNwQWcROv1TG5S2Qw4iwbs1DWfRgKeSzxs3LLnK2L7c=; b=yRs8NqMk0o+YyydxuM0tUYq8xgkikreJOIFGf4urCO48G4hpzQ3WJ/wny0R75cdawR rXm/I4pzHxuPU0x2f3O6OlaygKt9m631m2fZaFyGpAkKwCFyPJleQ5vKDr+lNNxr6GGS sUCfoMImcS2k86qEnWmpE5rkgk+1F1eP1iPKlX/k4UCyrISOp2TdIPv3PcbqRj0LQ6iu AxEW/mCXuspUFlmhDcODHBzn+qvhMDW4RjW5tiyosO0Jsi8gSGdnSG6LORzyqzw04BJ9 6KVU8zUp5WzayluVkWa/zgIiqX7YM75DvByv7iYfYpScvf6ELeIb5KGCwnG+k4PGi6E6 nSZw== X-Gm-Message-State: AOAM53081Kgmk841VNuqZUAlTpAA/8eoZBLouNQmHwV2eSjLLv9HDllh 2t8Ox49fFRlAn98Avxclvf8NCHyZJos= X-Google-Smtp-Source: ABdhPJy4rWRMWSTQa0xZvPyjNzlt4fOkizDYBTYGrOFojD5dGgGDXc9R9V+crw81Jj/X2qDrca/Ovw== X-Received: by 2002:a17:903:185:: with SMTP id z5mr2824731plg.71.1644912235989; Tue, 15 Feb 2022 00:03:55 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id a9sm1720318pgb.56.2022.02.15.00.03.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:03:55 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 05/15] hvf: Make hvf_get_segments() / hvf_put_segments() local Date: Tue, 15 Feb 2022 09:02:57 +0100 Message-Id: <20220215080307.69550-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Both hvf_get_segments/hvf_put_segments() functions are only used within x86hvf.c: do not declare them as public API. Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov Signed-off-by: Philippe Mathieu-Daudé --- target/i386/hvf/x86hvf.c | 4 ++-- target/i386/hvf/x86hvf.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 05ec1bddc4..907f09f1b4 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -83,7 +83,7 @@ void hvf_put_xsave(CPUState *cpu_state) } } -void hvf_put_segments(CPUState *cpu_state) +static void hvf_put_segments(CPUState *cpu_state) { CPUX86State *env = &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); } -void hvf_get_segments(CPUState *cpu_state) +static void hvf_get_segments(CPUState *cpu_state) { CPUX86State *env = &X86_CPU(cpu_state)->env; diff --git a/target/i386/hvf/x86hvf.h b/target/i386/hvf/x86hvf.h index 99ed8d608d..db6003d6bd 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_segment *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 From patchwork Tue Feb 15 08:02:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746672 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2028AC433EF for ; Tue, 15 Feb 2022 08:21:28 +0000 (UTC) Received: from localhost ([::1]:49412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt5R-0002Dp-BC for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:21:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJsoj-0002A3-V4 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:10 -0500 Received: from [2607:f8b0:4864:20::1030] (port=44793 helo=mail-pj1-x1030.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsof-0002BN-Sw for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:09 -0500 Received: by mail-pj1-x1030.google.com with SMTP id d9-20020a17090a498900b001b8bb1d00e7so1453546pjh.3 for ; Tue, 15 Feb 2022 00:04:05 -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=PEI7kUnsnIGZxPsTEp+GtQhNNx0K7T3AfPnUbQ/3n4M=; b=J53/0fRih8pCSKvg/ap8j/dTLJDDQ6XeQs6i1YRLV1W3/J3MULGeyk+X3xALtG1U1S VAqfjvntz0ChbTYaaz3fPO3zxhEH5+52rvxrKdvFknJBTJW6Exj0Ubg2iUvsacNwEszW BMlBtxxrtHfRdcOrCnx2xV7qXJz/isg1bU5YtElh1aE5hJls/ccCOyOmGqOJBS8XThGX F8L/myKqK95suYVn+/jZo8J6jEo0IHIWBv8pMjaQyDf/tRZATmBhp7L713MLbm4tgJ7b 4NNrlsGYftrmpSJKmgynT+bDIBZa8MOpCuZHkOeNaN8MgcK2+NTU7V8YNXuzSnpKHw/T 0gKg== 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=PEI7kUnsnIGZxPsTEp+GtQhNNx0K7T3AfPnUbQ/3n4M=; b=kvp0+S7kjCIhuceMz9zCeWawRrF7GrFctmLqV3y2G/S4n7sXPm5CJLWWVlne9f1hla GbhcFXFtRCETiYnG4A0xYZnC5E8pLW2nL1MoI47BsaxiZb9nXG6/qrdlDltbYlmBWN9h SZ4o3QkUqeuBg8NpTbjQKX+GLhKRflfeiFprQvD/rfjQ64sno7pz24pk1204L7d1G3Vp WtRQDqLMo8eFG2Ub4zkC85zaiE80qUahJZwNTDOXMXo/xvQkyJGIg6qBkRuWdH4fss4i X67J/fDsGevLDWvK1c494qQxkFYEFeMNn2FAf4clQSscgX5TJUFGQt9q4gy5C3otq08f yy2w== X-Gm-Message-State: AOAM5309VfTaPz2lyYJ6z0v7504knhf2oO6wdalzAdWMxsgsDh0JW3aR 5fe/gctly2kLfUc3bToZrUlD2mktEco= X-Google-Smtp-Source: ABdhPJyCIZ5M2THtGCy20RgLFIo8uyoeoICx7PtkdVs0RlgP3PRqNJIpkPEiCpU/2V05V7htPU3SVA== X-Received: by 2002:a17:902:724a:: with SMTP id c10mr2873080pll.88.1644912244500; Tue, 15 Feb 2022 00:04:04 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id ck20sm14671213pjb.27.2022.02.15.00.04.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:04 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 06/15] hvf: Remove deprecated hv_vcpu_flush() calls Date: Tue, 15 Feb 2022 09:02:58 +0100 Message-Id: <20220215080307.69550-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1030 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1030.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= When building on macOS 11 [*], 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: first 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/Frameworks/Hypervisor.framework/Headers/hv.h:364:20: note: 'hv_vcpu_flush' has been explicitly marked deprecated here extern hv_return_t hv_vcpu_flush(hv_vcpuid_t vcpu) ^ Since this call "has no effect", simply remove it ¯\_(ツ)_/¯ Not very useful deprecation doc: https://developer.apple.com/documentation/hypervisor/1441386-hv_vcpu_flush [*] Also 10.15 (Catalina): https://lore.kernel.org/qemu-devel/Yd3DmSqZ1SiJwd7P@roolebo.dev/ Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov Signed-off-by: Philippe Mathieu-Daudé --- 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 29b7deed3c..573ddc33c0 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -160,7 +160,6 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0) wvmcs(vcpu, VMCS_GUEST_CR0, cr0 | CR0_NE_MASK | CR0_ET_MASK); hv_vcpu_invalidate_tlb(vcpu); - hv_vcpu_flush(vcpu); } static inline void macvm_set_cr4(hv_vcpuid_t vcpu, uint64_t cr4) @@ -172,7 +171,6 @@ static inline void macvm_set_cr4(hv_vcpuid_t vcpu, uint64_t cr4) wvmcs(vcpu, VMCS_CR4_MASK, CR4_VMXE_MASK); hv_vcpu_invalidate_tlb(vcpu); - hv_vcpu_flush(vcpu); } 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 e1301599e9..d24daf6a41 100644 --- a/target/i386/hvf/x86_task.c +++ b/target/i386/hvf/x86_task.c @@ -182,5 +182,4 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea store_regs(cpu); 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 907f09f1b4..bec9fc5814 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) hvf_set_segment(cpu_state, &seg, &env->ldt, false); vmx_write_segment_descriptor(cpu_state, &seg, R_LDTR); - - hv_vcpu_flush(cpu_state->hvf->fd); } void hvf_put_msrs(CPUState *cpu_state) From patchwork Tue Feb 15 08:02:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746671 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3F32C433EF for ; Tue, 15 Feb 2022 08:19:14 +0000 (UTC) Received: from localhost ([::1]:45848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt3I-0008D9-6e for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:19:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJsoq-0002M2-MQ for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:16 -0500 Received: from [2607:f8b0:4864:20::433] (port=36627 helo=mail-pf1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsoo-0002CJ-Lu for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:16 -0500 Received: by mail-pf1-x433.google.com with SMTP id z16so11703992pfh.3 for ; Tue, 15 Feb 2022 00:04:14 -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=jlmSMkeCwUd8E6YT5e8ACCLaTL1+jSNfQP2Uet5vd1k=; b=Vsu05IcYogJ9RCx0U2sONAuRdU0LGye//Z1BINch0tqJd1FSPtqtPac38NK1b4k2DH evW5atpiRIJzGoqNMLZvN/ZdFJoKUyRMFAfsMMYDaZ+paBlmJrHRHLZ6CBIW+kSYSYmp jmHxYPlmNsXrAzzVJY80pJxHOUdcy5+6wVFEoUYv6M+rthdtJBXlwFpIRVMR9Lu9Lx6y 3MCs7GopaYnStg2KuIWulaoBp0jMMKvwKokuqni7hRRcLNEIRGb1kdhfZZkeZ8dV/erJ iYOE6Xz9+yIUTKPlqXThJRc6VyFWGCB9E8hNjAabGW+Br6g9G8hMUbgHUEFtuBOQloJH hZbw== 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=jlmSMkeCwUd8E6YT5e8ACCLaTL1+jSNfQP2Uet5vd1k=; b=p0SBH+C2QA+cFEp6abXv9G1FOIZVlwC0ayHyuBkwqdFhyUDJFD2pTePemhIumQY0Ir gd8QQKMjZUG1lHuPLOCMi0uSFWwaKI8e1XEqOkSdI1GR0oWVz1qNaCQOIj9AVVdQ9GFW 4hxLYxxJmBqykLWEdxEi32yUpP9mQwNaCQyGzdOCvh1+NPf+TrJ+7e6aVsW6GZHKBdRC to8GWWxjWQR9g2ANRHL41nv8nSc/3kJZRG2GhN6qKwbMegOB7CsFzEOIMP3dUx4D0hKL NZhYrjSgwzbkKtzj54cr/a8X6+0Isj0mqyJk8Ab1if1AOrcfF4m/p4hMqicYZJr4KtH5 OV0w== X-Gm-Message-State: AOAM530Ahp+WXNGQtVIMFvEa0OV2XOZKHa7z+Wxt9ees1PwXHcp6O4f6 ovrYvtv182leKtN7J7VFYQUkvDuj4mk= X-Google-Smtp-Source: ABdhPJxRAsA2QerClXHOPbUKm41qG1ce8/XlcYt63Nv1De4u+OWkOrDIP8wgQpVpz5ZtEfB/lSqK8g== X-Received: by 2002:a63:18e:: with SMTP id 136mr2522079pgb.478.1644912253175; Tue, 15 Feb 2022 00:04:13 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id oo9sm13830622pjb.10.2022.02.15.00.04.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:12 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 07/15] block/file-posix: Remove a deprecation warning on macOS 12 Date: Tue, 15 Feb 2022 09:02:59 +0100 Message-Id: <20220215080307.69550-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::433 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x433.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 = IOMasterPort( MACH_PORT_NULL, &masterPort ); ^~~~~~~~~~~~ IOMainPort Replace by IOMainPort, redefining it to IOMasterPort if not available. Suggested-by: Akihiko Odaki Reviewed-by: Christian Schoenebeck Reviewed by: Cameron Esfahani Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- block/file-posix.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 1f1756e192..13393ad296 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3319,17 +3319,23 @@ BlockDriver bdrv_file = { #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) \ + || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0) +#define IOMainPort IOMasterPort +#endif + static char *FindEjectableOpticalMedia(io_iterator_t *mediaIterator) { kern_return_t kernResult = KERN_FAILURE; - mach_port_t masterPort; + mach_port_t mainPort; CFMutableDictionaryRef classesToMatch; const char *matching_array[] = {kIODVDMediaClass, kIOCDMediaClass}; char *mediaType = NULL; - kernResult = IOMasterPort( MACH_PORT_NULL, &masterPort ); + kernResult = IOMainPort(MACH_PORT_NULL, &mainPort); if ( KERN_SUCCESS != kernResult ) { - printf( "IOMasterPort returned %d\n", kernResult ); + printf("IOMainPort returned %d\n", kernResult); } int index; @@ -3342,7 +3348,7 @@ static char *FindEjectableOpticalMedia(io_iterator_t *mediaIterator) } CFDictionarySetValue(classesToMatch, CFSTR(kIOMediaEjectableKey), kCFBooleanTrue); - kernResult = IOServiceGetMatchingServices(masterPort, classesToMatch, + kernResult = IOServiceGetMatchingServices(mainPort, classesToMatch, mediaIterator); if (kernResult != KERN_SUCCESS) { error_report("Note: IOServiceGetMatchingServices returned %d", From patchwork Tue Feb 15 08:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746684 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87C55C433F5 for ; Tue, 15 Feb 2022 08:24:41 +0000 (UTC) Received: from localhost ([::1]:55674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt8a-0006Yg-JK for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:24:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJsp1-0002bz-Gz for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:27 -0500 Received: from [2607:f8b0:4864:20::42f] (port=39523 helo=mail-pf1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsoy-0002DN-4q for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:27 -0500 Received: by mail-pf1-x42f.google.com with SMTP id m22so14380072pfk.6 for ; Tue, 15 Feb 2022 00:04:22 -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=hwDMbE3LpDB4vudQxm6+URmPG25hAHbBrpGsaG8baq4=; b=TiSQ4xMVKybegMSLR6fzpr1VXx7wwP7jKoOuKTtgt4LyiZmVxHtwFRGXCjNjXzbqxx WgiVf/wzPo/aLYAMpvS9idTR1sZQILlqKFCCyFqE2ikeIB+i3C+5oYtMMumEWScgvuZb Gthn8w5PLJte0xoKGotuS0wcaMmVJOZASpQXxu/4Dx/szeH3l2fCLdLoveOutElnE8Rr 5KbexKeFr6o467qF7N7Fd6xNK1Qaoz4ywJKYUor03O8BwmgJKWx8dmBFCU2pjvxXFLUW wRB8YMTt0v13inW5O5GDOsmS0Jupvi4PzR9VSxjovbWHruArAOBTx2jy4IoIshTD5DIW Cpaw== 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=hwDMbE3LpDB4vudQxm6+URmPG25hAHbBrpGsaG8baq4=; b=E4xGjXh1itG3Hakpoh+IGtgZ5En4zTVxHEiA5u+r8Ok5gB1+3Ige9s1gLx5lqBdHqd iNZDRvf9/6p5QJWLbiMSBcFCuovEBBNbP91I/IBzWsdZ2IKyI5KkFpd6IIuMmW3q4CZb FoOiyE8edxGxyBloywlm0MZFnoGFN41A+pS9BqP8Qnvk7W0KLNaf10Z6AMcRXFt9F5yt BKlHxXY3qjp5EEK82qrAPYIl+z8MMOqHtJ9/keRFSOd4E0YJfu3knz6NaD1J9S3jDKvx BfGQJXVFxfic02CU6ilcumtXNZULzzcBR5TEOsziskrSShC2RKAR8lcfHPyBBqk2kcHA ZsmQ== X-Gm-Message-State: AOAM5334CYWwUyUzP/k2x3yOrfFFqXMtfBFEZTlxNZ74G5JdQ7w6f31h RUm+Ajm0XlsuPS/x/RTXTXRC2y4A6TU= X-Google-Smtp-Source: ABdhPJzQegNXIqgZF3L87kUqN7nC4TNttZolpvPcMBp8cXNjFyiGgAPfnJHJsmooQkv3XsrXbTRe8g== X-Received: by 2002:a65:4001:: with SMTP id f1mr2570889pgp.438.1644912261752; Tue, 15 Feb 2022 00:04:21 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id fz21sm6216412pjb.35.2022.02.15.00.04.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:21 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Roman Bolshakov Subject: [PATCH v6 08/15] audio/coreaudio: Remove a deprecation warning on macOS 12 Date: Tue, 15 Feb 2022 09:03:00 +0100 Message-Id: <20220215080307.69550-9-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42f.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= When building on macOS 12 we get: audio/coreaudio.c:50:5: error: 'kAudioObjectPropertyElementMaster' is deprecated: first deprecated in macOS 12.0 [-Werror,-Wdeprecated-declarations] kAudioObjectPropertyElementMaster ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kAudioObjectPropertyElementMain /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreAudio.framework/Headers/AudioHardwareBase.h:208:5: note: 'kAudioObjectPropertyElementMaster' has been explicitly marked deprecated here kAudioObjectPropertyElementMaster API_DEPRECATED_WITH_REPLACEMENT("kAudioObjectPropertyElementMain", macos(10.0, 12.0), ios(2.0, 15.0), watchos(1.0, 8.0), tvos(9.0, 15.0)) = kAudioObjectPropertyElementMain ^ Replace by kAudioObjectPropertyElementMain, redefining it to kAudioObjectPropertyElementMaster if not available. Suggested-by: Akihiko Odaki Suggested-by: Christian Schoenebeck Suggested-by: Roman Bolshakov Reviewed-by: Christian Schoenebeck Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- audio/coreaudio.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index d8a21d3e50..1faef7fa7a 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -44,10 +44,15 @@ typedef struct coreaudioVoiceOut { bool enabled; } coreaudioVoiceOut; +#if !defined(MAC_OS_VERSION_12_0) \ + || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0) +#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster +#endif + static const AudioObjectPropertyAddress voice_addr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; static OSStatus coreaudio_get_voice(AudioDeviceID *id) @@ -69,7 +74,7 @@ static OSStatus coreaudio_get_framesizerange(AudioDeviceID id, AudioObjectPropertyAddress addr = { kAudioDevicePropertyBufferFrameSizeRange, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectGetPropertyData(id, @@ -86,7 +91,7 @@ static OSStatus coreaudio_get_framesize(AudioDeviceID id, UInt32 *framesize) AudioObjectPropertyAddress addr = { kAudioDevicePropertyBufferFrameSize, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectGetPropertyData(id, @@ -103,7 +108,7 @@ static OSStatus coreaudio_set_framesize(AudioDeviceID id, UInt32 *framesize) AudioObjectPropertyAddress addr = { kAudioDevicePropertyBufferFrameSize, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectSetPropertyData(id, @@ -121,7 +126,7 @@ static OSStatus coreaudio_set_streamformat(AudioDeviceID id, AudioObjectPropertyAddress addr = { kAudioDevicePropertyStreamFormat, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectSetPropertyData(id, @@ -138,7 +143,7 @@ static OSStatus coreaudio_get_isrunning(AudioDeviceID id, UInt32 *result) AudioObjectPropertyAddress addr = { kAudioDevicePropertyDeviceIsRunning, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectGetPropertyData(id, From patchwork Tue Feb 15 08:03:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746673 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70B3EC433F5 for ; Tue, 15 Feb 2022 08:23:00 +0000 (UTC) Received: from localhost ([::1]:51354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt6x-0003e9-HG for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:22:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspA-0002qf-Uf for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:36 -0500 Received: from [2607:f8b0:4864:20::62b] (port=44557 helo=mail-pl1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJsp6-0002Dp-SD for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:35 -0500 Received: by mail-pl1-x62b.google.com with SMTP id y18so12500753plb.11 for ; Tue, 15 Feb 2022 00:04:32 -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=ueFe30KAYoKjPHZOLv0QgRUmcJTyJH01k8g/Vbuxj28=; b=MJtiNogox/Gy+oenkVGOTbwBs5ZxoFKpb4Xh/HNRZxrg3ETaSNxYtfSP8AiLp4TZll YFhOeNECDEHtUKn7txwVsxywf0sPTpYW+8zAwenp+28jlUsrxRDnjpvbLh5HDR+6zkzR iGb0sap2KyFUgC5Hpvx9i7HGZdLBHX95zvfhbYWqw7uGOY/Th6GQQzUvIDP7793FRj82 6yH2zDIGXGKspWkIWq3HuMXSt8igsExRcwrhvFfcPVdmmvfHuk7gCGS8f3AiuDYNL+Lu rSYHTn66T26Vqyz+FkTuHXproG9VbTQfzZxcVjgqN1vkY/Ws7t34aj9qStSNbNvUlXlu eH+Q== 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=ueFe30KAYoKjPHZOLv0QgRUmcJTyJH01k8g/Vbuxj28=; b=0Z6IhiXph5J+5z1xgAF2N9IGcKax+HHxnz4uIwAxSBZyxhMnDPplWPGKdqpi2+eXSn oXkMH8a0p1udmfTEIRz0ykflbGpXftpH9yv7NRkefxQvZHy+P/njHNkr2DMVlWEcHDgr 5Cu573BLyloT/+cuZlmf81YaT1Xhp0KkyiVu38Iqnji2QCDUtElAKhngl3gegBobhDGq Oa55/bOoiLb9Z1d2szDp/9q8OfIOStbU/KeXRLDjtc5KhRieBkQ2ern3ktKKeLUkzXVN AGRxBnJ3syr/Axw9pLp+J6Rpesg+aWYoQercPahQFEM6PBkPggyrBqAIKmkxCYM8ZSDY lBbQ== X-Gm-Message-State: AOAM533Rtqw+Ffj7oJ0zxpXeo6PrVX8K3NyrqpLuxpTqI6G4s7iUf2l7 PLx9gd0Pn7h1CzWXgiGjB7TP3UMRF5I= X-Google-Smtp-Source: ABdhPJwVQSh+9NC7ozgJNHSJau0Bq+y2C3dM2rfwCWepz88InK4kF1qB6kbnKuIbbTnGXwBGu9hEMw== X-Received: by 2002:a17:902:d512:: with SMTP id b18mr2966308plg.54.1644912270488; Tue, 15 Feb 2022 00:04:30 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id p27sm2302715pfh.98.2022.02.15.00.04.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:30 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Li Zhang Subject: [PATCH v6 09/15] audio/dbus: Fix building with modules on macOS Date: Tue, 15 Feb 2022 09:03:01 +0100 Message-Id: <20220215080307.69550-10-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x62b.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= When configuring QEMU with --enable-modules we get on macOS: --- stderr --- Dependency ui-dbus cannot be satisfied ui-dbus depends on pixman and opengl, so add these dependencies to audio-dbus. Fixes: 739362d420 ("audio: add "dbus" audio backend") Reviewed-by: Li Zhang Signed-off-by: Philippe Mathieu-Daudé --- audio/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/meson.build b/audio/meson.build index 0ac3791d0b..d9b295514f 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -28,7 +28,7 @@ endforeach if dbus_display module_ss = ss.source_set() - module_ss.add(when: gio, if_true: files('dbusaudio.c')) + module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], if_true: files('dbusaudio.c')) audio_modules += {'dbus': module_ss} endif From patchwork Tue Feb 15 08:03:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746686 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93059C433EF for ; Tue, 15 Feb 2022 08:27:05 +0000 (UTC) Received: from localhost ([::1]:60494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJtAu-0001QR-HD for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:27:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspH-0002wI-6c for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:43 -0500 Received: from [2607:f8b0:4864:20::42c] (port=38527 helo=mail-pf1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJspE-0002EF-Ly for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:42 -0500 Received: by mail-pf1-x42c.google.com with SMTP id e17so14082891pfv.5 for ; Tue, 15 Feb 2022 00:04:39 -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=VfGP9v+SJGC5s5c3YVjK2aTHozdvRpFoivfAAZxpXGU=; b=HSqynoji1/D/Iimk02xnb1G8LlcdK2NSX7zRXXd/oe34IfWx9xbKtKVm+r04RCIkk2 taLynsAZ3I0g5CYhYwGrZ1tTSIXyeILa+4B5XZOUdFROTDVstXakdivZyJHp+U/phiEs FyqKnzHwvbJX1fim3R+xMHEPrhjPARdP/DLH6KiVCGYxZrkAeFcaLE3EsrHUzChCcAGa d7zQ5TED81rmRZjcQG1N/7D7/74USp6gty351IDlOXBb3sCbjW8PwbyiFdzhC2C6PeMN bSd2tzMRlZYE02yq1vwfvwn9gwzSxksw0IgAmBImqtvXLvM8RcVlp7x87YyrHBbDvX/p JwJQ== 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=VfGP9v+SJGC5s5c3YVjK2aTHozdvRpFoivfAAZxpXGU=; b=MT3O7Bp1nJjLa9/L4k9NnCZHF+mGOKerAB+mS+D7dlXT5xvDOsRMNxTJtE6re/CnaY holKKtQ+cYe8irEamFC9Tv+c7HdKBDPRv52HWFPiRvFtWRSS02hxgK4Ypb6G8LJ3XVp6 I6wBfx4W2YVWY8um2L9BED6bPJxxeQZZJW0K4FssmdJMYcuphQetx2lCTxa5K9A2VRJM hnv8sO72ZuAwKIOAatfjn//j+wqB/XFUThYXAUl6LKbGy4KqfqkG9PZukgGy2DCPwLLO 0OSZlzvrb6NhRZugzsCvr5U+Qodbf5TSrlw7XtRKVFBzVPkBbJmUYpUlv4QxUlPIrRsR QxTg== X-Gm-Message-State: AOAM532v+8TDOg8z7bXbkhUQ2zSBXAyBn+APmK4rs9smYO9jMQpe1sA1 0DN3Ml1uoBAk9Ctji9SaZTz4TfiCzfI= X-Google-Smtp-Source: ABdhPJzTnMNlOMmBZf0fIqHVO9VB4k9mFDM4bLWRovuyVlu2lcfYxuQxV7uWBPzledvNaGvi07L9Ag== X-Received: by 2002:a63:5a14:: with SMTP id o20mr451619pgb.197.1644912279025; Tue, 15 Feb 2022 00:04:39 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id o7sm36902930pfk.184.2022.02.15.00.04.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:38 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 10/15] ui/cocoa: Remove allowedFileTypes restriction in SavePanel Date: Tue, 15 Feb 2022 09:03:02 +0100 Message-Id: <20220215080307.69550-11-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_SUBJ_WIPE_DEBT=1.004, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 deprecated in macOS 12.0 - Use -allowedContentTypes instead [-Werror,-Wdeprecated-declarations] [openPanel setAllowedFileTypes: supportedImageFileTypes]; ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSSavePanel.h:215:49: note: property 'allowedFileTypes' is declared deprecated here @property (nullable, copy) NSArray *allowedFileTypes API_DEPRECATED("Use -allowedContentTypes instead", macos(10.3,12.0)); ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSSavePanel.h:215:49: note: 'setAllowedFileTypes:' 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 Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov Reviewed-by: Christian Schoenebeck Reviewed by: Cameron Esfahani Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- ui/cocoa.m | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index ac18e14ce0..7a1ddd4075 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -100,7 +100,6 @@ static int gArgc; static char **gArgv; static bool stretch_video; static NSTextField *pauseLabel; -static NSArray * supportedImageFileTypes; static QemuSemaphore display_init_sem; static QemuSemaphore app_started_sem; @@ -1168,10 +1167,6 @@ QemuCocoaView *cocoaView; [pauseLabel setTextColor: [NSColor blackColor]]; [pauseLabel sizeToFit]; - // set the supported image file types that can be opened - supportedImageFileTypes = [NSArray arrayWithObjects: @"img", @"iso", @"dmg", - @"qcow", @"qcow2", @"cloop", @"vmdk", @"cdr", - @"toast", nil]; [self make_about_window]; } return self; @@ -1414,7 +1409,6 @@ QemuCocoaView *cocoaView; openPanel = [NSOpenPanel openPanel]; [openPanel setCanChooseFiles: YES]; [openPanel setAllowsMultipleSelection: NO]; - [openPanel setAllowedFileTypes: supportedImageFileTypes]; if([openPanel runModal] == NSModalResponseOK) { NSString * file = [[[openPanel URLs] objectAtIndex: 0] path]; if(file == nil) { From patchwork Tue Feb 15 08:03:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65258C433EF for ; Tue, 15 Feb 2022 08:25:42 +0000 (UTC) Received: from localhost ([::1]:57694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt9Z-0007ug-9O for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:25:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspP-00031g-Et for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:51 -0500 Received: from [2607:f8b0:4864:20::62b] (port=33564 helo=mail-pl1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJspM-0002Ee-Qa for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:04:50 -0500 Received: by mail-pl1-x62b.google.com with SMTP id l9so10913166plg.0 for ; Tue, 15 Feb 2022 00:04:48 -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=jfgedMbiWFKJInWYax42U3NQTRfZ8JrSl2dGV6VDciM=; b=WtQvJs4Y9gRPECZX2mY0/vVrc2mqAWgaaAMuIvO2hn00T1OpMWW6KBWRAxHdyRsPeG 4nk5N5n+WkXXvN5KmI4ehG2FYqIrm8dT+glBpaDmwOkh9Fd7or0UspC6xTyJHcuLAFfF mHOW7ztQ1aAfeRYfKWErpWn3+HkAo1fA6PiOyWJfUMnRa8hx2c/OoweFvaW8oM8sDHeY kdq1SiyPwsHM1vClYEf2749qVfpRMiDhV3Xb0HADQV7jPRR00d4M38mQXiFrw4SsA7LS Jyj6KdHQJxjoNEezO3KN/cyAIaCc301LBorTjtqVDAVFVX1zHfrHD1EIlN2wyYS9hDze id6Q== 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=jfgedMbiWFKJInWYax42U3NQTRfZ8JrSl2dGV6VDciM=; b=3OPFf0hf6OnI4/8/z8TdXHo1W4f1laL4wN0aTVg+QnXHKPVSrY7yn9yDelsTm/nilr dhgxwyQ8zANEMer++sKHO6EvX5bFm+ba7NwYIOtq7QBH5oj+z8MqUhc7fkoxwHDuE0Q0 9JD/rbM0MWXIeJwrJF17o1CWTLQVVnJ1G59erj6R8A5WXSoKjb/dkE06FrLanWEF0iyx uJ3U5P+ufXxfxVGQm+doPLtIfJhrza7GgdP+v6Ry5TCIKgHO2AHvHrx7D0bMHHJ7oYj3 WDfXHGXr4OqibTGNuNyp2KLRaA23rFQhMjIdP1TtKP/8yewr3INSM936AGohNivWJC8D CNyQ== X-Gm-Message-State: AOAM5325Oz5ZyGlKsn/CoNwvM1RHhStqLeqL5Xke+7tZa5okBrbvsHfm s7ERcH9fcYYxwdV7IfC31KzjTaR1eio= X-Google-Smtp-Source: ABdhPJxiDj9mLZKPv58/Fu9d2CxhXdSbrfbtKzUNRspNfMVOI0PD/qZj8K7WfsEorcf/2XHY6M59CQ== X-Received: by 2002:a17:903:228b:: with SMTP id b11mr2811664plh.104.1644912287567; Tue, 15 Feb 2022 00:04:47 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id pc18sm5678038pjb.9.2022.02.15.00.04.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:47 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 11/15] ui/cocoa: Add Services menu Date: Tue, 15 Feb 2022 09:03:03 +0100 Message-Id: <20220215080307.69550-12-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x62b.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Akihiko Odaki Services menu functionality of Cocoa is described at: https://developer.apple.com/design/human-interface-guidelines/macos/extensions/services/ Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20220214091320.51750-1-akihiko.odaki@gmail.com> Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Will Cohen Tested-by: Will Cohen --- ui/cocoa.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/cocoa.m b/ui/cocoa.m index 7a1ddd4075..becca58cb7 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1591,11 +1591,15 @@ static void create_initial_menus(void) NSMenuItem *menuItem; [NSApp setMainMenu:[[NSMenu alloc] init]]; + [NSApp setServicesMenu:[[NSMenu alloc] initWithTitle:@"Services"]]; // Application menu menu = [[NSMenu alloc] initWithTitle:@""]; [menu addItemWithTitle:@"About QEMU" action:@selector(do_about_menu_item:) keyEquivalent:@""]; // About QEMU [menu addItem:[NSMenuItem separatorItem]]; //Separator + menuItem = [menu addItemWithTitle:@"Services" action:nil keyEquivalent:@""]; + [menuItem setSubmenu:[NSApp servicesMenu]]; + [menu addItem:[NSMenuItem separatorItem]]; [menu addItemWithTitle:@"Hide QEMU" action:@selector(hide:) keyEquivalent:@"h"]; //Hide QEMU menuItem = (NSMenuItem *)[menu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; // Hide Others [menuItem setKeyEquivalentModifierMask:(NSEventModifierFlagOption|NSEventModifierFlagCommand)]; From patchwork Tue Feb 15 08:03:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 23EA9C433F5 for ; Tue, 15 Feb 2022 08:14:21 +0000 (UTC) Received: from localhost ([::1]:37510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJsyZ-0002VJ-Ei for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:14:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspZ-00038X-Ir for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:02 -0500 Received: from [2607:f8b0:4864:20::434] (port=40464 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJspX-0002Fb-64 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:00 -0500 Received: by mail-pf1-x434.google.com with SMTP id c4so12267386pfl.7 for ; Tue, 15 Feb 2022 00:04:56 -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=cRI6UGAn4vjJdciiBP0mAxumIP6lTNDE1aSs08ebrks=; b=nePv76A56nC5QANB/2nuk5UhqhXcUkVyHDikNtrfqXEX5OCRi3i1RqiNMplL+/wXeH 67JMcPtMAEWCowDI51mOiChqxHgXfIrRjpZGol1Jh7wmsqk5qb+oKCXavDhNYyRj4SKK sUZcV9ngM3vfm9bf7ooEgJJLKHu/rkAYm/sdvuEMNq6BfAD3TyQX507IrFnb5Q3iwhdf nfXkPlERmDQ2Rz4AKUKVirNLqCjX+u23TNf0PqXtBv9PfK9QVcwCkGGRU3QWNfnR85Jt 5lcVmF+tcKhUyUY7AD3LBdTX5HvepFm/FhdRpn9PsOcEp6FwS2A+6p/RAigd2s/QkFpC v3Og== 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=cRI6UGAn4vjJdciiBP0mAxumIP6lTNDE1aSs08ebrks=; b=JEMTc5Qf/HLOrIrkuFaRE/X0E9jMHwv069/uQBzGMhE9oX0clfEsvtnPYabqiWSywD BxgZ/yhW1Rhzrtoc9X3FHTxMOkt0rE/2M3ChlZIa2WLb863DOc5y2h+H/9VzNFFnRAQ3 qz+Z/1v6+1Maay3UD2fMISsy/Z+MN1S8yHBB3nwgCS6KgMDSqJcOvnMkaEQAjaKT2G4F 5DzNllDAVU28IUHI7hdhf0Uo6Bne3VECguLjTrL0k1xASyYGc6NjvcGQ+GOC7us0Z6Kd uygLQRGNsuWqcblQlygNec6fsuiPd9o4ruiVXejcQzC/HmCS0roZLg/uPWQ4KzlvS8+E rHyA== X-Gm-Message-State: AOAM532nhU3SM5z+l7oBoHwfMOzFc7y70OplZGZ/zzqzGNV7kQsLa7w1 bCTZW6HGYoek+vtrnH+XlIbpYy5xZnM= X-Google-Smtp-Source: ABdhPJwRVVk123M4wdH9+RhKVXV+aVRODk3++6NGWWjv1Fi7cHF/ElC86Tl5ZC+cYSOlrqDY9boyng== X-Received: by 2002:a63:505a:: with SMTP id q26mr2490725pgl.485.1644912295857; Tue, 15 Feb 2022 00:04:55 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id w11sm38982375pfu.50.2022.02.15.00.04.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:04:55 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 12/15] ui/cocoa: Do not alert even without block devices Date: Tue, 15 Feb 2022 09:03:04 +0100 Message-Id: <20220215080307.69550-13-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Akihiko Odaki Signed-off-by: Akihiko Odaki Message-Id: <20220213021418.2155-1-akihiko.odaki@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- ui/cocoa.m | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index becca58cb7..6cadd43309 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1713,11 +1713,6 @@ static void addRemovableDevicesMenuItems(void) currentDevice = qmp_query_block(NULL); pointerToFree = currentDevice; - if(currentDevice == NULL) { - NSBeep(); - QEMU_Alert(@"Failed to query for block devices!"); - return; - } menu = [[[NSApp mainMenu] itemWithTitle:@"Machine"] submenu]; From patchwork Tue Feb 15 08:03:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5B7EC43219 for ; Tue, 15 Feb 2022 08:28:23 +0000 (UTC) Received: from localhost ([::1]:33776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJtCA-0002VU-IA for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:28:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspg-00039g-C8 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:08 -0500 Received: from [2607:f8b0:4864:20::42a] (port=39526 helo=mail-pf1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJspe-0002GG-5l for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:08 -0500 Received: by mail-pf1-x42a.google.com with SMTP id m22so14382765pfk.6 for ; Tue, 15 Feb 2022 00:05:05 -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=q1S0vCkHLHdT7fWwQnyVqc/5+zwKndcxOeaesC4lBoo=; b=c+qZi5yDc1qxfY9wR4+Q337JsirwHMvphfmL259epMLG+wiZ9oTlfjil+bOL7Speq4 +cptV5GlQ6H+NR3EY4qyjK33MhaGtBMjeiUdif7ct0P3dvYbX+A/OgnvBcAOyl3ecHF6 9Yv6OKIQHRC9sccjYvDy3FLAFyYxdUUE8NClv2suEtQE+ClM+JHORv9Po4qFhM6mVpOj mlTyXKCHuqPvnggzpfFr8UedIVCBDU2a+Xgqr1pBygCWSBOsHvbeWiffzFSfMTBGKMRs k6QdKcPYBS1afQBOxJajY8vS+xrrY/OkHsBDso/OZ+o/1kBd5qT82XXdJd6tV9LhirA0 eQpg== 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=q1S0vCkHLHdT7fWwQnyVqc/5+zwKndcxOeaesC4lBoo=; b=opSzVPmrcNHVekpzJQEByp7MHc/2IzxgBMPWWhNYXO445q7brBcQqNj4uWe2a/SB9L PXjxw+Y7LjU1b9LD8hzVR7Oud44t/cIOVcNdr2ozPmEUnxMxW09g1rvj+j/P1PH8QLyk 99+YREnQV0Gl3gv3iRav3Lc57vhphFFNoqVr/csrZePJfN1MT0myU2hNrln0h6bVlGPb 82FhTsuKm0HLWWlvg6TUObJiu7TOx+pXEYL/wuD0BMasXYyndh1c0mLCwYgzwqJO/x57 JYxBrU3oG8KKl6l1VgxIyrLgmwr1wYwHAXuwusvz2HbgPkKqPji+8J63ko9C7kkFr0sf Fdag== X-Gm-Message-State: AOAM533c37q2Q8ECCTccj+2bY3xz93RMDmJUndtla4H2AY0rO3fR3CBE D0wTQDJdspdJVgBl9l1KDcas7igJtLQ= X-Google-Smtp-Source: ABdhPJyySGBipnjYwxbHns/nzfKb96NepOA1uwkAZdZaubNKHUjMg23tKWQkJR7Rv+vZyyRPZ8S/vA== X-Received: by 2002:a62:a11a:: with SMTP id b26mr2905900pff.19.1644912304296; Tue, 15 Feb 2022 00:05:04 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id y2sm1709365pgf.33.2022.02.15.00.05.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:05:04 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 13/15] ui/cocoa: Fix the leak of qemu_console_get_label Date: Tue, 15 Feb 2022 09:03:05 +0100 Message-Id: <20220215080307.69550-14-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Akihiko Odaki Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220213021329.2066-1-akihiko.odaki@gmail.com> [PMD: Use g_autofree, suggested by Zoltan BALATON] Signed-off-by: Philippe Mathieu-Daudé --- ui/cocoa.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 6cadd43309..30702d31a5 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1678,7 +1678,9 @@ static void create_initial_menus(void) /* Returns a name for a given console */ static NSString * getConsoleName(QemuConsole * console) { - return [NSString stringWithFormat: @"%s", qemu_console_get_label(console)]; + g_autofree char *label = qemu_console_get_label(console); + + return [NSString stringWithUTF8String:label]; } /* Add an entry to the View menu for each console */ From patchwork Tue Feb 15 08:03:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8601BC433F5 for ; Tue, 15 Feb 2022 08:17:24 +0000 (UTC) Received: from localhost ([::1]:44046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJt1X-0006zk-Iu for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:17:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspo-0003DC-SG for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:17 -0500 Received: from [2607:f8b0:4864:20::1031] (port=45620 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJspm-0002Hl-Bk for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:15 -0500 Received: by mail-pj1-x1031.google.com with SMTP id q11-20020a17090a304b00b001b94d25eaecso1453279pjl.4 for ; Tue, 15 Feb 2022 00:05:14 -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=5Hph4sk4oyPtFjQNA2cfWHdIT/B6rQkBhH5AEZC1b9k=; b=m5L7a1SAcvuM5JSCbqvB3nB+WSVL8EQXN9Vj+0B+vxYUetHSqjIzvnEQ8o7Qcw+e/3 OIVZlS5y9tNJwScijO+phhRWZ46IHCCQVobY2r5woE+ej3oJnyT+gJk2Uu5MASCXG/3b Hp1x651bA0JBvZ+tpFZGF6z9LRc0CYZLNTVSbWBQnIaslGiK4hFipoSYWHrKNTNsapsk 234qmTOsXnHELuLss5DnChX4fi9b4yavIYsqLEJnRnWPPTfL/n8W7moGUD6YvzZDxqvU H/a1AHy10XUyXz3y0gCeZVA1UW4jf4509Wq4NPlFqwQcCF2zMgFoRmRvwqWMZraO1Wpj KOyw== 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=5Hph4sk4oyPtFjQNA2cfWHdIT/B6rQkBhH5AEZC1b9k=; b=UR2M5LfNb92fun1esOj4nid26/8TvV+xWNJp4Ci36nYT082vUnJBMc592CsHPGOhs6 5PRaXuKo1SbGhvwZxpSyctJpDeAJrAedOvt/VqKUYZ/1eTh2AouiJ7/6kiCKkqLVuedT d+QEChSbfCbtXL/v3t5uTBtr2fr5XJbjHOdxFD7PObKwXML1oBCHcaHY4j7RpdYvm1bV ZRuVgE/HTsicvRFdMURG2/PZqxlTXu3PH20FkPPgLy9mXoA5wJwFBmD3magDiRO5elqd SlnN+nPA9WR6P5v2EhznvKG1lSPm1RORBDMq1pepJzqgZv5NBwDZKd0Dl5GZWD/jGw9m +dWw== X-Gm-Message-State: AOAM532ZObR/4H/SK8dyLrrsI3x6Q1jQUQyH+flJtjviKc9N8OFSaSpW FpzNYjcEVTbLUsIo7VZumQ12/7PvEXk= X-Google-Smtp-Source: ABdhPJzAq1yCFLrcrojEuIzTkBXAcEBJm6EawDrgzpRzIJU0THDYSnl+xr2Oc72lZC4VltgU2PSxCg== X-Received: by 2002:a17:903:2406:: with SMTP id e6mr2922566plo.21.1644912313104; Tue, 15 Feb 2022 00:05:13 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id j2sm38841461pfc.209.2022.02.15.00.05.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:05:12 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 14/15] lcitool: Refresh Date: Tue, 15 Feb 2022 09:03:06 +0100 Message-Id: <20220215080307.69550-15-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1031 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Run 'make lcitool-refresh' again. Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/ubuntu1804.docker | 2 -- tests/docker/dockerfiles/ubuntu2004.docker | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 699f2dfc6a..040938277a 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -65,7 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libpam0g-dev \ libpcre2-dev \ libpixman-1-dev \ - libpmem-dev \ libpng-dev \ libpulse-dev \ librbd-dev \ @@ -89,7 +88,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev \ libvirglrenderer-dev \ libvte-2.91-dev \ - libxen-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 87513125b8..159e7f60c9 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -66,7 +66,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libpam0g-dev \ libpcre2-dev \ libpixman-1-dev \ - libpmem-dev \ libpng-dev \ libpulse-dev \ librbd-dev \ @@ -91,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev \ libvirglrenderer-dev \ libvte-2.91-dev \ - libxen-dev \ libzstd-dev \ llvm \ locales \ From patchwork Tue Feb 15 08:03:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12746690 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 318A3C433EF for ; Tue, 15 Feb 2022 08:29:31 +0000 (UTC) Received: from localhost ([::1]:36518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJtDG-0004KK-2M for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 03:29:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJspy-0003VL-6H for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:27 -0500 Received: from [2607:f8b0:4864:20::1030] (port=43576 helo=mail-pj1-x1030.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJspv-0002TX-6y for qemu-devel@nongnu.org; Tue, 15 Feb 2022 03:05:25 -0500 Received: by mail-pj1-x1030.google.com with SMTP id t14-20020a17090a3e4e00b001b8f6032d96so1455814pjm.2 for ; Tue, 15 Feb 2022 00:05:22 -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=qfJBWc7VlSAxcQpybErIaMF3n0Z6M+HIapcTvTq5mnc=; b=liUCV82O0/VQ0P5gJce1HfTyLB0ughJg5oNWU8P5mmsfjUdW0Hf82YIi+sZ8EjTP+4 rD5u29eVFKCdHSOpzcqIbKLswN2aHkbYcGfJNFHy66AdV00+Vscd32HWMxYvV4KVwKsG XL0+FIoE2MjUU87LM6l4NMzXdQZ+ZidJGXJG3TtpY2bYA8YlEyXuLjc+RXArxu1/hIwO rfPp8EyhXimqNOObaJNZ0sPe/ASMpQ+D27p8q3sH+xkWgMJe0/u07dnkKLlcQkjW6bRd DL/d4yLoMpLZAXVN5bitNPGzNwaipDYfbAASVfda/xxl+ppho24VffD4lcU/9+G3KYlY eUHw== 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=qfJBWc7VlSAxcQpybErIaMF3n0Z6M+HIapcTvTq5mnc=; b=0YwpSB5a1YdrEsixkUG+aWkOw9pNKEoD3pVgWo2PsQcRqlkF02MEcSWK3rRfJWF7h7 jg7aFFOmP5rtMjtkohqpJimGE97Hswj52UZTjz+r/KS3bUdT1coMdUlo1If+KV5ptC0u SPUG2Vu7AVG7DCj49avSq+djQwWxZ9hJnNu7pPHSKs+pWf1CJPN77AFJBKIFLxiZO/AN aMkw0NWQxB6bSEHvhxkkpu34KxPxq7z9DszPzB2NyWTjUOtNROpYRywbqxanhOpMTqOq 9GgrbDU/5dQ7FIuzgXK3qqWiJO3ZxLpMfICPYNcRIMXL7OxsmI1FbDdbDzX+8vdz+p0/ eaCQ== X-Gm-Message-State: AOAM533MhrrI3IOoYlgfcK2NjhGAAcPCFubDouRq4uzZaQAelAYonNDL kHmov8/IMw1ibTZET+xzwe2V4KLGMIU= X-Google-Smtp-Source: ABdhPJzhG4jJaLzItHQvs33ZEhgpFe1VogLCutbTnfhCLPkaFJa+KuvxUS2qKXIYQZUoQ8EDwvS7xA== X-Received: by 2002:a17:902:b941:: with SMTP id h1mr3051902pls.73.1644912321854; Tue, 15 Feb 2022 00:05:21 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id f8sm39470584pfe.204.2022.02.15.00.05.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 00:05:21 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Will Cohen , Cameron Esfahani , Akihiko Odaki , Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v6 15/15] gitlab-ci: Support macOS 12 via cirrus-run Date: Tue, 15 Feb 2022 09:03:07 +0100 Message-Id: <20220215080307.69550-16-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215080307.69550-1-f4bug@amsat.org> References: <20220215080307.69550-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1030 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1030.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Add support for macOS 12 build on Cirrus-CI, similarly to commit 0e103a65ba1 ("gitlab: support for ... macOS 11 via cirrus-run"), but with the following differences: - Enable modules (configure --enable-modules) - Do not run softfloat3 tests (make check-softfloat) - Run Aarch64 qtests instead of x86_64 ones Generate the vars file by calling 'make lcitool-refresh'. Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/cirrus.yml | 16 ++++++++++++++++ .gitlab-ci.d/cirrus/macos-12.vars | 16 ++++++++++++++++ tests/lcitool/refresh | 1 + 3 files changed, 33 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 b96b22e269..be1dce5d4e 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -87,6 +87,22 @@ x64-macos-11-base-build: PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 +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/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + CONFIGURE_ARGS: --enable-modules + TEST_TARGETS: check-unit check-block check-qapi-schema check-qtest-aarch64 + # 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 0000000000..a793258c64 --- /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='/usr/local/bin/ccache' +CPAN_PKGS='Test::Harness' +CROSS_PKGS='' +MAKE='/usr/local/bin/gmake' +NINJA='/usr/local/bin/ninja' +PACKAGING_COMMAND='brew' +PIP3='/usr/local/bin/pip3' +PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' +PYTHON='/usr/local/bin/python3' diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 4ab90a310a..a714e2851d 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") sys.exit(0) except Exception as ex: