From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598976146; cv=none; d=zohomail.com; s=zohoarc; b=MrlLgcrKHSMG51mRhM7ObPQPlNRTs3y8T+nYSLcBBJZ/HqFICxgzIUQQWn5snwsScyDkbmEtKYjf8SrQ7LOsMeucJodjBcw4y2HyWbIzPIPYKKp9R2QaW/6oPTNri4chH76qlwmy31CaNL32zk34XNx+NsMJtwyCe5yI0OAnn9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598976146; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vr9JKiFkYHddlOXTHhjVb/SVP9gNMO8JYk290bn7LfY=; b=iQV/aJVxJ3Sa63toEU8uDmSr6bBPmB3y3xgZHwrYV2gSjYFx1NxyQ+kFEfisyDvLp821z+T7Ls7u9EzzW/bEx8Q765PWS+4+p3XnZPw3DNSReTb7b3/Y+xzWEjWglXtSgNFCS0sed0tseTzju06552ywCtxCV9NthHvW2T6LywA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159897614646441.30162424403238; Tue, 1 Sep 2020 09:02:26 -0700 (PDT) Received: from localhost ([::1]:55748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8Hh-00034n-5v for importer@patchew.org; Tue, 01 Sep 2020 11:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD860-0005QU-SP for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD85y-0006hi-3H for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:16 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-EwtYgrGrOcO7mpIuSLc2Mg-1; Tue, 01 Sep 2020 11:20:58 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 559DC8030A4; Tue, 1 Sep 2020 15:20:56 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18E965D9CC; Tue, 1 Sep 2020 15:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vr9JKiFkYHddlOXTHhjVb/SVP9gNMO8JYk290bn7LfY=; b=HQZ4nrxJSJGSu/Bf/ZE0YlsP8NjKkSyZoEXNaXzKNG7QGSErQKAgWXADbDMqWTg7NB5NBF /6O4xdt+pyzLbhvDitdU+sdIlhLi7tESObVH6urY0iZoGm25YfsyBGeK2ZqsvrJ8hp0XeI XBOHJt87ns3cdPx88dIfYKsnt2F69M4= X-MC-Unique: EwtYgrGrOcO7mpIuSLc2Mg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 1/8] configure: Fix atomic64 test for --enable-werror on macOS Date: Tue, 1 Sep 2020 17:20:43 +0200 Message-Id: <20200901152050.255165-2-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) When using --enable-werror for the macOS builders in the Cirrus-CI, the atomic64 test is currently failing, and config.log shows a bunch of error messages like this: config-temp/qemu-conf.c:6:7: error: implicit declaration of function '__atomic_load_8' is invalid in C99 [-Werror,-Wimplicit-function-declarati= on] y =3D __atomic_load_8(&x, 0); ^ config-temp/qemu-conf.c:6:7: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] Seems like these __atomic_*_8 functions are available in one of the libraries there, so that the test links and passes there when not using --enable-werror. But there does not seem to be a valid prototype for them in any of the header files, so that the test fails when using --enable-werror. Fix it by using the "official" built-in functions instead (see e.g. https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html). We are not using the *_8 variants in QEMU anyway. Suggested-by: Christian Schoenebeck Reviewed-by: Christian Schoenebeck Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Message-Id: <20200728074405.13118-2-thuth@redhat.com> Signed-off-by: Thomas Huth --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 8dc981684b..59b7310e15 100755 --- a/configure +++ b/configure @@ -5780,11 +5780,11 @@ int main(void) { uint64_t x =3D 0, y =3D 0; #ifdef __ATOMIC_RELAXED - y =3D __atomic_load_8(&x, 0); - __atomic_store_8(&x, y, 0); - __atomic_compare_exchange_8(&x, &y, x, 0, 0, 0); - __atomic_exchange_8(&x, y, 0); - __atomic_fetch_add_8(&x, y, 0); + y =3D __atomic_load_n(&x, __ATOMIC_RELAXED); + __atomic_store_n(&x, y, __ATOMIC_RELAXED); + __atomic_compare_exchange_n(&x, &y, x, 0, __ATOMIC_RELAXED, __ATOMIC_REL= AXED); + __atomic_exchange_n(&x, y, __ATOMIC_RELAXED); + __atomic_fetch_add(&x, y, __ATOMIC_RELAXED); #else typedef char is_host64[sizeof(void *) >=3D sizeof(uint64_t) ? 1 : -1]; __sync_lock_test_and_set(&x, y); --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598975957; cv=none; d=zohomail.com; s=zohoarc; b=iIdF2Vgcb1bgkx/0t7y8CqiBPCVJH7VCkNCddF9BSmx59HO4/2e2lt4QRdo2yTRCOhT+vEGylZtOgCPQJMOl9EcbYZrPRQz5eRbUwe+TLWTyFbuE+15FCe0GHH1uWPMoL9WGZTmNom9AEy4ZHX9/vKHunHwXEwc1wXr/wBuaXXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598975957; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1iWKkD/kOYwcJQ6cPEeOyaATFCRiKhCl3ivuA3VsdK0=; b=WNfG3RzyzDqabTH23bcOkXgQW/XniEEqROLDOhR5dV2g0jXndhFbXVktAX4T2N8ne9sSkHCFyDnNRb7IIv0+uqSFGFqPfzU6KYWvpo3mrVLHcUDMaxODhqDx+oWrrwyblDBuABpIALHPCVwbQML0oNWyW99Wt/pzOMRReIXTqdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159897595770068.65698176953254; Tue, 1 Sep 2020 08:59:17 -0700 (PDT) Received: from localhost ([::1]:46536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8gm-0004bi-IF for importer@patchew.org; Tue, 01 Sep 2020 11:59:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD85p-0004v1-R7 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23618 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD85n-0006fg-Tc for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-106-q6Cb8o4tPuKAN58q1zr1EA-1; Tue, 01 Sep 2020 11:20:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE0F8801ABD; Tue, 1 Sep 2020 15:20:57 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4DB45D9CC; Tue, 1 Sep 2020 15:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1iWKkD/kOYwcJQ6cPEeOyaATFCRiKhCl3ivuA3VsdK0=; b=g5OajFydk9w9EIVR6vvse+GH+VgPQYUOZS6IINrvsIvd0r9/NV0HKqjhNQXI4ie227UGFF mW4bOWCmBI67iI9nftD6fSiloSICgHcYffXHNHnrVpFZooH3oEaqDjn5d1uv0uX3fNajOZ SbxG5qBFtapKHxTo7AH1ylCqJ29t2y8= X-MC-Unique: q6Cb8o4tPuKAN58q1zr1EA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 2/8] cirrus.yml: Compile FreeBSD with -Werror Date: Tue, 1 Sep 2020 17:20:44 +0200 Message-Id: <20200901152050.255165-3-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Compiler warnings currently go unnoticed in our FreeBSD builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too. Reviewed-by: Ed Maste Message-Id: <20200728074405.13118-3-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f287d23c5b..b50da72eec 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,7 +12,7 @@ freebsd_12_task: script: - mkdir build - cd build - - ../configure || { cat config.log; exit 1; } + - ../configure --enable-werror || { cat config.log; exit 1; } - gmake -j8 - gmake V=3D1 check =20 --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598975411; cv=none; d=zohomail.com; s=zohoarc; b=CM3e1jHNBg7BFn/uMt8qadEWaD1ND9fetPuQw8D74MiU2/O+XG0CLN0GutLYd5rXSMw4GCJi9NSEiin0W7NVwX/wR1wgrK5i7LwtRwnW1iWCzjbyK2ICSxu7QdBE+98Kd07TwhiBC3sD14gkqFXduCQw+/NkwwDb0FlNlpcBwjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598975411; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bWa5r75nzfu7Drt1Kz0Py3AuyX82j4YBffnwWzasHI0=; b=ZBdHjty/mFo3SSNH6bXfp5s9NCRGhZU8sOiV/bCNaeN85CZhO/bsrH5ZebZ5YtSDm/p6WDGu1fulHUzHlEygDOPa8sFo0tDC1eT8ReG4YYeCMIscftiJdLCu8Z4SOlAvhwXsQaXkyYy5pAnuVOhQn/Wej5FL5sQXR6KBBYVu9Y8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598975411414987.1379535115476; Tue, 1 Sep 2020 08:50:11 -0700 (PDT) Received: from localhost ([::1]:47944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8St-0006Wc-55 for importer@patchew.org; Tue, 01 Sep 2020 11:44:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD85p-0004ux-9X for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54172 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD85n-0006fk-KZ for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-315-bMLwn7zvPdWlvvDMoC4S-Q-1; Tue, 01 Sep 2020 11:21:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 990DD10ABDAA; Tue, 1 Sep 2020 15:20:59 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C9FF5D9CC; Tue, 1 Sep 2020 15:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bWa5r75nzfu7Drt1Kz0Py3AuyX82j4YBffnwWzasHI0=; b=eg8qrJu2yOmWdYbJPEfCj6vPtSggd9Qn+sleGXHChgfdnd8jQPDUB5zMr0v/Y1ipV0k9Nq BSRG+mINeAmSVJcJloU5Bl7YR1fjjUrsHOGrW7Kuq0hDXe5rALe9NJSOQ+hSiL4MzSnXNn 6PnMYcMAXCP6gG1TM/W+jiBEH3j9+B0= X-MC-Unique: bMLwn7zvPdWlvvDMoC4S-Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 3/8] cirrus.yml: Compile macOS with -Werror Date: Tue, 1 Sep 2020 17:20:45 +0200 Message-Id: <20200901152050.255165-4-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Compiler warnings currently go unnoticed in our macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too. Unfortunately, the sasl header is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings. Thus we have to also use -Wno-error=3Ddeprecated-declarations to be able to compile the code here. Message-Id: <20200728074405.13118-4-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .cirrus.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index b50da72eec..86a059c12f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,7 +24,9 @@ macos_task: script: - mkdir build - cd build - - ../configure --python=3D/usr/local/bin/python3 || { cat config.log; = exit 1; } + - ../configure --python=3D/usr/local/bin/python3 --enable-werror + --extra-cflags=3D'-Wno-error=3Ddeprecated-declarations' + || { cat config.log; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake check =20 @@ -37,6 +39,7 @@ macos_xcode_task: script: - mkdir build - cd build - - ../configure --cc=3Dclang || { cat config.log; exit 1; } + - ../configure --extra-cflags=3D'-Wno-error=3Ddeprecated-declarations' + --enable-werror --cc=3Dclang || { cat config.log; exit = 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake check --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598976045; cv=none; d=zohomail.com; s=zohoarc; b=LuHmTv6xIgZCcq7MAXhCZ6zuif0VCMADQBPmGRyD9uUfW9QRwA69gf2Wq9U/JnsaKOpNrABrBBh6GgbFYy7BGdiHUAY+l9UuQ3BGWbfnnOzMG6lyD9+jozLkgKhKwwXOqxoOdv25O+YzWZxhPLJHUtl3Qy8A4maRdgw1vnwuPGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598976045; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JPtQeWytbjl1rsTUENn1hvUpy54W+h30e9o+Yrx427o=; b=jdmyiFgT6zHxaSCPidQAVx4F9fwBWAIH40CwidYGKFgitk2CXU8UrKaaRHQimCead+qLW4oC2txovvlr+p8p7ulT7OWTsFMHB/rS82YYbRHeN0X/KUVe4C0VHiAtlpMMi7qMiT5TA7i9fNoaX0Fq5V688p6+u86DEQyx7A8FrCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598976045310160.5671012369544; Tue, 1 Sep 2020 09:00:45 -0700 (PDT) Received: from localhost ([::1]:48864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8iB-0005co-Mo for importer@patchew.org; Tue, 01 Sep 2020 12:00:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD866-0005ga-Vm for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45747 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD865-0006je-9R for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-92-diZC5YhrPhClLyTcSINCYQ-1; Tue, 01 Sep 2020 11:21:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41274107B270; Tue, 1 Sep 2020 15:21:01 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 044A25D9CC; Tue, 1 Sep 2020 15:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JPtQeWytbjl1rsTUENn1hvUpy54W+h30e9o+Yrx427o=; b=dZ2Ekkvs2AaWT7a36qVMSWJ9aziichI5oGxZVJZrLOkSZ3/e1gnlp6EfUhwpy0rFEAVPxG m/ITRu8W7Y3TOefb1A1YAmg8ElqwzbqdHEdAutqlDYn0AePeROz9RSfJkH554Q4m5OpM/j WRLkMfVHhyzlU4R40EBIHV4Fan0SYpU= X-MC-Unique: diZC5YhrPhClLyTcSINCYQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 4/8] cirrus.yml: Update the macOS jobs to Catalina Date: Tue, 1 Sep 2020 17:20:46 +0200 Message-Id: <20200901152050.255165-5-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 10:16:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) When looking at the CI jobs on cirrus-ci.com, it seems like the mojave-based images have been decomissioned a while ago already, since apparently all our jobs get automatically upgraded to catalina. So let's update our YML script accordingly to avoid confusion. Reviewed-by: Ed Maste Message-Id: <20200728074405.13118-5-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 86a059c12f..0742aaf8a3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -18,7 +18,7 @@ freebsd_12_task: =20 macos_task: osx_instance: - image: mojave-base + image: catalina-base install_script: - brew install pkg-config python gnu-sed glib pixman make sdl2 bash script: @@ -33,7 +33,7 @@ macos_task: macos_xcode_task: osx_instance: # this is an alias for the latest Xcode - image: mojave-xcode + image: catalina-xcode install_script: - brew install pkg-config gnu-sed glib pixman make sdl2 bash script: --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598974308; cv=none; d=zohomail.com; s=zohoarc; b=ajBIrHhYqDr3ZJjbaHKkd/7vr8r31C2bJlOLop3uVls/sMcrcGgnumlAzuT6S4X1KA+R8KiKJ3yUaMaJh9U4K11j8j1Dumrmz0uZjc/EwE4bhdTd5pfvA8d99oonOVADcSx7ZD+10o0AhdIbbX2GLmQKdRqKd7ezR03GNHgNc9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598974308; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4T/dQATnRq/UbP0+yjfKccgYYk0yU7sz2Ycyc9owkWQ=; b=fr/wY155FGVXJX9ZP4rC5dF6I7u+buOK8120OV8LPbxBcM21p/M582JYGCgI74IIKx7YxUMrHctGy4mwBqXoGy1fnhvHCd+MLpw3cTWUlqv7hqf6pkxxf+ms7UVcS8G1ae+zRdXpSM4kGIhhVpcZeieUvz6Fxdb8xuMeHHmtsDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159897430876443.20576128755181; Tue, 1 Sep 2020 08:31:48 -0700 (PDT) Received: from localhost ([::1]:47426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8GB-0007x5-QW for importer@patchew.org; Tue, 01 Sep 2020 11:31:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD85w-0005DC-66 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD85u-0006gK-1R for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-sbaR27vIPqWoiqybA36XCw-1; Tue, 01 Sep 2020 11:21:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCC90802B49; Tue, 1 Sep 2020 15:21:02 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id A02925D9CC; Tue, 1 Sep 2020 15:21:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4T/dQATnRq/UbP0+yjfKccgYYk0yU7sz2Ycyc9owkWQ=; b=JNO60mZtl35jAmK+JmzSG5aZjDZRMh+GDqFPusVOI3gX5x+7pZ1etxsCdKLODPIDHMQJAt yn9nPoitri335VUsS/+qz0Y+VmmmxdsirkKRXKNQ/3VORlsDb5OyPrhc3GjgQ7+Gfihfdj FvPoCBtiaejAHuYxIZbP0w1uGnvU8s4= X-MC-Unique: sbaR27vIPqWoiqybA36XCw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 5/8] cirrus.yml: Split FreeBSD job into two parts Date: Tue, 1 Sep 2020 17:20:47 +0200 Message-Id: <20200901152050.255165-6-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) The FreeBSD jobs currently hit the 1h time limit in the Cirrus-CI. We have to split the build targets here to make sure that the job finishes in time again. According to the Cirrus-CI docs and some tests that I did, it also seems like the total amount of CPUs that can be used for FreeBSD jobs is limited to 8, so each job now only gets 4 CPUs. That increases the compilation time of each job a little bit, but it still seems to be better to run two jobs with 4 CPUs each in parallel than to run two jobs with 8 CPUs sequentially. Message-Id: <20200831154405.229706-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .cirrus.yml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0742aaf8a3..3dd9fcff7f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,20 +1,40 @@ env: CIRRUS_CLONE_DEPTH: 1 =20 -freebsd_12_task: +freebsd_1st_task: freebsd_instance: image_family: freebsd-12-1 - cpu: 8 - memory: 8G + cpu: 4 + memory: 4G install_script: ASSUME_ALWAYS_YES=3Dyes pkg bootstrap -f ; pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed nettle perl5 pixman pkgconf png usbredir script: - mkdir build - cd build - - ../configure --enable-werror || { cat config.log; exit 1; } - - gmake -j8 - - gmake V=3D1 check + - ../configure --disable-user --target-list-exclude=3D'alpha-softmmu + ppc64-softmmu ppc-softmmu riscv32-softmmu riscv64-softmmu s390x-so= ftmmu + sparc64-softmmu sparc-softmmu x86_64-softmmu i386-softmmu' + --enable-werror || { cat config.log; exit 1; } + - gmake -j$(sysctl -n hw.ncpu) + - gmake -j$(sysctl -n hw.ncpu) check + +freebsd_2nd_task: + freebsd_instance: + image_family: freebsd-12-1 + cpu: 4 + memory: 4G + install_script: ASSUME_ALWAYS_YES=3Dyes pkg bootstrap -f ; pkg install -y + bash curl cyrus-sasl git glib gmake gnutls gtk3 gsed libepoxy mesa-libs + nettle perl5 pixman pkgconf png SDL2 usbredir + script: + - ./configure --enable-werror --target-list=3D'alpha-softmmu ppc64-sof= tmmu + ppc-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu + sparc64-softmmu sparc-softmmu x86_64-softmmu i386-softmmu + sparc-bsd-user sparc64-bsd-user x86_64-bsd-user i386-bsd-user' + || { cat config.log; exit 1; } + - gmake -j$(sysctl -n hw.ncpu) + - gmake -j$(sysctl -n hw.ncpu) check =20 macos_task: osx_instance: --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598976098; cv=none; d=zohomail.com; s=zohoarc; b=myCQwZwZ+lo4snyRxQoZsynLNsyhrHJsRjc56Imw5F21lXZ2nJpKKHPRYYHAc9O4pcj7EPIQkrhidX5E6PZ4dl2FkK/f9+Q0QbqadPHzqSTlIrZfwgzqk578Rkb88R7spuF0fC7tDhxf76oSQRsJsfxugAlKZA6KAcUW/zYrt0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598976098; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wIU+Gjr/wlaKraNDq73BuROkbWVgOHLIVHsn0y4wpwE=; b=BUe0cSvL5KQOU9lv2XMchnt5pW1cwCCNbB7GGzIH+dZAtRM4f5HC07p2tMJ3NZ+q0OxwOshnYF7NNFFcMtHfzP04KKaCt8gCD+zB15lnkUliZRw5HEuec5c/aDlu9cHUPiThFEuNVg92pewINRmhSrxJ3xAIAhxD3z7VkpKvWNQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598976098133874.2625216065837; Tue, 1 Sep 2020 09:01:38 -0700 (PDT) Received: from localhost ([::1]:52720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8UX-0000Ak-SA for importer@patchew.org; Tue, 01 Sep 2020 11:46:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD85u-00057o-A3 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:47454 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD85s-0006gD-Ei for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-529-xz8jqJtkMjuc2gE1ZG0OfA-1; Tue, 01 Sep 2020 11:21:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 851D7107B270; Tue, 1 Sep 2020 15:21:04 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4ABF95D9CC; Tue, 1 Sep 2020 15:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=wIU+Gjr/wlaKraNDq73BuROkbWVgOHLIVHsn0y4wpwE=; b=PmAs99JWjMsYbKa8c664afZCSOU06BgRK0VQTO5PYHpVtOyQ+61y7KB023MbYtqgSVmcZA +u75B+zfcLr6MY4ET/f26//fc/i3Ye36a8SfXY+AtIAZYlutkI1ukLAiSPnTzWfyDBaSJm 8VQjLPXLQEbKTdKQJ/TP2iXxsgwJ7Zo= X-MC-Unique: xz8jqJtkMjuc2gE1ZG0OfA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 6/8] meson: fix keymaps without qemu-keymap Date: Tue, 1 Sep 2020 17:20:48 +0200 Message-Id: <20200901152050.255165-7-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann In case the qemu-keymap tool generating them is neither installed on the system nor built from sources (due to xkbcommon not being available) qemu will not find the keymaps when started directly from the build tree, This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink") removed the symlink to the source tree, and the special handling for install doesn't help in case we do not install qemu. Lets fix that by simply copying over the file from the source tree as fallback. Reported-by: Thomas Huth Signed-off-by: Gerd Hoffmann Message-Id: <20200827102617.14448-1-kraxel@redhat.com> Signed-off-by: Thomas Huth --- pc-bios/keymaps/meson.build | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c82230..e102dd56b4 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -38,19 +38,29 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in = config_host else native_qemu_keymap =3D qemu_keymap endif + t =3D [] foreach km, args: keymaps - t +=3D custom_target(km, - build_by_default: true, - output: km, - command: [native_qemu_keymap, '-f', '@OUTPUT@', args.= split()], - install_dir: config_host['qemu_datadir'] / 'keymaps') + if native_qemu_keymap.found() + # generate with qemu-kvm + t +=3D custom_target(km, + build_by_default: true, + output: km, + command: [native_qemu_keymap, '-f', '@OUTPUT@', arg= s.split()], + install_dir: config_host['qemu_datadir'] / 'keymaps= ') + else + # copy from source tree + t +=3D custom_target(km, + build_by_default: true, + input: km, + output: km, + command: ['cp', '@INPUT@', '@OUTPUT@'], + install_dir: config_host['qemu_datadir'] / 'keymaps= ') + endif endforeach -if t.length() > 0 + +if native_qemu_keymap.found() alias_target('update-keymaps', t) -else - # install from the source tree - install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / = 'keymaps') endif =20 install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'key= maps') --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598975273; cv=none; d=zohomail.com; s=zohoarc; b=CIJFGV63Bd1/qe1x6uq53UZgbC7MqS2jUVn0I2z0B7uFRyucIZwZbt0h4dYarBD9DFwgri2GPDM0mYkCVdiBDUyZSFHaZP+l0esSEFF2ct8nkqavndBFk1SZHAy1TSwOsFUoHa5ljGETSjYtPnbTPK+6Cd6pHuPIb45B5GjejDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598975273; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=0BmBKPIhWJxnjDqQhxA5cVheq6ivgJAM2k1G7vAGKV0=; b=O3QYczPYUeu7hvUfvGuh46ucKrVv3aK4KAv5QlFze5UYLBg9JQjXkpusgLgi3eNVjpzXwgj1u/x7uSh7Ml9A5fh/AG826HJS7hHq65ZyNEWMlE3fR1oJz1lnRPfIGj8Y+WIH5Ec3l5ACGZaVvfsYszsY2Nc8kkFK1KUTxLcPW8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598975273166884.7742861972276; Tue, 1 Sep 2020 08:47:53 -0700 (PDT) Received: from localhost ([::1]:57112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8Vk-00021h-AF for importer@patchew.org; Tue, 01 Sep 2020 11:47:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD863-0005We-6X for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:19 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35110 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD861-0006iB-Ck for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-228-Dn7sGfv0NlGQh9eSYAy-ZA-1; Tue, 01 Sep 2020 11:21:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C30B107B279; Tue, 1 Sep 2020 15:21:06 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3B935D9CC; Tue, 1 Sep 2020 15:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=0BmBKPIhWJxnjDqQhxA5cVheq6ivgJAM2k1G7vAGKV0=; b=aDAWkFOCfsDxvYLwpkB48M5HXn01sNW2JM6lGfOzpdRjMrqA6L4VIU5hy3EbrokCrPhdRU 6bdvUkeYYurZhdUx9SPQcPyYBq0QWCcxwLJ0UXihisl3nNeUmXXZ1p/0fyDUedvKnEAP1N r5GeC1d6sdgLa7P00I+NMyWyOCBUfyM= X-MC-Unique: Dn7sGfv0NlGQh9eSYAy-ZA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 7/8] configure: Add system = 'linux' for meson when cross-compiling Date: Tue, 1 Sep 2020 17:20:49 +0200 Message-Id: <20200901152050.255165-8-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Meson needs the "system =3D xyz" line when cross-compiling. We are already adding a "system =3D 'windows'" for the MinGW cross-compilation case here, so let's add a "system =3D 'linux'" now for Linux hosts, too. Message-Id: <20200823111757.72002-2-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 59b7310e15..85461976b5 100755 --- a/configure +++ b/configure @@ -8194,6 +8194,9 @@ if test -n "$cross_prefix"; then ?:*) pre_prefix=3D/ ;; esac fi + if test "$linux" =3D "yes" ; then + echo "system =3D 'linux'" >> $cross + fi case "$ARCH" in i386|x86_64) echo "cpu_family =3D 'x86'" >> $cross --=20 2.18.2 From nobody Sun Nov 16 05:46:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598976011; cv=none; d=zohomail.com; s=zohoarc; b=niFljSFyNsKwrDr2KwPeHf0f6fCaFy+Zj1aWstTf9UV1NlQAZ10Bc0eBTJfWPFrY5uVnVsAV15vGs1byoDJLqbjluH2rU5rclPMRGAgKX447ylsA26N3se0GpZYllNFWQnObad+lnsVFqMQ2rCe2QH/SsXK+9ndltWYRX/nhJPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598976011; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=EgvoQ9NQnM9s6iXksNI0/R63KZhXs73+28RhQRIHDUw=; b=N8GA0Z8BP7QxNm7bYfcTJXfDQYJGw4k8ree2iHffPi/R+WU4ly8hMBoAN813thFCqXHhuSGVdLTmNYUIkInvDPTeF+CVXE6flFcNKEFN9eFCve34d6RXrGLSXFp1nQLGPgweq6ccf2IS/twEAFMCLy8rXdM0qDYel12HVVLM8B4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598976011347154.09175365679425; Tue, 1 Sep 2020 09:00:11 -0700 (PDT) Received: from localhost ([::1]:37708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD8QL-0002JP-Ky for importer@patchew.org; Tue, 01 Sep 2020 11:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD85z-0005M2-BD for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:15 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:22811 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD85x-0006hb-8G for qemu-devel@nongnu.org; Tue, 01 Sep 2020 11:21:15 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-Uxr4ty9PO36_62k55WzRIA-1; Tue, 01 Sep 2020 11:21:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA631425CF; Tue, 1 Sep 2020 15:21:07 +0000 (UTC) Received: from thuth.com (ovpn-112-188.ams2.redhat.com [10.36.112.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B8CD5D9CD; Tue, 1 Sep 2020 15:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598973672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=EgvoQ9NQnM9s6iXksNI0/R63KZhXs73+28RhQRIHDUw=; b=eYBKNaLOHjQv2i3QB6giT4CwhwRzy9CTJRCK7ZIjtmbTvZI3PdOPKIpogPRrNsCmobAjp1 CYq5BfsU6VdL7CoxAqtj3+W4iJR4kBWEY8QuExvN9Htd8BkjLWynsziWsNDsS/rNbXR4Bh 8a3A5RscWhSqUFN8Fe7Ics1wt0GAVoo= X-MC-Unique: Uxr4ty9PO36_62k55WzRIA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 8/8] hw/m68k: QOMify the mcf5206 system integration module Date: Tue, 1 Sep 2020 17:20:50 +0200 Message-Id: <20200901152050.255165-9-thuth@redhat.com> In-Reply-To: <20200901152050.255165-1-thuth@redhat.com> References: <20200901152050.255165-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 02:08:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ed Maste , Li-Wen Hsu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The mcf5206 system integration module should be a proper device. Let's finally QOMify it. Signed-off-by: Thomas Huth Message-Id: <20200819065201.4045-1-huth@tuxfamily.org> --- hw/m68k/an5206.c | 14 ++++++++++++-- hw/m68k/mcf5206.c | 44 ++++++++++++++++++++++++++++++++++--------- include/hw/m68k/mcf.h | 3 +-- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 846f4e40c6..673898b0ea 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -21,7 +21,17 @@ #define AN5206_MBAR_ADDR 0x10000000 #define AN5206_RAMBAR_ADDR 0x20000000 =20 -/* Board init. */ +static void mcf5206_init(MemoryRegion *sysmem, uint32_t base) +{ + DeviceState *dev; + SysBusDevice *s; + + dev =3D qdev_new(TYPE_MCF5206_MBAR); + s =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); + + memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(s, 0)= ); +} =20 static void an5206_init(MachineState *machine) { @@ -51,7 +61,7 @@ static void an5206_init(MachineState *machine) memory_region_init_ram(sram, NULL, "an5206.sram", 512, &error_fatal); memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sra= m); =20 - mcf5206_init(address_space_mem, AN5206_MBAR_ADDR, cpu); + mcf5206_init(address_space_mem, AN5206_MBAR_ADDR); =20 /* Load kernel. */ if (!kernel_filename) { diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 94a37a1a46..51d2e0da1c 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -15,6 +15,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "sysemu/sysemu.h" +#include "hw/sysbus.h" =20 /* General purpose timer module. */ typedef struct { @@ -159,6 +160,8 @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq) /* System Integration Module. */ =20 typedef struct { + SysBusDevice parent_obj; + M68kCPU *cpu; MemoryRegion iomem; m5206_timer_state *timer[2]; @@ -174,6 +177,8 @@ typedef struct { uint8_t uivr[2]; } m5206_mbar_state; =20 +#define MCF5206_MBAR(obj) OBJECT_CHECK(m5206_mbar_state, (obj), TYPE_MCF52= 06_MBAR) + /* Interrupt controller. */ =20 static int m5206_find_pending_irq(m5206_mbar_state *s) @@ -257,8 +262,10 @@ static void m5206_mbar_set_irq(void *opaque, int irq, = int level) =20 /* System Integration Module. */ =20 -static void m5206_mbar_reset(m5206_mbar_state *s) +static void m5206_mbar_reset(DeviceState *dev) { + m5206_mbar_state *s =3D MCF5206_MBAR(dev); + s->scr =3D 0xc0; s->icr[1] =3D 0x04; s->icr[2] =3D 0x08; @@ -578,24 +585,43 @@ static const MemoryRegionOps m5206_mbar_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, M68kCPU *cpu) +static void mcf5206_mbar_realize(DeviceState *dev, Error **errp) { - m5206_mbar_state *s; + m5206_mbar_state *s =3D MCF5206_MBAR(dev); qemu_irq *pic; =20 - s =3D g_new0(m5206_mbar_state, 1); - memory_region_init_io(&s->iomem, NULL, &m5206_mbar_ops, s, "mbar", 0x00001000); - memory_region_add_subregion(sysmem, base, &s->iomem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); =20 pic =3D qemu_allocate_irqs(m5206_mbar_set_irq, s, 14); s->timer[0] =3D m5206_timer_init(pic[9]); s->timer[1] =3D m5206_timer_init(pic[10]); s->uart[0] =3D mcf_uart_init(pic[12], serial_hd(0)); s->uart[1] =3D mcf_uart_init(pic[13], serial_hd(1)); - s->cpu =3D cpu; + s->cpu =3D M68K_CPU(qemu_get_cpu(0)); +} + +static void mcf5206_mbar_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - m5206_mbar_reset(s); - return pic; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->desc =3D "MCF5206 system integration module"; + dc->realize =3D mcf5206_mbar_realize; + dc->reset =3D m5206_mbar_reset; } + +static const TypeInfo mcf5206_mbar_info =3D { + .name =3D TYPE_MCF5206_MBAR, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(m5206_mbar_state), + .class_init =3D mcf5206_mbar_class_init, +}; + +static void mcf5206_mbar_register_types(void) +{ + type_register_static(&mcf5206_mbar_info); +} + +type_init(mcf5206_mbar_register_types) diff --git a/include/hw/m68k/mcf.h b/include/hw/m68k/mcf.h index 0db49c5e60..decf17ce42 100644 --- a/include/hw/m68k/mcf.h +++ b/include/hw/m68k/mcf.h @@ -18,7 +18,6 @@ qemu_irq *mcf_intc_init(struct MemoryRegion *sysmem, M68kCPU *cpu); =20 /* mcf5206.c */ -qemu_irq *mcf5206_init(struct MemoryRegion *sysmem, - uint32_t base, M68kCPU *cpu); +#define TYPE_MCF5206_MBAR "mcf5206-mbar" =20 #endif --=20 2.18.2