From patchwork Mon Feb 14 18:55:50 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: 12746036 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 960D3C433EF for ; Mon, 14 Feb 2022 19:25:32 +0000 (UTC) Received: from localhost ([::1]:43192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgyZ-00041a-6k for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:25:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgWP-0007Q4-Ss; Mon, 14 Feb 2022 13:56:25 -0500 Received: from [2607:f8b0:4864:20::102a] (port=33631 helo=mail-pj1-x102a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgWO-0006LO-1I; Mon, 14 Feb 2022 13:56:25 -0500 Received: by mail-pj1-x102a.google.com with SMTP id k60-20020a17090a4cc200b001b932781f3eso479975pjh.0; Mon, 14 Feb 2022 10:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DZ6HMC/awLS1AtcPS+4P+ISmJMCsR4IlAO4kOPlAwl4=; b=eHzKQ+feS0A49NHVJNYlZlUsT/OQmng7kKIAFCGSmHFdkeQmNdhJ94A8eUb9sGF3s1 NGC443/+irQ2Ixvur3U3I/wEt98higUfDDRsJaJoxWI3rVZOTumX3KN91Y0Of/1lFmN2 RDxPSQvardMU5Kus9CAUc54paoTS2uyG3STSi9tbyqXY+KbVNjFpLNAfW/f2uKMIBMoK 39CN4eyaneXC4rsV40VqeA93rHpDnP/yiU55U7542voPTBFtC5G1Meij/BVmPq+il2Ds 3ME14lHkVzLeykMmH/kCgmYa/i/ntzklHwpca6CzFksoKn+/rENJ4QS5pRCs50Gv+sEC UG4g== 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=WC+P8tsNDngXqA4ehHBbPxsTsFE0IEIXuIgiSlrSFEs2FMpOcfE1maaCiWVU2529/s LQMSl3XtlLpd7snu6wgPhwVGhT5dDD8+YW1W56zJtv/h46gL/GWvsBeGUkEQ/6NdT9rQ KEbonwS9cK7TC1SPbRw2FhhxGw4rquMB/BbZ45yFdi8Er39O9FpW5u4yqRhj3AJmvURO vDEUmykQqi31Jqw5ZXskt0RMulhmUYJ/uM+vZalf7CjyK+TH4IphxOgodUt4jwbXfwng LDaMyIjO6681C8wz34M0i0ZCoX7ooxfBio8ApDkkET8c+afSrms5VX+8NCMbSxM6WdNl +ymA== X-Gm-Message-State: AOAM5308Xto8BB/q/fJG/BXAdHIjUN8Wsa5h/o7iUIkaS5rQwv4LQHkW re1LCFG1Yhm0aXPmOutAgGiC9bBkCm8= X-Google-Smtp-Source: ABdhPJyqYJLhi5HxTgyDEi6mgH3h0THD35OEdxGapJTmzKYZtMM0jiSsQ4IIFEHycXnSVeDpMipiAg== X-Received: by 2002:a17:903:1105:: with SMTP id n5mr267607plh.108.1644864982342; Mon, 14 Feb 2022 10:56:22 -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 j185sm35388065pfd.85.2022.02.14.10.56.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:56:22 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 01/16] MAINTAINERS: Add Akihiko Odaki to macOS-relateds Date: Mon, 14 Feb 2022 19:55:50 +0100 Message-Id: <20220214185605.28087-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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é Reviewed-by: Peter Maydell --- 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 Mon Feb 14 18:55:51 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: 12746019 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 6221EC433F5 for ; Mon, 14 Feb 2022 19:02:45 +0000 (UTC) Received: from localhost ([::1]:33168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgcW-0002oV-A8 for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:02:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgWd-00089Z-Df; Mon, 14 Feb 2022 13:56:39 -0500 Received: from [2607:f8b0:4864:20::42d] (port=39509 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 1nJgWX-0006Lx-Vn; Mon, 14 Feb 2022 13:56:39 -0500 Received: by mail-pf1-x42d.google.com with SMTP id m22so11605628pfk.6; Mon, 14 Feb 2022 10:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9AHl4PWSxPKlzGOmJiwTT/tCSVVYvFbKDzeLrCswrLU=; b=pamL5TQhCSvb6oJCPYiiHrQ6GzYDBtdk/V4moOBNbzQY+ts+GSBxAM/k8fiIjuuHzI g9pCldHn/4TZrVUD7uo1o8iJEK8OzbH+YeW01X/yIBmkt23dINJMl0VKMxEmFI/6LNXn JdOYiHAhO+cQo3m3RwAuvQLyZJj5K7jBpmP0bpWEa0q2SH5MPUFcTEB7LEeN/4XGBJIL pioCawcS+9DsjbGrWisNvF9v2TAXZqCrDyTL+IDohSM9aHxtyJPAhmjuRwacBhKlYG7L uRcZV7KrF4d0CGySWJCQNoK5qj2UsFm/volQCHdS0fA0nUk9D8HtFB3x5rVi54rbpi9A naRA== 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=BCZZnwQIZXcWJA1V3GC+EOG8ANXPcjt4tfVV9zF7uiW3xjTl/Ys1RAe+5olUJMT8JU Ybsgvn7wWVyPENbiNY1JU1nepnqty3N2XsCCnPa60hBtEcAhIvtEWkkYDPbIjolaSV6W LEyFXqpyjRTlna9PmkqGFH0Ssnawn1gEIHD5CW9zrmtSrwuOJgdZaTAf7nZFPa4ppOvE Tljw6o6uSUWBQl+fDUqPkjwXdvZoeXvJG08Hm9AD5KWC6de4hm/zRSjbpiETx/5sWNlG qBvwqc2SZ093E8/VZrOwtqzGFxcy9b3B3ESuwZBqZYOi1oryf6fEgvNwLuToo9B7iMlv s0BA== X-Gm-Message-State: AOAM531rsbdDANt8oDsmdK+tdWcg2mYYv8zjEqBKj1+H04photwfZmSk x/HO/OVM2LCMcOwGxkvTokjCj3oj0ZQ= X-Google-Smtp-Source: ABdhPJwLdRmwiyy7f/ETexecTBAt5wEWPUECT1Uv+V8USLoVswKvP5aSVJ3Da0Zh3gD5OXhBNYJdPQ== X-Received: by 2002:a65:6b90:: with SMTP id d16mr345987pgw.49.1644864992176; Mon, 14 Feb 2022 10:56:32 -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 g126sm295953pgc.31.2022.02.14.10.56.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:56:31 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 02/16] configure: Allow passing extra Objective C compiler flags Date: Mon, 14 Feb 2022 19:55:51 +0100 Message-Id: <20220214185605.28087-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-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_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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: Peter Maydell --- 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 Mon Feb 14 18:55:52 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: 12746026 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 2F273C433F5 for ; Mon, 14 Feb 2022 19:07:25 +0000 (UTC) Received: from localhost ([::1]:42868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgh1-0000yX-Ts for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:07:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgWj-00006d-PZ; Mon, 14 Feb 2022 13:56:45 -0500 Received: from [2607:f8b0:4864:20::42a] (port=41777 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 1nJgWi-0006MR-9Y; Mon, 14 Feb 2022 13:56:45 -0500 Received: by mail-pf1-x42a.google.com with SMTP id c10so5218538pfv.8; Mon, 14 Feb 2022 10:56:43 -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=WN9LTkgMPtLDK1/kr7k/EjCOikKvkFG6wyPDu8Z0tOkn73QQE5y8JxPthZK8xcW9Wn WXVL8MC2RYRC5rPpudQGcd9tftgDPC2eAP3HLZ9rjPEfxCsMYmgp5R9mJzi89/cZl/yg 7NjieC8q9u1Wdbq1S0qwtcrQJ581fFPXEbbGhoopxyiMt6gK4esYm1tFrIfU2gJe0UQZ SmqOnGKFfeujBxcPMaPJt9gdGeVl6L7gkCCHX6yUzTF2BJMjFe2cfZEB7vpRRc9Er6lf 57P23X9eElhADQwSz9+xprL4Ju0kKdI3G790KuWnobZzzTvHHWnfVtQqWujyCCZd4mQp Phew== 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=viapL9BdXQRLiaVkS+HRc/LJHHdWk8P9bSTlZeuNCQpLFQVEbQELLjzTG6fg7m/CiH 1QRfSXVaj0FengsUiX6G03U9mgRP4Aet6FrY8iFLkCTnKaeIKipU2iUInsyyakfnXlYZ VrWDQXglAH/oofSvkp33ZYVuo7U2jr8CNizKkDrBxF8LHV4la2FyvkMsqEnArrqX2hdM Mmg/aAf5zRbcp3VOqVyAC8c5Vk3LPu4Hmflh7L+EIWjcGD8O/wbPG14PmuZldBCv3JLr 3Is2YXsfWgv45GsZDIsfO9PPzcnSHwyA5IOpyhusI/BoHp8CiodKNavUZZuUxywvlwY+ l9fA== X-Gm-Message-State: AOAM532uxHDq0IacncwmY222I14JVKpxY5B+LGKoe+bIFWYGhOL/dk6l /GFg0tAA155gd15wpYe1pT5FKasgXcw= X-Google-Smtp-Source: ABdhPJzGw0FVSlgztDJueOnV+E1lqcvvttKcW/UmDZBBS56sB3jQ0l4gLc5gPUibKleqX40D6Z08iQ== X-Received: by 2002:a62:1ec7:: with SMTP id e190mr51268pfe.66.1644865002624; Mon, 14 Feb 2022 10:56:42 -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 13sm36456481pfm.161.2022.02.14.10.56.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:56:42 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 03/16] tests/fp/berkeley-testfloat-3: Ignore ignored #pragma directives Date: Mon, 14 Feb 2022 19:55:52 +0100 Message-Id: <20220214185605.28087-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-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: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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é --- 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 Mon Feb 14 18:55: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: 12746030 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 21AE4C433F5 for ; Mon, 14 Feb 2022 19:14:23 +0000 (UTC) Received: from localhost ([::1]:51634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgnl-00076N-Ov for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:14:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgWu-0000gG-8Z; Mon, 14 Feb 2022 13:56:56 -0500 Received: from [2607:f8b0:4864:20::102c] (port=40921 helo=mail-pj1-x102c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgWs-0006O6-Fc; Mon, 14 Feb 2022 13:56:55 -0500 Received: by mail-pj1-x102c.google.com with SMTP id n19-20020a17090ade9300b001b9892a7bf9so26077pjv.5; Mon, 14 Feb 2022 10:56:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3zqaK9s5/raZ8zuTcIzPJOQG8kwceFqw1+s0bbIn7Ok=; b=UTJWDWRRF3oSPyZUlxw64Y4d1yltuHqbB1jDVEZlihBxm+Kjs4+pmBrVWguZl9dzmI /wkZOQqs/7ZYyj+/6OJqmeUymIdYDaNo8wPGpttKsek5p1/oCGxM+lspjLtj4T3CqjOs F//rqP6DD9YeAKFcCLGG7wm4zW1dlzayKBV9PgaXCLbJBWtla5B2ZBavxo03LPzhl6CM szFq1BOEPqgNvxy3nuHF35cXueMV2hYykbeCqxpdGILWege0iJgUKLL6W9jaPeCI7cA9 OuaCYdRmXfs+2qA8/TqqndhmnZzhdZmX4haBKpnOhJT1h1Wgi+vFxQbdcPVI2URXNinq IiPQ== 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=Gm1Mnka5GpNWRgoadH17e3ait0fySoMQQschsFpKsJBRNr9n4b7k293QuDrgZFB6Fp CmlhgroQ3HTpVVVNiObkrAe7wJLyFZZPip65ff4nXz/zfT0GdbkE5IRcSobrtoU8rug5 XhwxU/rqm9lViiKYpCHAWfWHGWAhFs+wLAbbv8CIpiQfgpy/u57x0SlysvLIoXsLVA6U Fzyp8vPBYtvAtpMVJ+w2KdnxyAtk0xvFH3AXynVrAXcV157mJFnL4khuBwFCSq3+zqKr HEcZFY5h5h6c+ymwwdMGv+81+Bt6ycLYUFnT+KOWjKhOLeRVndiopQJUz5/UUhDrvuGw 6DeQ== X-Gm-Message-State: AOAM530SVlFo5pjm1iwFTmagMpTeu+PP7e2S+V2LbNS2hCcwtkmvWFzp VI4UOPv7ZxplPGkWFgAOCrlEexggh9g= X-Google-Smtp-Source: ABdhPJwa6B1FoIHqzrjHYy9cHa0vGxrLKTbriCVPKnYM0pmb9oTPWhkYcdCPOYPHEeaNi25rvPwNZA== X-Received: by 2002:a17:90a:5b07:: with SMTP id o7mr17100pji.246.1644865012727; Mon, 14 Feb 2022 10:56:52 -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 s37sm40747885pfg.144.2022.02.14.10.56.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:56:52 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 04/16] hvf: Use standard CR0 and CR4 register definitions Date: Mon, 14 Feb 2022 19:55:53 +0100 Message-Id: <20220214185605.28087-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102c.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 Mon Feb 14 18:55: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: 12746033 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 06526C433EF for ; Mon, 14 Feb 2022 19:19:13 +0000 (UTC) Received: from localhost ([::1]:60110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgsS-0004kd-LT for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:19:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgX4-0001ED-5z; Mon, 14 Feb 2022 13:57:06 -0500 Received: from [2607:f8b0:4864:20::42b] (port=39513 helo=mail-pf1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgX2-0006Oz-Cm; Mon, 14 Feb 2022 13:57:05 -0500 Received: by mail-pf1-x42b.google.com with SMTP id m22so11607753pfk.6; Mon, 14 Feb 2022 10:57:03 -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=isRHTaQo7DzZUT2vSSjaeKX6MCgdzOyldyuiSGY08ZY=; b=YEVf2b8yxaaNroNyuJZZmOuxhNraFer3vstbP/LAJFobwgAMHcV78ZuOo20k+ursjx PjUq0hq8QxfsMhP6bTMmxK72M7RvWMG0aMjALet5T6MG+v8GAtoxdB9COkJmXe2g+riK z5B4hh/PoT6Y9WHhOOvVHrLvApbcs06Cb4B43ULmXlMr3Q8qpHrglm1hKqThzez6+HMJ SwoIpFpR1047idbbkUxyrEPyIZuZCAOWsKZrxIcUnrb0g2Ql0v+1hmdoy9SIVebdTIcG IUvkcIGzD0GY9LPHBreGh+cmpdEaeJXINfQbTICjpgqVIV8wiNTA7nKlkFsS1hQIZGhS EZXw== 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=isRHTaQo7DzZUT2vSSjaeKX6MCgdzOyldyuiSGY08ZY=; b=2d5dvjtwXUWU4u8NsEC51NGpnlfdwVeQ5B1q0KZx02VtYojsYq2lSsaUsuKUEKaRh4 OaL61QiyNvZrOPcOdDevQRyN0qFYVX0q24jNnPW9/P3+dgPiGZ9O8+EyWVwkjbCfCQZS QUljh4Ild8tvRxAuOWjR/4+7hsc0envLPGXuQJN3561XlSvxhvmGxUD+DkNQxOfWz5Fp uKmex7JcJYlHwm4FkJURo/OcdUYDHaulrqx5huCZJdFCFPqAsEfRxeOJxN3HIARPSCA2 X3Z7R8fBdyWn9BEn23bUF2zUW63P1mHCNNGcAlhCzAPilWZO/OeLao4EEnArxTGCsEj7 c2mA== X-Gm-Message-State: AOAM533eyTcLghKeLp2mWMbr0aAi1rTMetKZqo3Go/+SFpCbq00gEHZh I1Z+YZlFTGq/0KFJScwgoRDyyO+M/oo= X-Google-Smtp-Source: ABdhPJzp2tee3LRcfjnRRsPFfLUfPG1l9OYyS1bI230E6ROvSaSQ6U/wFXOEHDL72P4TxeXc/mLw9g== X-Received: by 2002:a05:6a00:21c9:: with SMTP id t9mr469892pfj.48.1644865022744; Mon, 14 Feb 2022 10:57:02 -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 q40sm14642132pjq.19.2022.02.14.10.56.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:57:02 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 05/16] hvf: Fix OOB write in RDTSCP instruction decode Date: Mon, 14 Feb 2022 19:55:54 +0100 Message-Id: <20220214185605.28087-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42b.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 A guest could craft a specific stream of instructions that will have QEMU write 0xF9 to inappropriate locations in memory. Add additional asserts to check for this. Generate a #UD if there are more than 14 prefix bytes. Found by Julian Stecklina Signed-off-by: Cameron Esfahani Signed-off-by: Philippe Mathieu-Daudé --- target/i386/hvf/x86_decode.c | 11 +++++++++-- target/i386/hvf/x86hvf.c | 8 ++++++++ target/i386/hvf/x86hvf.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c index 062713b1a4..fbaf1813e8 100644 --- a/target/i386/hvf/x86_decode.c +++ b/target/i386/hvf/x86_decode.c @@ -24,6 +24,7 @@ #include "vmx.h" #include "x86_mmu.h" #include "x86_descr.h" +#include "x86hvf.h" #define OPCODE_ESCAPE 0xf @@ -541,7 +542,8 @@ static void decode_lidtgroup(CPUX86State *env, struct x86_decode *decode) }; decode->cmd = group[decode->modrm.reg]; if (0xf9 == decode->modrm.modrm) { - decode->opcode[decode->len++] = decode->modrm.modrm; + VM_PANIC_ON(decode->opcode_len >= sizeof(decode->opcode)); + decode->opcode[decode->opcode_len++] = decode->modrm.modrm; decode->cmd = X86_DECODE_CMD_RDTSCP; } } @@ -1847,7 +1849,8 @@ void calc_modrm_operand(CPUX86State *env, struct x86_decode *decode, static void decode_prefix(CPUX86State *env, struct x86_decode *decode) { - while (1) { + /* At most 14 prefix bytes. */ + for (int i = 0; i < 14; i++) { /* * REX prefix must come after legacy prefixes. * REX before legacy is ignored. @@ -1892,6 +1895,8 @@ static void decode_prefix(CPUX86State *env, struct x86_decode *decode) return; } } + /* Too many prefixes! Generate #UD. */ + hvf_inject_ud(env); } void set_addressing_size(CPUX86State *env, struct x86_decode *decode) @@ -2090,11 +2095,13 @@ static void decode_opcodes(CPUX86State *env, struct x86_decode *decode) uint8_t opcode; opcode = decode_byte(env, decode); + VM_PANIC_ON(decode->opcode_len >= sizeof(decode->opcode)); decode->opcode[decode->opcode_len++] = opcode; if (opcode != OPCODE_ESCAPE) { decode_opcode_1(env, decode, opcode); } else { opcode = decode_byte(env, decode); + VM_PANIC_ON(decode->opcode_len >= sizeof(decode->opcode)); decode->opcode[decode->opcode_len++] = opcode; decode_opcode_2(env, decode, opcode); } diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 05ec1bddc4..a805c125d9 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -425,6 +425,14 @@ bool hvf_inject_interrupts(CPUState *cpu_state) & (CPU_INTERRUPT_INIT | CPU_INTERRUPT_TPR)); } +void hvf_inject_ud(CPUX86State *env) +{ + env->exception_nr = EXCP06_ILLOP; + env->exception_injected = 1; + env->has_error_code = false; + env->error_code = 0; +} + int hvf_process_events(CPUState *cpu_state) { X86CPU *cpu = X86_CPU(cpu_state); diff --git a/target/i386/hvf/x86hvf.h b/target/i386/hvf/x86hvf.h index 99ed8d608d..ef472a32f9 100644 --- a/target/i386/hvf/x86hvf.h +++ b/target/i386/hvf/x86hvf.h @@ -22,6 +22,7 @@ int hvf_process_events(CPUState *); bool hvf_inject_interrupts(CPUState *); +void hvf_inject_ud(CPUX86State *); 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); From patchwork Mon Feb 14 18:55: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: 12746027 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 BB33AC433F5 for ; Mon, 14 Feb 2022 19:07:51 +0000 (UTC) Received: from localhost ([::1]:43334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJghS-0001H4-Mg for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:07:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgXF-0001QN-GL; Mon, 14 Feb 2022 13:57:17 -0500 Received: from [2607:f8b0:4864:20::62a] (port=41725 helo=mail-pl1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgXD-0006QY-Mu; Mon, 14 Feb 2022 13:57:17 -0500 Received: by mail-pl1-x62a.google.com with SMTP id j4so11259933plj.8; Mon, 14 Feb 2022 10:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XUpXSgEfdHti7BNle9BRd8vJ4VdWvb4m7Pa200NuX4M=; b=QwZyK+1mE9BKBE5RiGTBlO5Mf9LRhWDzTSJVaGoYq6vqTbbDXUo8t8WrnjcwV/jwfg /AfsWVOR78lQpaMre8vwE9v596HboqTIo5GVkMLk1PXXu9VmNU5rEEf6iuaUyAXxS+PF EWov24XiqlRxFLYkbPBrX2Sf9toRNT7QIg3EyijsmXviGdUyRhzjEvabSxWsfuiIIHz/ 7UmcksbnFKe9ViEaY2xrqafdBfGqY/z9USeMJFGc6t2O6ACDy/rTWNX18dMF+bc5Q74H vweiC3+nEYTb0iakOf5HaQQxqa7g2iqJuRQGPIrIU5ivZIxT1bKxHal40UYraJcfHWxw fKxg== 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=XUpXSgEfdHti7BNle9BRd8vJ4VdWvb4m7Pa200NuX4M=; b=CNYWWZacGPK+1UFklKQWdFcASyACKfvYYSMByNDu8VVkXsRi68mSG77CpLLoqXnRTY fVi79UcOWiz2KJHrzszeR+SPx7DgTwRYRqGKVv2UDqewYd7zNs0yuPzsePdsLx2K2KMJ cBLeRbxQcd1pcFz1ji9MMmcsb23HxqEMyqVfuNOzNxrStFHG4tOeDK5Nc7f+dqWhqqV6 xRECcGjBJUTaYtLBu99/4p04T9HmDFQCi2IvpwXex8iwO6ODTVsiXCKKI5I4xPoyxlYs PaOmeWvlm7IJ0bYjtEcmbG+CtTHs8PGdBg4LuCm/z9tmgJ2ky24tfYO7xa2DUTbIYZ8v +e4w== X-Gm-Message-State: AOAM532EAyocU2UhpKw2//W5OFGekEM4m2XBFEUhe8laAoZZQBdWjKZp ezg3vLDZtd0neS+B8GR6mGKXxg/ZPg4= X-Google-Smtp-Source: ABdhPJy6HURQooqEMuauTbr2ERFg1XFbkfBdAX6VqJ54JUWG21YbWQX4x+k20QpOvVBNGTwTjpFxhg== X-Received: by 2002:a17:902:d510:: with SMTP id b16mr158430plg.152.1644865032559; Mon, 14 Feb 2022 10:57:12 -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 g22sm38618962pfc.177.2022.02.14.10.57.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:57:12 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 06/16] hvf: Enable RDTSCP support Date: Mon, 14 Feb 2022 19:55:55 +0100 Message-Id: <20220214185605.28087-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 Pass through RDPID and RDTSCP support in CPUID if host supports it. Correctly detect if CPU_BASED_TSC_OFFSET and CPU_BASED2_RDTSCP would be supported in primary and secondary processor-based VM-execution controls. Enable RDTSCP in secondary processor controls if RDTSCP support is indicated in CPUID. Signed-off-by: Cameron Esfahani Signed-off-by: Philippe Mathieu-Daudé Tested-by: Silvio Moioli Tested-by: Silvio Moioli > --- target/i386/hvf/hvf.c | 26 +++++++++++++++++--------- target/i386/hvf/vmcs.h | 3 ++- target/i386/hvf/x86_cpuid.c | 7 ++++--- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 4ba6e82fab..4712fe66d4 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -221,6 +221,7 @@ int hvf_arch_init_vcpu(CPUState *cpu) { X86CPU *x86cpu = X86_CPU(cpu); CPUX86State *env = &x86cpu->env; + uint64_t reqCap; init_emu(); init_decoder(); @@ -257,19 +258,26 @@ int hvf_arch_init_vcpu(CPUState *cpu) /* set VMCS control fields */ wvmcs(cpu->hvf->fd, VMCS_PIN_BASED_CTLS, cap2ctrl(hvf_state->hvf_caps->vmx_cap_pinbased, - VMCS_PIN_BASED_CTLS_EXTINT | - VMCS_PIN_BASED_CTLS_NMI | - VMCS_PIN_BASED_CTLS_VNMI)); + VMCS_PIN_BASED_CTLS_EXTINT | + VMCS_PIN_BASED_CTLS_NMI | + VMCS_PIN_BASED_CTLS_VNMI)); wvmcs(cpu->hvf->fd, VMCS_PRI_PROC_BASED_CTLS, cap2ctrl(hvf_state->hvf_caps->vmx_cap_procbased, - VMCS_PRI_PROC_BASED_CTLS_HLT | - VMCS_PRI_PROC_BASED_CTLS_MWAIT | - VMCS_PRI_PROC_BASED_CTLS_TSC_OFFSET | - VMCS_PRI_PROC_BASED_CTLS_TPR_SHADOW) | + VMCS_PRI_PROC_BASED_CTLS_HLT | + VMCS_PRI_PROC_BASED_CTLS_MWAIT | + VMCS_PRI_PROC_BASED_CTLS_TSC_OFFSET | + VMCS_PRI_PROC_BASED_CTLS_TPR_SHADOW) | VMCS_PRI_PROC_BASED_CTLS_SEC_CONTROL); + + reqCap = VMCS_PRI_PROC_BASED2_CTLS_APIC_ACCESSES; + + /* Is RDTSCP support in CPUID? If so, enable it in the VMCS. */ + if (hvf_get_supported_cpuid(0x80000001, 0, R_EDX) & CPUID_EXT2_RDTSCP) { + reqCap |= VMCS_PRI_PROC_BASED2_CTLS_RDTSCP; + } + wvmcs(cpu->hvf->fd, VMCS_SEC_PROC_BASED_CTLS, - cap2ctrl(hvf_state->hvf_caps->vmx_cap_procbased2, - VMCS_PRI_PROC_BASED2_CTLS_APIC_ACCESSES)); + cap2ctrl(hvf_state->hvf_caps->vmx_cap_procbased2, reqCap)); wvmcs(cpu->hvf->fd, VMCS_ENTRY_CTLS, cap2ctrl(hvf_state->hvf_caps->vmx_cap_entry, 0)); diff --git a/target/i386/hvf/vmcs.h b/target/i386/hvf/vmcs.h index 42de7ebc3a..bb4c764557 100644 --- a/target/i386/hvf/vmcs.h +++ b/target/i386/hvf/vmcs.h @@ -354,7 +354,7 @@ #define VMCS_PRI_PROC_BASED_CTLS_TSC_OFFSET (1 << 3) #define VMCS_PRI_PROC_BASED_CTLS_HLT (1 << 7) #define VMCS_PRI_PROC_BASED_CTLS_MWAIT (1 << 10) -#define VMCS_PRI_PROC_BASED_CTLS_TSC (1 << 12) +#define VMCS_PRI_PROC_BASED_CTLS_RDTSC (1 << 12) #define VMCS_PRI_PROC_BASED_CTLS_CR8_LOAD (1 << 19) #define VMCS_PRI_PROC_BASED_CTLS_CR8_STORE (1 << 20) #define VMCS_PRI_PROC_BASED_CTLS_TPR_SHADOW (1 << 21) @@ -362,6 +362,7 @@ #define VMCS_PRI_PROC_BASED_CTLS_SEC_CONTROL (1 << 31) #define VMCS_PRI_PROC_BASED2_CTLS_APIC_ACCESSES (1 << 0) +#define VMCS_PRI_PROC_BASED2_CTLS_RDTSCP (1 << 3) #define VMCS_PRI_PROC_BASED2_CTLS_X2APIC (1 << 4) enum task_switch_reason { diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c index 32b0d131df..b11ddaa349 100644 --- a/target/i386/hvf/x86_cpuid.c +++ b/target/i386/hvf/x86_cpuid.c @@ -96,7 +96,8 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, ebx &= ~CPUID_7_0_EBX_INVPCID; } - ecx &= CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ; + ecx &= CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ | + CPUID_7_0_ECX_RDPID; edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS; } else { ebx = 0; @@ -133,11 +134,11 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, CPUID_FXSR | CPUID_EXT2_FXSR | CPUID_EXT2_PDPE1GB | CPUID_EXT2_3DNOWEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX; hv_vmx_read_capability(HV_VMX_CAP_PROCBASED2, &cap); - if (!(cap & CPU_BASED2_RDTSCP)) { + if (!(cap2ctrl(cap, CPU_BASED2_RDTSCP) & CPU_BASED2_RDTSCP)) { edx &= ~CPUID_EXT2_RDTSCP; } hv_vmx_read_capability(HV_VMX_CAP_PROCBASED, &cap); - if (!(cap & CPU_BASED_TSC_OFFSET)) { + if (!(cap2ctrl(cap, CPU_BASED_TSC_OFFSET) & CPU_BASED_TSC_OFFSET)) { edx &= ~CPUID_EXT2_RDTSCP; } ecx &= CPUID_EXT3_LAHF_LM | CPUID_EXT3_CMP_LEG | CPUID_EXT3_CR8LEG | From patchwork Mon Feb 14 18:55: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: 12746028 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 2936AC433EF for ; Mon, 14 Feb 2022 19:08:40 +0000 (UTC) Received: from localhost ([::1]:44612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgiF-0002A2-3z for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:08:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgXN-0001u5-UX; Mon, 14 Feb 2022 13:57:26 -0500 Received: from [2607:f8b0:4864:20::1029] (port=36623 helo=mail-pj1-x1029.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgXM-0006R2-17; Mon, 14 Feb 2022 13:57:25 -0500 Received: by mail-pj1-x1029.google.com with SMTP id c5-20020a17090a1d0500b001b904a7046dso65664pjd.1; Mon, 14 Feb 2022 10:57:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/ycHa0Cp/S2K1hnOLMDePUWT2anHQ+aB3cRrtgPqv7k=; b=Wv0JUPvQtwm8legk2tznRlqa7uT/TvHeJffZRHzGDcE06XXVnFRXxB5b2lpQ88GNlY BwpsNjiD2RjW5EGgb7/+dfpS6l8NZkwGolIRxmb+58PJm12xXqegQBY5PYsAmAvRH7kL 5iY31r3rnoi1SnWgrzvt/bRO1HS9jCsQmBDNWCp8d1arthAGY3vl+xQ6E0YLN08rrhL/ OAP7ypjFaUTk+7Xra6GqIYFycwvJcrSxBNaKEWzCQ806uVTIQ7Itg/uL2t6ha2YJbarS aL/DK6kx6LqQMXG5Bzr6M2xgtheT5Yq+IJsfOiglnlVcWuHEf4fyOY16uO+sxFofp/it 48eg== 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=/ycHa0Cp/S2K1hnOLMDePUWT2anHQ+aB3cRrtgPqv7k=; b=rJQdMygqIZQ0PXnD9tcWNOrFCQmSnvziug46K1EuttTDvNyLBQaoNEIpvFIDac373a lbqQBi05WD5cjAfm2uU6WHNwsulcPqjN3jY4MRD3RO+G+CLkxgwNOcGC6AMeghwrRhoK 6zD/p2TbXaAcLwf5mHQK575kM/Kq84zfpTRBk6ey/vwOEa9k/WqnHeHF1KoAp1QNOP0C vaiBw15KAWBD5rpiXE0azVRmZlH+jGRWeAS8Y4Cm3jDY5uFlIwn8Juj/vZIICV1U0+NJ rCKOJn/Hqahl7oJ3QWcJv9Hh5kPdkb89D0Hyns8hQlJabE48YQNFY23LEQqCU+mZpkwQ 9log== X-Gm-Message-State: AOAM530Sc0DGPljMeXmMR1jJs5G/f+ngjXRwLsr3vP1zg5eq21DPPTgk yZApr+tgVE82XuMg8jsHJRHh6s9uOF0= X-Google-Smtp-Source: ABdhPJyyZq445715Oaqo3dY5DBJPzhIUz8PScRMCycSbaClP24bIFZ3MbshuBslorwSOoFOF4pvM8Q== X-Received: by 2002:a17:90a:1c5:: with SMTP id 5mr33451pjd.106.1644865042272; Mon, 14 Feb 2022 10:57:22 -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 w4sm282752pgs.28.2022.02.14.10.57.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:57:21 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 07/16] hvf: Make hvf_get_segments() / hvf_put_segments() local Date: Mon, 14 Feb 2022 19:55:56 +0100 Message-Id: <20220214185605.28087-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1029 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1029.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 a805c125d9..cff59f3144 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 ef472a32f9..427cdc1c13 100644 --- a/target/i386/hvf/x86hvf.h +++ b/target/i386/hvf/x86hvf.h @@ -27,11 +27,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 Mon Feb 14 18:55: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: 12746031 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 AF3D3C433EF for ; Mon, 14 Feb 2022 19:14:37 +0000 (UTC) Received: from localhost ([::1]:52280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgo0-0007aR-Ei for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:14:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgXY-0002DY-Ag; Mon, 14 Feb 2022 13:57:36 -0500 Received: from [2607:f8b0:4864:20::435] (port=36677 helo=mail-pf1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgXV-0006S6-Tb; Mon, 14 Feb 2022 13:57:36 -0500 Received: by mail-pf1-x435.google.com with SMTP id z16so8926288pfh.3; Mon, 14 Feb 2022 10:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d7T27EMFPVzp3B0TQwoZYMCEX+PxVB/NfGOmyTZ7TJw=; b=ZU/7/zN41RPTMvo06OtyQweAwSGVUFHci8URSBolro/hfPQiT1o65hY4p+Yq/H/mv4 K9T1011zpimskQfWbosFOBIrpXvNY169Y2i6kI+O4a3EY8skbSQI6cE3SNKomqKqlj1M SUkGbEH9hJ6yG7poQ+osxC4GwRKzZROo2Z+MPuufyNXwbkIzgEPtwnNFhYZmoRhf5w1e kIblDHJ9766RZ3wPjyS7MW0qc0UVRgqrgrmy8GRUQ+QKOZyaN8NvM3v77kBXvTkhfguJ hBstUVD0efmbYLB15+1p1xN2GzOPwxVTiiowDNyW8FR02zuSdN45QhcXPjIgLxxPljfh tDSw== 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=d7T27EMFPVzp3B0TQwoZYMCEX+PxVB/NfGOmyTZ7TJw=; b=Lm2lQPVA4NtKLCJEEwbrWYkppJrA3wQLEjdvLiptHt4Gvgm14Nw11RDoj5kdfdyBGN 0iBls32si1ij/+6B0luAQRs1XnKxOd38fBx+Ekiuna/CKKnjixGsx7j5CXN9R4y2m2Eh QCNBrxeAdmLDIWie4RwxHhrXnPIIWWdiNs2R9K7IF/XCDJ3U1bq6Hf28VZoTmzaNuwr7 FPYpuUAzbZXplBfSqIE6yTXwnampaNsyAElZJsaMJHHQ4lPzI4w07npHkT5Wae/+Mi7k aLxGXXuxNBMJ5nxEkff28DD4oK2a2bwWTc3GPq68mKk9hTls/aJ8WiBjez+6iVvgTXaE W0XA== X-Gm-Message-State: AOAM5333PSgzuRA89eFJdlRMjLSBlFxhmIcNQrSwp6qOK8cVEcgxouui aHjYjQ22smY8VF91fprSNN5e+TvF6Ik= X-Google-Smtp-Source: ABdhPJzdPjm0wNPApNaPX6Mj06L09J/dg8jX1/+KZJ8JlJ8nr/Hgzzn58hbGyGsWPbQscpHziIqUbA== X-Received: by 2002:aa7:8d83:: with SMTP id i3mr274753pfr.14.1644865051970; Mon, 14 Feb 2022 10:57:31 -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 v9sm37690693pfu.60.2022.02.14.10.57.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:57:31 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 08/16] hvf: Remove deprecated hv_vcpu_flush() calls Date: Mon, 14 Feb 2022 19:55:57 +0100 Message-Id: <20220214185605.28087-9-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::435 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x435.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 cff59f3144..a338c207b7 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 Mon Feb 14 18:55: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: 12746040 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 A50CAC433F5 for ; Mon, 14 Feb 2022 19:35:56 +0000 (UTC) Received: from localhost ([::1]:53636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJh8d-00036U-Q9 for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:35:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgXm-0002QH-Ot; Mon, 14 Feb 2022 13:57:51 -0500 Received: from [2607:f8b0:4864:20::102e] (port=45747 helo=mail-pj1-x102e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgXk-0006Sa-O4; Mon, 14 Feb 2022 13:57:49 -0500 Received: by mail-pj1-x102e.google.com with SMTP id q11-20020a17090a304b00b001b94d25eaecso43302pjl.4; Mon, 14 Feb 2022 10:57:42 -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=nEetAl/VgRr0Mak0q73c3UUAn/OEwr/Owp1XwhMXIZAMhaF2EjhfGlFTUSvgTeqMoQ czeVu6wmbIvh0h+XETv51/LK6p9TcgP+vwrV3D1GffXkZe/MVp78C708ahF8dunUXtXp GVmaRbkM9r2pObDi/BKu5LSBvLkp9fCKnLRs9WDxgrf+euC2Hk2gAiAz9cqJZZaJ4wRa aML2MfY/WtyG+e3uKItg3zy7EJnPuwpOm3UKO1VTsbmhJzimzrCSbkKDOujVKYTJ90Rd biT/G9/suShMGAYsc8yYZu1aut9YMqqRhgQXcc/j2ftWZj7mP7Zbb4gxYm63PLaiuD6b TCDQ== 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=ndSKPDxGHl91zE5Ky9E4s/awEFliB26Li1MLxXBilyJ2sVb4w7sRjtE6fyaXmy2e1I 2G+m4JEsRfyOh+Gr3PGvlcy6sFb5LKrdXcEMg3OCJCxktz+qOWyvzWi/iDUCZFil0HgL /oKFFnkiX0NVcDjUi6JasE1JPqelZp2fUKsQXO3AYOVtv2ZGiLsWjuzsOYpJZuyiKzyy eHiRvao8pM27vFt7gaPrLrB0Dd1o6EO2ZPG6IR3A+wUxfT9BWRYVtLlrnaR/KMO82ixV yZL7vzeVrZlBlGwTk4E7/Ng2saj3NLN1nRSro9wAnwBxz9sVbBUHf+4uxMrPeLHsm5kQ YQRA== X-Gm-Message-State: AOAM531w9PxXfyxH4+DBEOGVfcOLUUXZzf0Kh7odv31PAjlSGmyrCoJe 73G764BpOlCoBieNtAiOtXGr1uu9CGs= X-Google-Smtp-Source: ABdhPJyjpz84Twmr4qAWMetLWXd+TYlsJqN2GV5jOLzW4wYoPa6mOqgeDzuEvPxTcOCA+eg0CBUqAw== X-Received: by 2002:a17:90b:38d2:: with SMTP id nn18mr3951003pjb.167.1644865061924; Mon, 14 Feb 2022 10:57:41 -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 s6sm5363923pfk.86.2022.02.14.10.57.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:57:41 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 09/16] block/file-posix: Remove a deprecation warning on macOS 12 Date: Mon, 14 Feb 2022 19:55:58 +0100 Message-Id: <20220214185605.28087-10-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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é --- 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 Mon Feb 14 18:55: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: 12746044 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 134C7C433F5 for ; Mon, 14 Feb 2022 19:40:52 +0000 (UTC) Received: from localhost ([::1]:34188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJhDO-0000nZ-QL for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:40:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgXt-0002Zh-Eq; Mon, 14 Feb 2022 13:57:57 -0500 Received: from [2607:f8b0:4864:20::1029] (port=46950 helo=mail-pj1-x1029.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgXr-0006TA-SD; Mon, 14 Feb 2022 13:57:57 -0500 Received: by mail-pj1-x1029.google.com with SMTP id t4-20020a17090a510400b001b8c4a6cd5dso40323pjh.5; Mon, 14 Feb 2022 10:57:52 -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=+pya3JYgV6ZzPzcXKvqBqTPUHPFc2/HxKii/23sPW7g=; b=PzWiyhE3N1ftrbT0xEmJWUnJaas4xUnN7WcFyyB9ah0YZpgqpDB+JPgTzaSVqmKmh0 DC+Xw1mhUtattXqr4Jiei9ZsA4+DVBTGV8hN73z5rX7TpoO+mtcl3R+gUMczmpB8IgL9 ss1+3UniSwtk+h18nI+8sS36yAdKef3ORhExqfZIm3FWFb23Ldvj9fZlhR57GKOvlAgx 1t9GqSps8CxgNp7Gz6thM7o2Ug81HGgBAn3pJtV8htf54LKgDboVq9yj/dQ4pDJHD5TJ iwn1lWqUSacRxvdtGxuK8Sy0vLd1MYv1jNdM0zxlDLfZ5AiSyoam4CGPwo9tiOhLE0FB 9Qqw== 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=+pya3JYgV6ZzPzcXKvqBqTPUHPFc2/HxKii/23sPW7g=; b=pnPApCezVChw85MpJCNAjBXsDpsBdw0VjEtbzhI3nRJlH+KmRjg/eR9hHrCCRmSw0q Pj1KD/wOAQQYEYaGC+GJdXG3kkv9se/lIE6rx7fDE61P7dZC3ZmMnIXAzckmsk5Y9egw Cx443RJ0OQlCo8x1cFojgZpDX+SyOME9Br7ztieAvNvAlpT3G+/cZChKYlsk4B0L60+c 3nqwaP6uKKLd1Zbzz3IlcllfInnG7HSrKO/yNrlMHSyvPYfc0rIDC6/Dj0nm4+eIvA3b +ED5Bticf6RfPzn0vcEIsA6hkYtXv59wv4CDrSEWilvmzulB4RdphItrQRnT2+MeBUuH eMiA== X-Gm-Message-State: AOAM530jqTirxsGHx6WAbo8y36aSrRiuaM40EfXtLtR6kSf0as8mYYLd Rfq4woUnrRuXC/QT47nw9tNAAq5SKpY= X-Google-Smtp-Source: ABdhPJxVS8TdW9CqE1jImC3IL2qDYnwCDWtOgO7txSrwIDeoTGWrHKTk8cA+HaZcYdMNLV7TbyzUIw== X-Received: by 2002:a17:90b:1e4b:: with SMTP id pi11mr33772pjb.124.1644865071679; Mon, 14 Feb 2022 10:57:51 -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 v20sm14666531pju.9.2022.02.14.10.57.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:57:51 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Roman Bolshakov Subject: [PATCH v5 10/16] audio/coreaudio: Remove a deprecation warning on macOS 12 Date: Mon, 14 Feb 2022 19:55:59 +0100 Message-Id: <20220214185605.28087-11-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1029 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1029.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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é --- audio/coreaudio.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index d8a21d3e50..5b3aeaced0 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_MAX_ALLOWED < 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 Mon Feb 14 18:56: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: 12746035 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 79A8EC433F5 for ; Mon, 14 Feb 2022 19:24:43 +0000 (UTC) Received: from localhost ([::1]:41396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgxm-0002p2-8g for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:24:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgY0-0002tO-GH; Mon, 14 Feb 2022 13:58:04 -0500 Received: from [2607:f8b0:4864:20::42d] (port=38538 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 1nJgXz-0006U2-2e; Mon, 14 Feb 2022 13:58:04 -0500 Received: by mail-pf1-x42d.google.com with SMTP id e17so11310747pfv.5; Mon, 14 Feb 2022 10:58:02 -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=o10VIbmaGSHcbSXxtantuaPKpv753l/rmiRV/OR50Jlb9NeGBX9ScSrcEv+lK+z/Fh 4HwMMf3xZyWJsYNU8xSIrn6RrfWqtxhopqWPLxdaRmt4kwfS5WLj19F+pllQovIHWH4b R3wBZvxT4Iw2TBWmGpgVymQY52uZX3wSUVghPzJ8eCF5brqltJ2ig+zUhEx3/z3b1vQx HNbOcVc5wol0cJIiAhYpZOlx1aWcffB3UuL0L9jK4ofXmX8raPlXrCVxF6YtcRAkF8K1 GsAECsldplL3aacnOTv83w29pzNMz1ruui65iJt0pHGPd3wVY/i++rwzI/aaicgcLL/M l0rA== 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=qdd8ojdxGHELn75znHfHnTX5PHWuXeBM1F0f7SavaUUd9iG65N7WhohXzKtbeT+izK dKL3ddQfpZtQkdScbE13tbivU1gZpaOkQZL4mKX5QjT8FmuPcSMnHeyGp7au95KiWah0 HzCffP0Ajv3F5W8dlQ/N49zs/PT1pVcLnrQlAb2PfQcwf/b5P8Z912vP5NIeqFXKHmQ5 +Q+Dpljz19pVXG7mo9GFMUC+MFQRy2f1o7TWQMSEK7GenBv0A0JjTN+xHLehpmCrRiBk JUGx/lNtaPyJhkDUQ8Ig6haMxWHd7+JFe6SlBWPiGEPA42X+88qm3QYRieglMkLlu2n2 HY+w== X-Gm-Message-State: AOAM53185YvZSTm28p01c0qw0+wAYBO2rHvNAxdrY6chloCwGa1JTPH7 uxDLlv1L8YgpUsQGQWbPJuBn81d5y+8= X-Google-Smtp-Source: ABdhPJwWq1kOZBauLUI2RnK7jCY6SpNHzLgkHtD7LZY++EC1LcLXho02WEiTHUN83/vT047P/HfIpg== X-Received: by 2002:a05:6a00:10c5:: with SMTP id d5mr51446pfu.84.1644865081422; Mon, 14 Feb 2022 10:58:01 -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 v123sm20401523pfb.12.2022.02.14.10.57.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:58:01 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 11/16] audio/dbus: Fix building with modules on macOS Date: Mon, 14 Feb 2022 19:56:00 +0100 Message-Id: <20220214185605.28087-12-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-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: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 Mon Feb 14 18:56: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: 12746034 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 06B9AC433EF for ; Mon, 14 Feb 2022 19:20:08 +0000 (UTC) Received: from localhost ([::1]:33886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgtL-000678-5w for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:20:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgYA-0003J9-T2; Mon, 14 Feb 2022 13:58:14 -0500 Received: from [2607:f8b0:4864:20::42c] (port=42606 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 1nJgY8-0006Vi-OL; Mon, 14 Feb 2022 13:58:14 -0500 Received: by mail-pf1-x42c.google.com with SMTP id i6so28924629pfc.9; Mon, 14 Feb 2022 10:58:12 -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=CGhcAiTXV4EJLWRNqc11R451OExvwrlGgW9WvD/ViCArCSbxR2Suhrd7aO31lwZ3qC nBajM4n/XMOTVe6ebtSEJ04QI3AXYmDGY+fnvvlRNp95zMifuSQENdYNWe8Fl27U97pN y3y/s9JxkVsfQgHeokykPn5TPs6hbGzpJ8AnD4yPLaVCI0Fh4OMvuFX49buOsUJeRa5/ rTKf2aomaNAvWxH4SiBY0fnBs4AfImAnV7XpfUWjp8+H09Ucm45oVK4UgsgN0DgAPlpw yXRDLep2PUR2TDUij3+F9IVNKorZzFUdn5KsG5LsuYkpDLPLVJWhyf66Jvgg20en2qe1 pHPA== 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=1+HAKM0SUFSCwViE9th9SEc4veTR36xTTDqc/lDqE0iD24e1Sc8Dm6ZUgyezyBd5iI T9NrqyBkUs1WUlpLqDS8XeCA2TE97nMxxjEQa4CaxwY7RymkUBDZsucM9GLUQshPHRCP RCGH6loSZjPqzoPbRHfwleQCYHvFgbuigNXrdxiDJ3lashX9pIvlbU+tyO9/tdLnRCCx ciGFbtWR9p0mUUiXAqMbwu/qNKXRUg4veK7joRhhh4CUz41tGxuz+zuifZcI5SMEkgVx iaU2q6hweH605qadVGRZW0jfA+8baijKfGb2yEr+vb2y4ijed53bap7HQc3rU2tZRGdr Sc8Q== X-Gm-Message-State: AOAM533jVQVT9ltMLw1rMdibrvcqFUTARuIv3EdeaKnpTPdK1X9WJNna criCsn/NCaN2rsul5004kbDkguNPX/w= X-Google-Smtp-Source: ABdhPJyet0V11fEBcQlc/YZMJoAegv2KYZMIRtBqWwEte5hityoa947aiirDwXh00kwIugNncCe6aA== X-Received: by 2002:a63:2d6:: with SMTP id 205mr355358pgc.93.1644865090963; Mon, 14 Feb 2022 10:58:10 -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 ng16sm15369818pjb.12.2022.02.14.10.58.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:58:10 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 12/16] ui/cocoa: Remove allowedFileTypes restriction in SavePanel Date: Mon, 14 Feb 2022 19:56:01 +0100 Message-Id: <20220214185605.28087-13-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-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: 9 X-Spam_score: 0.9 X-Spam_bar: / X-Spam_report: (0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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é --- 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 Mon Feb 14 18:56: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: 12746047 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 191A4C433EF for ; Mon, 14 Feb 2022 19:44:41 +0000 (UTC) Received: from localhost ([::1]:43484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJhH6-000754-67 for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:44:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgYK-0003pI-71; Mon, 14 Feb 2022 13:58:24 -0500 Received: from [2607:f8b0:4864:20::42a] (port=41794 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 1nJgYI-0006WN-In; Mon, 14 Feb 2022 13:58:23 -0500 Received: by mail-pf1-x42a.google.com with SMTP id c10so5225323pfv.8; Mon, 14 Feb 2022 10:58:21 -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=MuNzoqYfhalHcR5PRZir58Z2BLNOJJB9MF6gfPqwO/VFFzcLdK3IdQmFLqn3rjTTlX jJp2M6Hks1k861YltWITDTHLOtNWN3gxyDlgz+aO+07oQAwq29EgJKuogxU1CvU6ngxg TGz4BnRVBqB+r3Kz5nzdj9udrde+Hm/D6uI0H7Ewqs/vL5vnvCVzmWCVn9TdbjyOthpd 0ZjI/Bq265k8jnRmO88KkmMqO26QB9RqJthV3QLo9zpXqThwwMuGuTPr0HHdwbDC17PU FtgWvP9R0gyybafuUJRYu35PZ75u478w1tu6apMhHPtuHzRn30iEmM5GKcGVnBS4+NgP hF1w== 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=acm+R8VU+Ueq+EoOwK0dgz9KKEfdO/xrD7GpDc78KDECZX0e3rE93zydFRtN7Nsofk gH+HANDtdHnUXwADP99FbGJ/RL/Z0Ddn31CyEB4iJuoGW6VXbBNTBIcqMuOkDAaVm+jR h7/GWazMmOIc/SvKs3K5vre3sKbi5Oithuh+GyOK/1iRxcyVo5HYh/4u7pa/8jY8cr2q OV6k3fNNK0LbdRSZqD5h7umJo9t0d4QzS8jB7pDahGdtQV5XL/oJMbLCYOYY1XUQEqMJ i2svIiXqCRTth7hIbmGW6g5AP/co7Tc++RxhdJWAJgIuKf7n6lj/YDwLseUQ+OFb9O1T BbQQ== X-Gm-Message-State: AOAM533958SPbOHwZoOMmSyFo5WlzRioZWTTcuO2dE29fd2v0y+IP8i8 aeHbHA08OH5QmPgeb6o56aEpEZTHQwk= X-Google-Smtp-Source: ABdhPJy0kFxO5lo+gwyMgeIpyvnx2G/d7nx/ZE0UqzMnj/gwJDD/0mZlVnT7n6eslQk7VjNZmUgl8Q== X-Received: by 2002:a62:2581:: with SMTP id l123mr211606pfl.71.1644865100933; Mon, 14 Feb 2022 10:58:20 -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 q9sm269406pgf.73.2022.02.14.10.58.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:58:20 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 13/16] ui/cocoa: Add Services menu Date: Mon, 14 Feb 2022 19:56:02 +0100 Message-Id: <20220214185605.28087-14-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-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: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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: Peter Maydell --- 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 Mon Feb 14 18:56: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: 12746049 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 E3DD3C433EF for ; Mon, 14 Feb 2022 19:47:41 +0000 (UTC) Received: from localhost ([::1]:48958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJhK0-0002Sy-VG for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:47:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgYV-0004Ge-0j; Mon, 14 Feb 2022 13:58:35 -0500 Received: from [2607:f8b0:4864:20::630] (port=44572 helo=mail-pl1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgYS-0006Wg-My; Mon, 14 Feb 2022 13:58:34 -0500 Received: by mail-pl1-x630.google.com with SMTP id y18so11250484plb.11; Mon, 14 Feb 2022 10:58: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=cRI6UGAn4vjJdciiBP0mAxumIP6lTNDE1aSs08ebrks=; b=hx9IkA13Ae3fSfvbHKziWXGWNycJDg6Ny6aIn0H1LfMsfIxrK29GFaZLkUxnJP7W3X KO6+0RdB0b7CoLu0/H6k/m5U3UH4hayxtqgjTtpvDt13HCtsVBfLOWfR2INqvzapehsV kGCFY15Ujgst1xwTubThPGkXYiOMJQNI+AWQoH6yoq/JeLgxqkZs9ZGEGsOr9pOwiWIs vuFsJgjyNFFc5215iGdRtaaOsf4ak35gZZhnIHjIatvo40oxzN6iS6LTRyROUplhMYoF kEUFlBOQLoGuW5IqTyQ1MHF5IGMr1veCY7q/sXL5WnToq6k5S0269oE8dec2MaKAdc07 XvWQ== 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=1rrIsbvCeQeKQWsl865Qqr9/qPeSLZuJFSwhaIMXXW7tDlHxu/DjMrhUhvTrWvLMuk q68a8RdUww5epN03jeRv6/X8pmmH/8tgHz6rFNeuqrHTfwwBBDxuuK1GLeDVXnEgZ4jY IyqQ/gGrKFfOgN4OuySG0g6c7A55AW+aQxAtqarGEzcu8WLOIK6uUOeIY6sn1LZgaKm2 /ap77Qby1hIcZRKhVTHkD84nRw/dlAGENQqYxyy6khCsVpmS6ZBlmRGQ+xz89JXsr5Tu 1HOcW8zQSPx1Z3sU3uVsrC16KGGzuruaqArxy2gs4GH4QnPuGb4oOU/CMa/ie1L0NANJ ZQnw== X-Gm-Message-State: AOAM530/EWf6BT6SgzDsbH7z+BirBgkgH2VYdRk2JFlSGDmvmBiKauzO tEilh3UKWSiq+cHZ+BtBvHSKwaugyZ4= X-Google-Smtp-Source: ABdhPJyfQhH3/sY+tPyqsC6RJjgAx+ARUHgbUNbeA1rOEE4neXuaavZ+OrRIGECOtDgcK411IdXcww== X-Received: by 2002:a17:902:cec4:: with SMTP id d4mr201208plg.158.1644865110889; Mon, 14 Feb 2022 10:58: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 x12sm293056pgp.25.2022.02.14.10.58.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:58:30 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 14/16] ui/cocoa: Do not alert even without block devices Date: Mon, 14 Feb 2022 19:56:03 +0100 Message-Id: <20220214185605.28087-15-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::630 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x630.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 Mon Feb 14 18:56: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: 12746051 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 925C1C433F5 for ; Mon, 14 Feb 2022 19:50:39 +0000 (UTC) Received: from localhost ([::1]:54620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJhMs-0006MN-EZ for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:50:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgYd-0004XK-OD; Mon, 14 Feb 2022 13:58:43 -0500 Received: from [2607:f8b0:4864:20::102e] (port=40934 helo=mail-pj1-x102e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJgYc-0006XM-BQ; Mon, 14 Feb 2022 13:58:43 -0500 Received: by mail-pj1-x102e.google.com with SMTP id n19-20020a17090ade9300b001b9892a7bf9so32315pjv.5; Mon, 14 Feb 2022 10:58:41 -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=J3na8susHmby8TR4jzyryoU+uoSEfyt40zPtMqoq/L4=; b=RtbNa16o2veebiOIwgmajkFMfaEI35QQYxwPnzju2/sbZ4WDAP26iNYfL1e8dohAur K78iYGsdgB8HxQyMPHqWvW9r7i3vq15jyGF0EsGbfrX0/pnYUTGJoLGMmwfOaY029lVr MT402dFHxW/KU1/rZAVtmntcz0qABPzujnCNcC1rZvGbObc11/lpN7NFp/hp4JDgLnBb cFJ3QuoFcreBoB/osZ94cp9mrXJDQW5Q0WdVKqB9PLK2GVXX9edVkBj4l6IZ+IDQXnEk ap2zLhwCOOv147umw2brojV9SwYrsvVQpEK2kaj0y1bR9wt2Ek55yI3voMuAbCnw4eEE x58Q== 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=J3na8susHmby8TR4jzyryoU+uoSEfyt40zPtMqoq/L4=; b=0RxgwKevOQAaic2ZyThij0AsUFWCHLCGoWlmCHdcn2s+psq+q6MWcrM0H4jtL6H7iE rBfsxTbZvFsVrp+LQ7wmtrdCKpZQ5WswApzf7Vuii97t6uwVQgU5zmHhN1nSjDDKMPq8 8foiwi0C6n5iDLdfLvIkuJAeeRvbvwj4uMxIiW9XnhwW8fXXoTH7IYAcWiIjppTPR9YS cgwXdPBpHixBItPKqzfYRj03uamAD7L7TCTgpoKmwTeA4yEQhBZpyo4sAqdyefctZ5BX xe6cAxZoPyrvqF2+gO3Nv9nK4y3fOr5wVWt1KFjLG11vAcFwSqFjq7SmcPGP6fC3tA2d h6mw== X-Gm-Message-State: AOAM531R0xrnRjTheMxHBb7fTTjCAs5X5CEQ4iZRM0Rkw/PkUIlVXTVg OL6lm67+mHpqMwxNH4OP5XyRGtbhug8= X-Google-Smtp-Source: ABdhPJzWL8od6OCivR4jNXKCnPwafgSyaOOZv0mvBWfkp3scHGQtA3nqqEnTdBaKlRbScJai1ACT2w== X-Received: by 2002:a17:903:289:: with SMTP id j9mr259923plr.150.1644865120734; Mon, 14 Feb 2022 10:58:40 -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 o2sm288665pga.57.2022.02.14.10.58.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:58:40 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 15/16] lcitool: refresh Date: Mon, 14 Feb 2022 19:56:04 +0100 Message-Id: <20220214185605.28087-16-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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?= 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 Mon Feb 14 18:56: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: 12746032 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 64A0AC433F5 for ; Mon, 14 Feb 2022 19:16:38 +0000 (UTC) Received: from localhost ([::1]:55052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJgpx-00014r-B3 for qemu-devel@archiver.kernel.org; Mon, 14 Feb 2022 14:16:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJgYo-0004rr-3U; Mon, 14 Feb 2022 13:58:54 -0500 Received: from [2607:f8b0:4864:20::635] (port=38407 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 1nJgYm-0006Y9-AX; Mon, 14 Feb 2022 13:58:53 -0500 Received: by mail-pl1-x635.google.com with SMTP id c3so11274699pls.5; Mon, 14 Feb 2022 10:58:51 -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=E5r1qohF89gVBikHeedld13Y+J8tlxW9bOOdQOVxRyA=; b=NayNXSwQUbYHMwrD/M+X4aMwBecAvWS4Xnnk8a9yoYDPKgRDwE4hLS4V63HjlTRxeV wzBkhMc7jcVOIafGUB49s7itxeptly+6B6KlPX+Qw0zerQHIfCxw+hpsges6MB3vRUr8 FdM/dLwAYc3ZXMoQDF8Y3jB531eJSBR1kjR9aOXYsmbwmDRpV2UjJ0nz86ikXaorUZte fpRl377g3tpdd7bGvt9rv5B7vpdzzA31wGYyleDBxojbG7lP6lA5hUYPvLrfQ8tikgtq +cQcauHAh5AY4aq7sjv+FmZaKkGXSC2Mb5LRZyziKglkvw3Eyuc7qUQqp920DBjOIYNv uSlQ== 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=E5r1qohF89gVBikHeedld13Y+J8tlxW9bOOdQOVxRyA=; b=qhx/0euKE/RfhTlgOElDLL9uvPKG5uAyHcAovoxii8XxE+jo9BwKi4wWaEvzDGbimO TwxmZTRBfCB7VSbMStM5Q/CLDKrozXc1NfSCvprm/Lizcn6Vc3Pcwq5w9ibn19HBt57F ysGTpYFKT+qLUqozUFbrZab+dO4KfNFC5dSAn7Gggr84zxoubaz3NHO6+4HqFlexxnkc HoHGI20dWNzUpqu6o4uKkPQkJsMjGamw3KMnN+4w5bZTscZ00wvFftiUV9H6IHS0lzi9 83FrHjy+EVxTMT/3J6xe+kMWh/Td5FfepHVPad8CTwUH45M8QpxGuVt5WQHpDWkNmKUN /THA== X-Gm-Message-State: AOAM532RTax41NwH5EqBMpfV3u5vUA0gY9q8voLY9T0jx4mP0BQsr6wr XlIiTeAEYLGutDyw0UDjhrZRuRrVUVQ= X-Google-Smtp-Source: ABdhPJwslQIcDPut9ZuSv2BDRTyxcXkX5MoLRI8WF/a/r7SUbXVFyeVBhKGfxLWl0cnmkS4urtqGQw== X-Received: by 2002:a17:902:e80c:: with SMTP id u12mr364482plg.159.1644865130596; Mon, 14 Feb 2022 10:58:50 -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 l17sm36847331pfu.61.2022.02.14.10.58.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Feb 2022 10:58:50 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cameron Esfahani , Roman Bolshakov , Thomas Huth , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , Akihiko Odaki , Will Cohen , Peter Maydell , Li Zhang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v5 16/16] gitlab-ci: Support macOS 12 via cirrus-run Date: Mon, 14 Feb 2022 19:56:05 +0100 Message-Id: <20220214185605.28087-17-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220214185605.28087-1-f4bug@amsat.org> References: <20220214185605.28087-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: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.635, 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 ++++++++++++++++ audio/coreaudio.c | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-12.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 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/audio/coreaudio.c b/audio/coreaudio.c index 5b3aeaced0..1faef7fa7a 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -45,7 +45,7 @@ typedef struct coreaudioVoiceOut { } coreaudioVoiceOut; #if !defined(MAC_OS_VERSION_12_0) \ - || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_VERSION_12_0) + || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0) #define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster #endif 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: