From patchwork Tue Feb 15 17:00: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: 12747364 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 B60DCC433EF for ; Tue, 15 Feb 2022 17:07:31 +0000 (UTC) Received: from localhost ([::1]:47924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1IY-00044M-Bh for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:07:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1Ci-0004pE-Ti for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:30 -0500 Received: from [2607:f8b0:4864:20::433] (port=40916 helo=mail-pf1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nK1Cd-0007Sk-Aa for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:28 -0500 Received: by mail-pf1-x433.google.com with SMTP id c4so14553133pfl.7 for ; Tue, 15 Feb 2022 09:01:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FnEB3B4/ZVIf8wBNfHZ8TLXBDLBjRhVvogxhs+VZaoM=; b=fTI97ojbmWsjvN+0lV5K13sOlM9Rej0hVB5UVmctxGRS9wZpPnf/pXZN6c1nE3ntqR WbpOjNLW+QQVFZHjA0Fj+7o6FXZKMimrRSxDp9pgmsMrFI2DYbRcJahC3dROZ9ub+tPA Pw7YbQGn6DrNxJ8QtoRrVISTsrJFqXHIqK8KbCKY7Ay2sf3Ch9fW9PWvKX2tRGIXrEoC MduIMEetwPovvUgN6aiw+nrfh6CSLm9zPmA53DClBSf92BQlCpa/LnyC//tehshZ+tJm aogFgZCJ2p8spqouYF9UurQc9V/F0IIFGrOW4LMLWce5kD41oBFrOmn2AysTjX3aRIAC w9sw== 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=FnEB3B4/ZVIf8wBNfHZ8TLXBDLBjRhVvogxhs+VZaoM=; b=d7PC2kleK3tkOpOpuZbZJU29QoS8BztWRRNutWiDS0gdeSM80K0CKqWDB+b585VDhT cTVC6nB1hvgzOuTCk4BoqxwZV93EAEG58u/n7GYNMbPqqh6KLTkkcfQ3zvHEAr6WeNGu DN/jpho/gx9TqN6xy6lsX+piEoPnWZT/Fl7LanaKIefJJiVMTDRWZZGh3XjoWCTLOXAt 0+6LU18rXutbjxE6dO5nh07DtMuu5NNlVlcpS73BSumv9W44QsEZM3xdxsfJE8KS27vD FS7icRf3KiGVwPJw2JXqfmBSgJdSOZXLLKcPFs0+mlmsk2S2eFb0EZHD24IQp4twn6G/ Qdog== X-Gm-Message-State: AOAM533VpbrP6aPPHvwbkFuiZqsBGPD1Ff/PY4S0ti/sd8Q2OA1k7RTr pMO9rJCZHYK7bDR13B7z1/X8Z4Webf0= X-Google-Smtp-Source: ABdhPJxMQzasJwfjnRIgji7pg97CblPCJxIfe35jREJXPaldo+xUvUpin86/JAhA0zZadP8FpT9yBQ== X-Received: by 2002:a62:e115:: with SMTP id q21mr4841417pfh.40.1644944481345; Tue, 15 Feb 2022 09:01:21 -0800 (PST) Received: from localhost.localdomain (71.red-83-50-68.dynamicip.rima-tde.net. [83.50.68.71]) by smtp.gmail.com with ESMTPSA id d15sm41409837pfu.72.2022.02.15.09.01.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:01:21 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 1/8] osdep: Avoid using Clang-specific __builtin_available() Date: Tue, 15 Feb 2022 18:00:59 +0100 Message-Id: <20220215170106.95848-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::433 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x433.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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?= Remove the Clang specific __builtin_available() to allow building with GCC, otherwise we get: include/qemu/osdep.h: In function 'qemu_thread_jit_write': include/qemu/osdep.h:787:9: warning: implicit declaration of function '__builtin_available'; did you mean '__builtin_scalbl'? [-Wimplicit-function-declaration] 787 | if (__builtin_available(macOS 11.0, *)) { | ^~~~~~~~~~~~~~~~~~~ | __builtin_scalbl include/qemu/osdep.h:787:9: warning: nested extern declaration of '__builtin_available' [-Wnested-externs] include/qemu/osdep.h:787:29: error: 'macOS' undeclared (first use in this function) 787 | if (__builtin_available(macOS 11.0, *)) { | ^~~~~ include/qemu/osdep.h:787:29: note: each undeclared identifier is reported only once for each function it appears in include/qemu/osdep.h:787:34: error: expected ')' before numeric constant 787 | if (__builtin_available(macOS 11.0, *)) { | ~ ^~~~~ | ) Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/osdep.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index d1660d67fa..aecd2f66ec 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -777,16 +777,12 @@ size_t qemu_get_host_physmem(void); MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 static inline void qemu_thread_jit_execute(void) { - if (__builtin_available(macOS 11.0, *)) { - pthread_jit_write_protect_np(true); - } + pthread_jit_write_protect_np(true); } static inline void qemu_thread_jit_write(void) { - if (__builtin_available(macOS 11.0, *)) { - pthread_jit_write_protect_np(false); - } + pthread_jit_write_protect_np(false); } #else static inline void qemu_thread_jit_write(void) {} From patchwork Tue Feb 15 17:01: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: 12747397 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 50858C433F5 for ; Tue, 15 Feb 2022 17:15:53 +0000 (UTC) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1Qd-0005iH-Sg for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:15:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1Cn-0004sU-6Z for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:37 -0500 Received: from [2607:f8b0:4864:20::102e] (port=54844 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 1nK1Cl-0007TX-6l for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:32 -0500 Received: by mail-pj1-x102e.google.com with SMTP id b8so5980557pjb.4 for ; Tue, 15 Feb 2022 09:01:30 -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=JA5egnPXroF8uv1I7WQE/eczsZ4kx7R+gKv7d83yjNQ=; b=KF6s/8bpIcp2M1NToTKNu7PizdvhYaJUjri1REpyjqti9wT6XoRYd8Wu5oPCF3LwBD X21TIh8ir6cdN5DOmTnygUZ6/Y75KUR4OCf0HyYImeW8eeYAO2WVX0NwOtRTEM6F8WT/ buChSCPrPoGEJBTkctwxH6WeoxIdgrl/mm8KLwUmPtgHkRKDoaqHzONoLDMPbIl47cFe cTnapxH+YCNSWhkiPmaBFdIJe/QYtASmbIbHMeaFKZUHyq46buH34PW1tyJFuVlooBez YFSuvNwl9n9JdTXEzt0WbftBUMrFKZlAkgCEMD1VuHarjt7TvzF/6Okd8KPi5ClXhlqd /Zmw== 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=JA5egnPXroF8uv1I7WQE/eczsZ4kx7R+gKv7d83yjNQ=; b=eUXzEQOISRL/V6JFPH7m5rUw4m4V0jqAiB1W71TiaZpzr2SqIMWNH1tlNFpeYmaB91 5iUTuZr1Td9svRQI9mbhfABKZT5PNIB6/WOqnw/zDLnv/70itYjQLcgRQRFuuud8noR8 Z1NsfKUUUzKDmhgpU6EzV4DEncYKJIBhqXuHYAmWCu9n52zbz9OhwA8r6lmiFUwjFDI3 NplFmHJoG2d+ytvNpPhNFFyEB1+njTGh9glcjM/OD9Or6KK970+Vu5MEPLFHY9bv02i8 swDROcJ6bCjB0oWQSE5mi9zbEibu9hoXaV6yWYgcM37RQcxQdD92SYi0Rd9+a4v4Zy5Y QTNA== X-Gm-Message-State: AOAM531pCY7xZoOaFNceIBOwyDjYgb3pGCPckh/k6V0ouRl0/82iXRUj lPyf69000c6FaSm4Lb6FvsAES3XVFWI= X-Google-Smtp-Source: ABdhPJyOX8XsdOHzRaXgEg0DLbEQ74ch+ycjRjbK50/SGat/fuT6PFGG8VFjWDhTRbtCfqSwfr2z8Q== X-Received: by 2002:a17:90a:d157:: with SMTP id t23mr5406234pjw.193.1644944489628; Tue, 15 Feb 2022 09:01:29 -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 k9sm42310839pfc.157.2022.02.15.09.01.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:01:29 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 2/8] osdep: Ignore 'unguarded-availability-new' warnings on macOS Catalina Date: Tue, 15 Feb 2022 18:01:00 +0100 Message-Id: <20220215170106.95848-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-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: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= When building with GCC on macOS Catalina we get 2254 times: include/qemu/osdep.h:780:5: warning: 'pthread_jit_write_protect_np' is only available on macOS 11.0 or newer [-Wunguarded-availability-new] pthread_jit_write_protect_np(true); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fix by using a stricker toolchain version low range, replacing MAC_OS_X_VERSION_MAX_ALLOWED by MAC_OS_X_VERSION_MIN_REQUIRED. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/osdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index aecd2f66ec..1e7a002339 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -774,7 +774,7 @@ size_t qemu_get_host_physmem(void); * for the current thread. */ #if defined(MAC_OS_VERSION_11_0) && \ - MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 + MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0 static inline void qemu_thread_jit_execute(void) { pthread_jit_write_protect_np(true); From patchwork Tue Feb 15 17:01: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: 12747363 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 11CB8C433F5 for ; Tue, 15 Feb 2022 17:06:11 +0000 (UTC) Received: from localhost ([::1]:45428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1HH-0002Lh-2Q for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:06:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1D2-0004tG-61 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:48 -0500 Received: from [2607:f8b0:4864:20::62a] (port=45805 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 1nK1Cw-0007VN-ML for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:47 -0500 Received: by mail-pl1-x62a.google.com with SMTP id w20so13537377plq.12 for ; Tue, 15 Feb 2022 09:01:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MksClFfWuwT461ko/karqF5I+zAWkXZ4G+9GZEuB/6s=; b=qiCzRSQGPBQa1BD+A2xdeRAbGmmq4l9eFvMH9PVSzGajHlPlXmwXBAx6oX0YcXoGkm qdfP2vrideCYokPoq2iXexwnr85TRT9ZQkn5bjpAH59bcOgW4F5YlqsSP8qicVEAhJ7Y WApE35yEyv2v/uoX7Ahzs/LepS28AgoDW6zJomKL7RKqS93nJr0mBQa9yPqoY+K7Khfr KDZf1aeJPBS3yTFpnYX1Zfn/1cTrSn4zN+oM4nygN9Qsm1F7BP8tSa/XGM4RhMzhwMyl OADaa4Jlf8odcQuTFJSXqPH8baj81Soi+WhwVDBk3D3ZhUmrBiM4biPfIBbrKaYZ6N4b gZlA== 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=MksClFfWuwT461ko/karqF5I+zAWkXZ4G+9GZEuB/6s=; b=22lIrDd0ExQCzpHtfW+G12itx5AhegMIovthqbAfceJEcvTOOJWxgIPZSE8X6cU6gm aLTqIVq4mxBA5gdevguUBNfdy6YHgit0I3Rob7qTVRoRsFIgXKRzOwjhqHE8/oHjI1h8 yt+TOHOt+2G73C3AC1pfEZ9XdS9qxIQ+BHAWLQAvXnFBRjy6LMxWS8LUcc556LWdU+L8 kg8deis4QTbPLFjmEEluYWKXEn0aCpKJ8DyBo6jmWKjpmBwWOL9W/y6D7CP4lWRVl/L7 ZeP1v9X/au7NVAmin2C5iDPJiiLWg9We7tqM2rEy2KH9P3RFUG6pNfNFEc48yYx4LbLu ZM4Q== X-Gm-Message-State: AOAM5331YzYt/asS8Gh8QcXcdVkpcu4xuMrfMcAaGpED/6zTcAhSe6tD haLq/rF+UUiAFW16+ys+CZuGu3FujCo= X-Google-Smtp-Source: ABdhPJw5F/K/KKt4B3f+sm29kXbYt4uf69VgD5dMEuzVhS1gq4dpdJv6FXoRRgqvha+v3GzflIy+Kw== X-Received: by 2002:a17:902:f60c:: with SMTP id n12mr5020611plg.155.1644944497638; Tue, 15 Feb 2022 09:01:37 -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 i3sm3151099pgq.65.2022.02.15.09.01.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:01:37 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 3/8] meson: Resolve the entitlement.sh script once for good Date: Tue, 15 Feb 2022 18:01:01 +0100 Message-Id: <20220215170106.95848-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-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: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Commit 235b523dba ("meson: Use find_program() to resolve the entitlement.sh script") didn't correctly fixed the issue, as the script is still resolved for each target. Move the check earlier, before processing each target. Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index df25e7a5e7..287be51ff2 100644 --- a/meson.build +++ b/meson.build @@ -2894,6 +2894,10 @@ common_all = static_library('common', feature_to_c = find_program('scripts/feature_to_c.sh') +if targetos == 'darwin' + entitlement = find_program('scripts/entitlement.sh') +endif + emulators = {} foreach target : target_dirs config_target = config_target_mak[target] @@ -3051,7 +3055,6 @@ foreach target : target_dirs install_input += meson.current_source_dir() / entitlements endif - entitlement = find_program('scripts/entitlement.sh') emulators += {exe['name'] : custom_target(exe['name'], input: build_input, output: exe['name'], From patchwork Tue Feb 15 17:01: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: 12747362 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 180EFC433EF for ; Tue, 15 Feb 2022 17:06:04 +0000 (UTC) Received: from localhost ([::1]:44988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1H8-00023c-P5 for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:06:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1D3-0004vf-VM for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:51 -0500 Received: from [2607:f8b0:4864:20::434] (port=34463 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nK1D1-0007av-SY for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:49 -0500 Received: by mail-pf1-x434.google.com with SMTP id g1so16080443pfv.1 for ; Tue, 15 Feb 2022 09:01:47 -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=qKNx/hUMMdUpgOrn9IAyD8EGaw4inpSUg6uvueEzEgo=; b=QDVWbauedMl0PiLjTuqHq5MmapM8vtr6ey4yTCvODJZYF6Kgz0qd8RMtleF14zF4Pu BWxovG92MFkkjk63ohottThOf/Xo3/ze/UiUgKvWc+MHKDrCZZGT3HfhGESG+6foabd9 BOIZvBcx/jEz7fco/dDHip5DnoMrJXPnRaPCKTOntwK9fU6n8Ew4lavNvzZgj6/2Gi7j n4N/cUugIbw9HQwt2uUZ8SAnligAlLz1eDoTLhR4Ch1nWpqyLfpXSbG4xVOLilxhwZhM 14IZMrJYTJEBmgsC16kWMLNMAlFn6xwk5aAASrPTt3WDwfENmwIhiG2cqXcidNqtN8cA kt8w== 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=qKNx/hUMMdUpgOrn9IAyD8EGaw4inpSUg6uvueEzEgo=; b=7Ogjex6jvfE0bT9rbAhAOQ2aVktzba0zbvk5mLe8Hzpzcjk/wF1nVYzg+qnMEjDOIY uSB3DftsWz1eEBFz1reEJb9lNp9bByv352gxEP1lOFgmHVsdaFLSEKViDGexZr13GSF7 NPio9HD89uH5p3/Ytz60Xb0VOBNYSob3otIhY3+ROWxgwdZm39EViWUO36+B4Mr9Bqv6 RyUsnnYrZ6g6ZxREMvS7qd1VB9RU4ueKQ738rA4Mx1yySEF5ltnVP8PxfST6xn4L/fvI Z9BF6iDJHxrkJYUQib8iQXKJUA4VjH+LZ5XCDTNfRMsUxch6ztOc+FjSkL3cNfCfda99 b1Rg== X-Gm-Message-State: AOAM533GuyKNZjbYrq41I1U1RzhwYOBbVx7ECvzEVFAaOogW0v2cBQTF y7eEDlMqFDiHaihf5UQLWpn2lbUD5jc= X-Google-Smtp-Source: ABdhPJzW48Aswjn3DBCKzbkvewuinWMDL9CWZaB/Tcj7JuLCo2a2hFQeiMGbfV3Xzc/R/ytiziYYlA== X-Received: by 2002:a63:101a:: with SMTP id f26mr4161408pgl.563.1644944506354; Tue, 15 Feb 2022 09:01:46 -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 16sm17650365pje.34.2022.02.15.09.01.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:01:46 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Stefan Hajnoczi , Paolo Bonzini Subject: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64 Date: Tue, 15 Feb 2022 18:01:02 +0100 Message-Id: <20220215170106.95848-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= GCC 10.1 introduced the -moutline-atomics option on Aarch64. This options is enabled by default, and triggers a link failure: Undefined symbols for architecture arm64: "___aarch64_cas1_acq_rel", referenced from: _qmp_migrate_recover in migration_migration.c.o _cpu_atomic_cmpxchgb_mmu in accel_tcg_cputlb.c.o _cpu_atomic_fetch_sminb_mmu in accel_tcg_cputlb.c.o _cpu_atomic_fetch_uminb_mmu in accel_tcg_cputlb.c.o _cpu_atomic_fetch_smaxb_mmu in accel_tcg_cputlb.c.o _cpu_atomic_fetch_umaxb_mmu in accel_tcg_cputlb.c.o _cpu_atomic_smin_fetchb_mmu in accel_tcg_cputlb.c.o ... "___aarch64_ldadd4_acq_rel", referenced from: _multifd_recv_new_channel in migration_multifd.c.o _monitor_event in monitor_hmp.c.o _handle_hmp_command in monitor_hmp.c.o _colo_compare_finalize in net_colo-compare.c.o _flatview_unref in softmmu_memory.c.o _virtio_scsi_hotunplug in hw_scsi_virtio-scsi.c.o _tcg_register_thread in tcg_tcg.c.o ... "___aarch64_swp4_acq", referenced from: _qemu_spin_lock in softmmu_cpu-timers.c.o _cpu_get_ticks in softmmu_cpu-timers.c.o _qemu_spin_lock in softmmu_icount.c.o _cpu_exec in accel_tcg_cpu-exec.c.o _page_flush_tb_1.isra.0 in accel_tcg_translate-all.c.o _page_entry_lock in accel_tcg_translate-all.c.o _do_tb_phys_invalidate in accel_tcg_translate-all.c.o ... QEMU implements its own atomic operations using C11 builtin helpers. Disable the GCC out-of-line atomic ops. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Stefan Hajnoczi Cc: Paolo Bonzini Clearly out of my understanding, but at least it links and the qtests pass. --- configure | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure b/configure index 06c03cebd3..3217aa22cb 100755 --- a/configure +++ b/configure @@ -2826,6 +2826,18 @@ else avx512f_opt="no" fi +######################################### +# Disable out-of-line atomic operations. + +case "$cpu" in + aarch64) + write_c_skeleton; + if compile_prog "$CPU_CFLAGS -Werror -mno-outline-atomics" "" ; then + CPU_CFLAGS="-mno-outline-atomics $CPU_CFLAGS" + fi + ;; +esac + ######################################## # check if __[u]int128_t is usable. From patchwork Tue Feb 15 17:01: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: 12747398 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 B47C4C433EF for ; Tue, 15 Feb 2022 17:20:07 +0000 (UTC) Received: from localhost ([::1]:41886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1Uk-0001uN-HX for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:20:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1DB-0004yv-Tl for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:01 -0500 Received: from [2607:f8b0:4864:20::1031] (port=44872 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nK1DA-0007cZ-39 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:01:57 -0500 Received: by mail-pj1-x1031.google.com with SMTP id d9-20020a17090a498900b001b8bb1d00e7so2659163pjh.3 for ; Tue, 15 Feb 2022 09:01:55 -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=Jbp3QzYSS62PQerIrzVbH5CGEQniN3jLvXj9hWTcleY=; b=eGx3OeSUTLvsyde7clvsH8AbdBu1l8asduWKRi+b81BGRkwOYlonElwtw+1S7fGcE7 njn91oDz3VMLKAyFZHDeAjqW8E/naeWAUH9nZ2em3fL0OgtDOLO9cu+JiX51vJb1kv47 XQgfv65norTnCBDkb/bjVE4ZrdeKnxX0rXam9aAOu95fPiTO58ueQ9F0aEmERVWgQMM3 OCAK1vyvb4l/sGlyms17QiuwoiFXool3WoHVDTtdmwi+AhzWWS7Uxs0EknCK+oEsit1v O2zXfS/VocT0v7SwL7NMUjT/2TO+S90bZ8+H2yVA4goIlzJlK1Ld1k0/oLFZFhD3W213 DrfA== 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=Jbp3QzYSS62PQerIrzVbH5CGEQniN3jLvXj9hWTcleY=; b=2uPeUr39Je86QEPXcOVcTGkPUSec7qzVcHI2keE8MkxoS13AZNl5pfJ8ScmepC19hy CYhdEo00WNdYmuavmnCS0OwfujBgLFPV6OaLZVpA91+7YNztgjw+ueAozFGWdzqJ4dgK pVOzb3WUN4J6XuFJTMLwsmv/PKYwHevHpzSPml/Dmeuez2fP4bXSDnF8TEeEsnMhe1Rc 6C2Ve/0NARvfzH5fw188PZXit4342bseqoQpikUN6FxTcNgl9fVTghM8u08gDUcC/JFT WSmMaiMzoNjqD7AThDIPeD8e7WXPUOeCeG6qPUdbwA+mPjsIngmgx8WN/IcQtLs1dOa+ 6iJg== X-Gm-Message-State: AOAM532jvWUiDsL/jlOIDp+oECWDf1JliTc7YnW08Ueg/4z6B7s1ab6I FfWQITiZCk2MlhTr2avAwV7VuxUTcFg= X-Google-Smtp-Source: ABdhPJxFPY/nlM8KiroGPEgIav61AH8FFLL/wUdd1yzVriWArXNj+DLJ5ZdO6jCx5KYwt8MJujYOzA== X-Received: by 2002:a17:90b:4b88:b0:1b8:ca46:472 with SMTP id lr8-20020a17090b4b8800b001b8ca460472mr5494583pjb.0.1644944514503; Tue, 15 Feb 2022 09:01:54 -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 d2sm2829503pgw.62.2022.02.15.09.01.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:01:54 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 5/8] meson: Log QEMU_CXXFLAGS content in summary Date: Tue, 15 Feb 2022 18:01:03 +0100 Message-Id: <20220215170106.95848-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1031 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 287be51ff2..215c253683 100644 --- a/meson.build +++ b/meson.build @@ -3305,6 +3305,7 @@ if link_args.length() > 0 summary_info += {'LDFLAGS': ' '.join(link_args)} endif summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} +summary_info += {'QEMU_CXXFLAGS': config_host['QEMU_CXXFLAGS']} summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')} summary_info += {'link-time optimization (LTO)': get_option('b_lto')} From patchwork Tue Feb 15 17:01: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: 12747400 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 9B51AC433F5 for ; Tue, 15 Feb 2022 17:22:51 +0000 (UTC) Received: from localhost ([::1]:51846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1XO-0007CS-Fv for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:22:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1Df-0005BH-Se for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:27 -0500 Received: from [2607:f8b0:4864:20::42a] (port=46699 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 1nK1DI-0007dF-90 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:06 -0500 Received: by mail-pf1-x42a.google.com with SMTP id i21so34406029pfd.13 for ; Tue, 15 Feb 2022 09:02: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=d9EkieBgrdhrogN9sKmZK/XJut6BqlFTxcRvby4ZjyU=; b=TGFfi68L5SZtHzrVv1gO5oBUagh2KV99/vOKqhOICJrg/5rXMY1G59t30CxnoVYOhR r6UOsL4VSofNgPaAALegSo3A4xeCg0ArKU4vg+hgOx28NKgnXTF1WkMxJV5XPPVOwSWj n+ls7Q1K8jkqC8F99fQYkuVyBc5gb6caiEnz2b/JSgHH0NdzstTS4MwzrsEwEL/RrGZU uCGJD31K7igEYvvwHjWZ0+vmqjOBqMyuVfbPMCc5fx6r2gAy6qk8xOQg/kWzhrvFC+Lp MnAD/RJc3T7yynNB2Fk0KY4tMaO/so5J6rely+3s8jhMf7Ik6L70ee7Q4kqeOOcGyUDM LshQ== 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=d9EkieBgrdhrogN9sKmZK/XJut6BqlFTxcRvby4ZjyU=; b=IWTaIR1Z2cpSGHTscS+yaZD4Fp2gINWXOmvBL3860wRQ9Ia/tMKcH71Y9bahjfKN7W Zdb5EnyxAtP4SPLG0O2b8/ww7zfv+LeQlEdCXAMRQoN1rYUMfSXZma4sUMEJGhNAAxcE Ymp/M0n/XJaYXTRyXU6Oz3CIma0Om0Yt1ZCvJM/RtGjCQTZZQxoSYCxamojjoz5sl0CO eK8IWkV+SgBPHLHGa5xdIOR9/sVqS8oM2C6nzyTuxDIcy1lP1dRyaCzjilxptVH9edKd hIlsaPyglFH91AQS9XVT4tctGdFVb8CKg9PGI+a4ZVF+f7nGoSM8qIHUh5p3JigVOrW2 DMmA== X-Gm-Message-State: AOAM531SiJnxcF0LjV1vOeqPrdLwo2eFFwxAf3VHD+BPcFgnDFmktkw8 WhkMqXG7TWWc5p3Nd3ze9Wirp3A0+FM= X-Google-Smtp-Source: ABdhPJxRhlB9zkoOqUosufYahttHeGq+GIRf0w2qn5YuX//J6HyfgdYtoB5bvXa2c/yzDJLmApPDLQ== X-Received: by 2002:a62:6141:: with SMTP id v62mr5299932pfb.61.1644944522807; Tue, 15 Feb 2022 09:02: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 o8sm42022231pfu.52.2022.02.15.09.02.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:02:02 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 6/8] configure: Pass filtered QEMU_OBJCFLAGS to meson Date: Tue, 15 Feb 2022 18:01:04 +0100 Message-Id: <20220215170106.95848-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Filter unsupported Objective-C options, to avoid 'unknown-warning-option' warnings when using Clang: [34/373] Compiling Objective-C object libcommon.fa.p/audio_coreaudio.m.o warning: unknown warning option '-Wold-style-declaration'; did you mean '-Wout-of-line-declaration'? [-Wunknown-warning-option] warning: unknown warning option '-Wimplicit-fallthrough=2'; did you mean '-Wimplicit-fallthrough'? [-Wunknown-warning-option] 2 warnings generated. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Paolo Bonzini --- configure | 23 +++++++++++++++++++++++ meson.build | 5 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3217aa22cb..df6eaec067 100755 --- a/configure +++ b/configure @@ -77,6 +77,7 @@ TMPB="qemu-conf" TMPC="${TMPDIR1}/${TMPB}.c" TMPO="${TMPDIR1}/${TMPB}.o" TMPCXX="${TMPDIR1}/${TMPB}.cxx" +TMPM="${TMPDIR1}/${TMPB}.m" TMPE="${TMPDIR1}/${TMPB}.exe" rm -f config.log @@ -148,6 +149,10 @@ do_cxx() { do_compiler "$cxx" $CPU_CFLAGS "$@" } +do_objc() { + do_compiler "$objcc" $CPU_CFLAGS "$@" +} + # Append $2 to the variable named $1, with space separation add_to() { eval $1=\${$1:+\"\$$1 \"}\$2 @@ -1616,10 +1621,27 @@ cc_has_warning_flag() { compile_prog "-Werror $optflag" "" } +objcc_has_warning_flag() { + cat > $TMPM <> $config_host_mak echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak +echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=$glib_libs" >> $config_host_mak echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >> $config_host_mak diff --git a/meson.build b/meson.build index 215c253683..7b78235a39 100644 --- a/meson.build +++ b/meson.build @@ -199,9 +199,11 @@ if get_option('fuzzing') endif add_global_arguments(config_host['QEMU_CFLAGS'].split(), - native: false, language: ['c', 'objc']) + native: false, language: ['c']) add_global_arguments(config_host['QEMU_CXXFLAGS'].split(), native: false, language: 'cpp') +add_global_arguments(config_host['QEMU_OBJCFLAGS'].split(), + native: false, language: ['objc']) add_global_link_arguments(config_host['QEMU_LDFLAGS'].split(), native: false, language: ['c', 'cpp', 'objc']) @@ -3306,6 +3308,7 @@ if link_args.length() > 0 endif summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} summary_info += {'QEMU_CXXFLAGS': config_host['QEMU_CXXFLAGS']} +summary_info += {'QEMU_OBJCFLAGS': config_host['QEMU_OBJCFLAGS']} summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')} summary_info += {'link-time optimization (LTO)': get_option('b_lto')} From patchwork Tue Feb 15 17:01: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: 12747408 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 4EB1AC433EF for ; Tue, 15 Feb 2022 17:25:22 +0000 (UTC) Received: from localhost ([::1]:59068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1Zp-00033u-7A for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:25:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1Dl-0005Qt-QV for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:33 -0500 Received: from [2607:f8b0:4864:20::1035] (port=54127 helo=mail-pj1-x1035.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nK1Df-0007dY-E2 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:33 -0500 Received: by mail-pj1-x1035.google.com with SMTP id qe15so17868399pjb.3 for ; Tue, 15 Feb 2022 09:02: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=46tJNgDrPM5EFNh7g7s13ib1x2S4JqFzyqo/eqTahYk=; b=NBKpSJcvakS+Xq2bqNJdKoAVrDoj3ebC9DmRj7otc2A1h10o78ZdJwz894ScCV3S8A Pl4eTw/+PUeRSdptsGwf+LyPNUY12Njmsf8CryyFAH7jie3QV4wmpQHGHbB6YqCEy0mG 6v4DjlObFF+sCktimZHkuL/ygCe7Q670NguMQTPTw8IrXjHD9woHmLoipBnKwVivjFMd k+evUfhikD6bTSgYBDfvoyNQIMh1PodDaRt3ABc9nYSKQy+d6Qk9PfII/pISHIcVPcGI EaB2SgEdgmqdAii5pjCUI7dC5OdLf2zIdyG5nlCds0qDqqLCgQRbyuIUeOJerSw0wwE5 oC+g== 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=46tJNgDrPM5EFNh7g7s13ib1x2S4JqFzyqo/eqTahYk=; b=lFJwPVSofTTX/FkyKrdmoTjeqs9nbprt0nguw45rxOpugTsc8zaNzxpX9bZ3eWkG5T 7hYp2masYJPgbOZUa9TX43W4wOavx/vkmklE3A0XRLdD2q/Z3e0nu035JvaEj2CDDuNP HRlH2kTPzCcXTZ/g92DfFJMLk8C3ra7bKPYwcLjqZBUYE+aIb1xLD5ONMN2ae/59dbRs 0oJByYIux8r0KExv7hhekDlbMeHfh23bBJWUKNNwqgVqrkXUE/29v1BvMihb2UUuQrth nun1D5xPi062pVLws82cKYO7Sd4bQKy4s/Nx13ZFi8GHWkc0RA8ablTKSBxy+yFjwIoD Vr8w== X-Gm-Message-State: AOAM532/FLBr6gCCW6u20t2hvANsQAF7thDtwP+NxDG5eSDPunw1cEiL Don9Qf19O20ME3aGhrQFAS7E2NzazGA= X-Google-Smtp-Source: ABdhPJxEzOqD45SikyyL8RyRIdW5Icw8vsjy14iQOlar9HOHevn1JXV7mAWWUuPn1mrmxK0KKRXUcw== X-Received: by 2002:a17:902:7887:: with SMTP id q7mr5194741pll.105.1644944530981; Tue, 15 Feb 2022 09:02: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 o7sm3179601pfw.114.2022.02.15.09.02.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:02:10 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 7/8] audio: Rename coreaudio extension to use Objective-C compiler Date: Tue, 15 Feb 2022 18:01:05 +0100 Message-Id: <20220215170106.95848-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1035 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= The coreaudio library includes Objective-C declarations (using the caret '^' symbol to declare block references [*]). When building with a C compiler we get: [175/839] Compiling C object libcommon.fa.p/audio_coreaudio.c.o In file included from /Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h:18, from ../../audio/coreaudio.c:26: /Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/System/Library/Frameworks/CoreAudio.framework/Headers/AudioHardware.h:162:2: error: expected identifier or '(' before '^' token 162 | (^AudioObjectPropertyListenerBlock)( UInt32 inNumberAddresses, | ^ FAILED: libcommon.fa.p/audio_coreaudio.c.o Rename the file to use the Objective-C default extension (.m) so meson calls the correct compiler. [*] https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC/WorkingwithBlocks/WorkingwithBlocks.html Reviewed-by: Christian Schoenebeck Signed-off-by: Philippe Mathieu-Daudé --- audio/{coreaudio.c => coreaudio.m} | 0 audio/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename audio/{coreaudio.c => coreaudio.m} (100%) diff --git a/audio/coreaudio.c b/audio/coreaudio.m similarity index 100% rename from audio/coreaudio.c rename to audio/coreaudio.m diff --git a/audio/meson.build b/audio/meson.build index d9b295514f..94dab16891 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -7,7 +7,7 @@ softmmu_ss.add(files( 'wavcapture.c', )) -softmmu_ss.add(when: coreaudio, if_true: files('coreaudio.c')) +softmmu_ss.add(when: coreaudio, if_true: files('coreaudio.m')) softmmu_ss.add(when: dsound, if_true: files('dsoundaudio.c', 'audio_win_int.c')) audio_modules = {} From patchwork Tue Feb 15 17:01:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12747366 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 86AADC433FE for ; Tue, 15 Feb 2022 17:11:02 +0000 (UTC) Received: from localhost ([::1]:54958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nK1Lx-0000Mo-45 for qemu-devel@archiver.kernel.org; Tue, 15 Feb 2022 12:11:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nK1Di-0005IZ-U6 for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:30 -0500 Received: from [2607:f8b0:4864:20::42c] (port=45772 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 1nK1Df-0007dk-Ee for qemu-devel@nongnu.org; Tue, 15 Feb 2022 12:02:30 -0500 Received: by mail-pf1-x42c.google.com with SMTP id u16so1841548pfg.12 for ; Tue, 15 Feb 2022 09:02:20 -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=UaffjyQzW8BQImKvqf4HcLMN4oFMJh8sNvsUJPU7qMA=; b=Acisb5EpBPn3L4Iu840o/J9A+04gGYsNt3ueQz4k1SU88EhTu4UTLnhCxIHRdjX3Qc arr3QZeOH2mSIlmbWSUSpAiCuWyHJuL0/NHOIfy+APT8fWJb+XQtuIvy7PGELtiv/usy 7GLC9MNVo9origH3sHfjRYAGNGQWw+/s+XuIQdCcCDsaKRYdlbeI7vGIenvxyK4D62ig hnTVQOArwvp8LKVtp+0pEQc+GvU5/c0hR75AI3nJB+CrPTer4Ai/+zDxNSXNhF+V8iE0 2g0i+MfJ7VHe/L6FTGtRE5760iPtGC+k4Y3F4FNza2EAyYTz+MKz2Vnx1N9bNZhcxCAK oodQ== 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=UaffjyQzW8BQImKvqf4HcLMN4oFMJh8sNvsUJPU7qMA=; b=2BK9Bl9HenUyHFofvDfAR0F/LvYJhO60oWekPNGlTQsRadkWhoUtDlIm53fKT6Nk/c 5Hmbx9hQ/98dgpbBicbQfu5LnDE/YHyzoS5JHxi64PfADFZEZkvSMySGoTItb2/ze9S/ WzcMM+J3qj5RDLZYxBbpof7fOttrbYHECc9TM58Z8YVu/0ZymzamWcxlLe9TDQG1Bco+ 4TVsY2ikpPkqc0IYH2IvQZPPq5ZrrYDWWiw/XlFaO1sHKCGjXdUhcz25/fnoK92fLj3U hRQVZBdZbrq6S/NFl3u57n5iYFTAuRbw5WA+MRlKVQB57DPQdfyySpbdTUnWHgUfnX9e NDkw== X-Gm-Message-State: AOAM533fvqrI9V3Sp/WySjQSeQLNreJqgI5x8lxJ6nr1l7q+r60hJmn0 byhInnYIlyK9IJeg4EDw0bIEgVJQT7o= X-Google-Smtp-Source: ABdhPJzDIbrzQt4CGm03xU7qOxL/ugE6dgfX4o+TGpLq8shnpI7E1Nyp7cXboDi8yLYqivLOUnXqSQ== X-Received: by 2002:a63:9553:: with SMTP id t19mr4206080pgn.495.1644944539206; Tue, 15 Feb 2022 09:02:19 -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 lb18sm15680758pjb.42.2022.02.15.09.02.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Feb 2022 09:02:18 -0800 (PST) To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Peter Maydell , Christian Schoenebeck , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 8/8] ui/cocoa: Constify qkeycode translation arrays Date: Tue, 15 Feb 2022 18:01:06 +0100 Message-Id: <20220215170106.95848-9-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215170106.95848-1-f4bug@amsat.org> References: <20220215170106.95848-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: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.904, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- ui/cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 30702d31a5..7a3a610212 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -651,7 +651,7 @@ QemuCocoaView *cocoaView; /* translates Macintosh keycodes to QEMU's keysym */ - int without_control_translation[] = { + static const int without_control_translation[] = { [0 ... 0xff] = 0, // invalid key [kVK_UpArrow] = QEMU_KEY_UP, @@ -666,7 +666,7 @@ QemuCocoaView *cocoaView; [kVK_Delete] = QEMU_KEY_BACKSPACE, }; - int with_control_translation[] = { + static const int with_control_translation[] = { [0 ... 0xff] = 0, // invalid key [kVK_UpArrow] = QEMU_KEY_CTRL_UP,