From nobody Sun Nov 16 05:58:59 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=1599061890; cv=none; d=zohomail.com; s=zohoarc; b=HwK1BFUobJb0eBcrYj+aG6EcwknOHJQmP7fXMujIU2eb0/p4n2jRg6oktIZzDxUNT9UQQPiNZc6PldPdQCrFOk3eepVSmNFj6CRRhzFuSwl+j4K1iwlpSNnRiWjTAaOA+5gXFTMq0mn+s406xdUDy4Rg/Hz+J547531zq+dJFf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599061890; h=Content-Type:Content-Transfer-Encoding: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=SGX24JLWY+r+tY1063hh0dFOTGKKnnVLI9RwqEGli3I=; b=mdzrENz60VMAvj9vPnxEKZdwzA2Bdvr7r48Q6BsEu76bUu853j1iz6mq6N9kjIgeT5BlLpGEi7fNu2OmbQSPNSRod1ndfFLcR2bFYFNrrxVxzBDGEzYGw1PiKcpcLeBsO/a2DQyT9kMrfSufUZmlv3/o6sRYi1d4Z+Nv96N/UOI= 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 1599061890107102.81899180121866; Wed, 2 Sep 2020 08:51:30 -0700 (PDT) Received: from localhost ([::1]:55444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV2n-0002WQ-De for importer@patchew.org; Wed, 02 Sep 2020 11:51:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1E-0000oZ-Ex for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDV1A-0005S3-PZ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:51 -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-265-DVS02I7XOsiutP6ZcjJOZg-1; Wed, 02 Sep 2020 11:49:43 -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 684A61005504; Wed, 2 Sep 2020 15:49:42 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FD4C5D9CC; Wed, 2 Sep 2020 15:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SGX24JLWY+r+tY1063hh0dFOTGKKnnVLI9RwqEGli3I=; b=KJ+nmMcf+z3yQV/xIfH2ngT+MNpJ/UlW8PYsZXgZATmTdU6Awzqn9HdAYRVlSRRuy3sFQg xDYHmDstNc22lm6lFL6NIxnFjbBCyFv1Yqxo9D5Mdag43j0OLSkD4X4u7RlG4vsYoAf0lq X8z3rUuYOUkZFc8Q99JIr9geldT133E= X-MC-Unique: DVS02I7XOsiutP6ZcjJOZg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 01/15] configure: Fix atomic64 test for --enable-werror on macOS Date: Wed, 2 Sep 2020 17:49:18 +0200 Message-Id: <20200902154932.390595-2-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 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: , 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 8a3acef89d..5645575688 100755 --- a/configure +++ b/configure @@ -5755,11 +5755,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:58:59 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=1599061883; cv=none; d=zohomail.com; s=zohoarc; b=R8cOfMPonyq8dS9I9J52al4C/OC6n+SKEuaZvf53mpoKjep5wLs70iJBN4QA0aEB0X/8tYBvljAGTdQHcr/Wlqm0/6y4akxQZ2Cufpc8kUV+q3rtknsR1MN3xBMYUSQVu9MTxlVWut9H3iw3gOlWYVioZ0Jw1ZWu5M3qnVRBg2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599061883; h=Content-Type:Content-Transfer-Encoding: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=nrzpCtvZQZweplmVeGH13eyV4QTql8DvHMQUROVvXdir1coEg3xCOm8HbKEMmS7GiGXrZwRv9cpC8xtpCD52qJuSq9rIJtjF94qP2w0C6hSUlIPAe/XXrFEE0IPV8wIngDhUNJHyfRAdUBZRu6nw4VXZN0+KWUWImVFULkHra6I= 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 1599061883084470.58100606965525; Wed, 2 Sep 2020 08:51:23 -0700 (PDT) Received: from localhost ([::1]:55046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV2f-0002MI-Oa for importer@patchew.org; Wed, 02 Sep 2020 11:51:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1C-0000nW-ME for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDV19-0005Rt-MB for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:49 -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-366-WQecjJWDP76m8x_Aqf_wyQ-1; Wed, 02 Sep 2020 11:49:44 -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 88FAA10ABDD1; Wed, 2 Sep 2020 15:49:43 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id B63DA5D9F7; Wed, 2 Sep 2020 15:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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=DqA+Vh68webU5P3TK8Fmp20LxDskVNUb3XpHQ6suvksvbNS8zdoLVbIMHluSgMhQUpA9b6 nUtf15Dc2E+LfxGNNVGOko5PsuU0Kbu7KHkBD+K7lM1MvD7Z3T+4ghLlQz3z6k+S7qo9tX fd0JUD61Fh4mrPzQizWL51oz2/jtjbY= X-MC-Unique: WQecjJWDP76m8x_Aqf_wyQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 02/15] cirrus.yml: Compile FreeBSD with -Werror Date: Wed, 2 Sep 2020 17:49:19 +0200 Message-Id: <20200902154932.390595-3-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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/09/02 02:42:29 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: , 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:58:59 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=1599062060; cv=none; d=zohomail.com; s=zohoarc; b=Zu9OBJUrUrNO4b2t0Sf0aGGPPCZ+0MAL4bUwgOjg2RFEdDDss63Cjhat8N3E03V5MZAJZ35Hso+v927rvqkpf7wABmBFqYbkYV5sm0TMH3cEKn+QKdlqIABVfPo+Sb/VrekYVDpO3vH7IcUCFXxz1G5pO9b3NNtMrFLK9Mu/JgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062060; h=Content-Type:Content-Transfer-Encoding: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=UPI7qVT0PnKC572CZkLEPtbAIQtllp/hSuQcpRWFDouu8W5+cG1iepZlbBqrofMaQ3ObxahCcXC8+XpWKJAH72R2Z1w6xLeGhNtbqviBWDP8uhFurCjSZyEYg4JhYWzEm0WDRDAA1Zufx8m154n0qAGRHMEW5Xz3/cQFh1cdT14= 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 1599062060282342.4423442358175; Wed, 2 Sep 2020 08:54:20 -0700 (PDT) Received: from localhost ([::1]:33782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV5X-0005fR-EM for importer@patchew.org; Wed, 02 Sep 2020 11:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1E-0000oN-Eg for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDV1A-0005S1-PP for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:51 -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-259-nZJKKF7-Mcmuf_7yMit3Yw-1; Wed, 02 Sep 2020 11:49:45 -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 BF9638015C5; Wed, 2 Sep 2020 15:49:44 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id E66F05D9CC; Wed, 2 Sep 2020 15:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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=BjPKLDBfOEuX/go1QVWdYJfn49ZAE/+q9FZQRMoS1wJRP3DbcZAStVQE5HZVbKCl/0Epo7 TcAtP0H9YuWPyJK3VASD7WxF7yikJac5QVat9bUR8hnW9HYrMTUNWwL5IbcU8GrJINuwmJ tdcaKIVmaRp3rfpKNfw9HX33TdTmyKI= X-MC-Unique: nZJKKF7-Mcmuf_7yMit3Yw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 03/15] cirrus.yml: Compile macOS with -Werror Date: Wed, 2 Sep 2020 17:49:20 +0200 Message-Id: <20200902154932.390595-4-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 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: , 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:58:59 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=1599062218; cv=none; d=zohomail.com; s=zohoarc; b=nor7/JTdnJQDAFCyb/iE2SanW1kFVc32CELu10qcUBEpvBLmPVj5Dv+lpGURB8B7kfRMo8jruKNfAJ1Iwnj+NE7md5A7Rw5qFiFtfCy0xtNhs9wNiYpAc71lNcajZQtQdguk+89/4YEmAgYuH0GjoZEPdHY8DZW037eH4jaOXb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062218; h=Content-Type:Content-Transfer-Encoding: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=kDoSJ0xKDAbJq4+NdoSpj7XoW6lFmKn/y1DVqb/4Weg9qnnJD2hPjksMkGY1aB0Zap963sB8IRyVrrCsGQi8GSlo30gH0moz1I1HK6Bll1PFHtjXD4skX4crh/iBWDWLke+5NRXnRC5MXSoTasMCnPSUXSFGiVZMhKppizuQUL4= 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 1599062218347454.7204508338773; Wed, 2 Sep 2020 08:56:58 -0700 (PDT) Received: from localhost ([::1]:42486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV85-0001A5-KO for importer@patchew.org; Wed, 02 Sep 2020 11:56:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1J-0000y8-Er for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDV1E-0005SN-GC for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:57 -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-444-rU-2m8H8PKCFUumVbl-PAA-1; Wed, 02 Sep 2020 11:49:46 -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 C9DBB801AE6; Wed, 2 Sep 2020 15:49:45 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 206D15D9CC; Wed, 2 Sep 2020 15:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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=I8QB2cGpRTLth6yVqdjfCapD+qEMh4xIiNdYLdS9h+ejaGg5A7cWaXq0IX5OpApdxm9Bbd QIVyeV8oYcEBtT7fAQOAygpbLcp2y2CfEeQjOiMb3OiW0mEheh6MN2K0Gjmg+XX8psWmBL YIN9x7UsCd8n9L6dQjPHC6L2rbH/t4I= X-MC-Unique: rU-2m8H8PKCFUumVbl-PAA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 04/15] cirrus.yml: Update the macOS jobs to Catalina Date: Wed, 2 Sep 2020 17:49:21 +0200 Message-Id: <20200902154932.390595-5-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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/09/02 02:42:29 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: , 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:58:59 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=1599062090; cv=none; d=zohomail.com; s=zohoarc; b=BiFgvFBWjXaII8JUJj+2GhTi08K4KGQAKdwWrT1ijfkP8TUN7X49AfXVaWO3y2c8OWroa7WpZa+JXbzvq9yix959p4SI2vFdN3knmd87LyE/H668NrbpMxi6t9nyuJZXXJN/PRwc97XM5A4fm/Kg2DpwiYup47mLBjNJgmHaSBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062090; h=Content-Type:Content-Transfer-Encoding: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=Wx++krOR4xyKISFe/iZYw6wkxAkjYrM4i6mjnT+rGvspZ6EcGumABV+WWz0qx/IB1WwftPblUdx6ojLbKNZhOC722Ds2NX7ZLb8iIoH12+13Q29bgSMAYwmT1SzY+Dt/mHxgVdrvMitdtOwZlvIkPhUlQ9hTCdrrwuHWDpfqNpE= 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 1599062090671100.02879715944198; Wed, 2 Sep 2020 08:54:50 -0700 (PDT) Received: from localhost ([::1]:36190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV61-0006nX-UK for importer@patchew.org; Wed, 02 Sep 2020 11:54:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1H-0000sX-32 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58774 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 1kDV1F-0005SP-3G for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:54 -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-414-211NYHY-Os-cU1gSXalCnA-1; Wed, 02 Sep 2020 11:49:47 -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 09EE0107B794; Wed, 2 Sep 2020 15:49:47 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 304915D9CC; Wed, 2 Sep 2020 15:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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=icIMRYMi+9P+QCM9tq1nFGWpfgkggJsEUk03hZr7yUFo1hKHiejd63chAiTpJXmVQRWJ1k IteZeE/JPLFZAnPxdlO1dc9DOyE6QCwWxxNhHygRJoYtGir9mWLCPwtxNAHtFoTA7cvpRF QYd/XOni5MWOYl7rxvDP1NK9hv4fOww= X-MC-Unique: 211NYHY-Os-cU1gSXalCnA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 05/15] cirrus.yml: Split FreeBSD job into two parts Date: Wed, 2 Sep 2020 17:49:22 +0200 Message-Id: <20200902154932.390595-6-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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/02 02:26:30 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: , 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:58:59 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=1599062178; cv=none; d=zohomail.com; s=zohoarc; b=nsTRZv6izwCq9ryzArAC7YtNY9Ldw6jSX1+iZ4p3xZ1hGoAZ8FVHGaITHZ+Ij9wiq8jWyt/ARZiilUmMhOx1sgR6uXcvKM3az/kIQL9gIuUDEyN9lEYUaoAyjhGkmLm4fqJ2zYKpFK1ni4qrCtS4WTHLYmXLSqAZilW1IOOhHYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062178; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=P0vsjf7jIJJfpBQQWbMLmX5lc5WBp0zXOClEw8sEddo=; b=FyC+ydPIiBexZusEldPEtQA3imuuM2OwLER2hEaBzI/gC97AQlq53cFF5AusVnxwnhAnCqhNRyl1BoXNUEaNV1NUKrVGUjkMYNrdhclB/22sY4lNdGj4qbFByz9neC4/5AOzJFNaOqMbKA/yp7dmCxeieZTDepCKTzi3Ir4bSF0= 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 1599062178338177.5733754849906; Wed, 2 Sep 2020 08:56:18 -0700 (PDT) Received: from localhost ([::1]:40106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV7Q-00005c-Tg for importer@patchew.org; Wed, 02 Sep 2020 11:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1K-00010k-Dv for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:58 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:47490 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 1kDV1I-0005T4-I5 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:58 -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-206-NMsHqHtZN3CFo_NXvuCg1Q-1; Wed, 02 Sep 2020 11:49:49 -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 3E48C10ABDBA; Wed, 2 Sep 2020 15:49:48 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 682C35D9CC; Wed, 2 Sep 2020 15:49:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=P0vsjf7jIJJfpBQQWbMLmX5lc5WBp0zXOClEw8sEddo=; b=WFT22ARaFCTALfCR090Hpc3/k5IikmmMnbtywOr5aZl5HNc3UexdxukkAUu0OFqPb4Q8vV hdiAS11iE/0IWFQaKviHn+okTY/fbbFmYUPNjSO8/NzkbGfcHcQwSj00Li7YrpweADMe7x 8GoahdL08cxzQYlImdSy6Uly7TPHIak= X-MC-Unique: NMsHqHtZN3CFo_NXvuCg1Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 06/15] meson: fix keymaps without qemu-keymap Date: Wed, 2 Sep 2020 17:49:23 +0200 Message-Id: <20200902154932.390595-7-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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.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/02 03:24:55 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: , 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> [thuth: Rebased, changed "config_host['qemu_datadir']" to "qemu_datadir"] 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 bbac83ece3..2e2e0dfa3b 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: 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: 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: 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: qemu_datadir / 'keymaps') endif =20 install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062294; cv=none; d=zohomail.com; s=zohoarc; b=bhjx1eaDENPDzEIWO7Z5qoHZUgjShDVC5uH7hwCAxLpiCbRdnnJ5gXFYUG3xfPjJoGovQ3zOCLfJ8vuNtiG94KyW8gTgGoxdWyRrF/gVXGOALNkzTtTvt2zMbo6Be81wqAtfRbWzxoERjSvihDHOdoBX2e4moJlP7483UTYYhSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062294; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=h1IOSs9Z41XxnKD+WiL1f+EKtAV6BVw7Y3HgBImO9zA=; b=RoYyc0ilSaro/s2mw96tYG0yLucRAro9S7Cv1bP3rd6YLkU/oLxw20C9nM+mjzaEHISvqXCx22xjwweiz0De2cUQk53/TFWRExczBCkGTOWJZdVD7stuPPAxaH7a6XJpDIcTpnThXkAQTTUurD3DvTx4z6yb33TTeppNA6zQh3g= 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 1599062294986621.2910044844201; Wed, 2 Sep 2020 08:58:14 -0700 (PDT) Received: from localhost ([::1]:48532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV9K-0003gB-5U for importer@patchew.org; Wed, 02 Sep 2020 11:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1K-0000zk-2A for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:58 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:56248 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 1kDV1I-0005Sv-Ai for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:57 -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-559-RnvVR2tVNX6vGJiR1Wls2w-1; Wed, 02 Sep 2020 11:49:50 -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 5D053425D2; Wed, 2 Sep 2020 15:49:49 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95AD95D9CC; Wed, 2 Sep 2020 15:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=h1IOSs9Z41XxnKD+WiL1f+EKtAV6BVw7Y3HgBImO9zA=; b=BW2CSmmb4iO8u+eNuE78KtyT8AaG7RLranHaPNsJoQAZ9Ni99FQH8gEhmZJ94rvwNvuXCr gPDTv2kHkbRUbe1p1cM9oS0rJdgqRxXsx0GQlPsWATuqUSRdCP79hjK7v0m+Teg4x9EMA0 yfEgw9GWHcTCfz+TxI+RQVsZMYMXvSc= X-MC-Unique: RnvVR2tVNX6vGJiR1Wls2w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 07/15] configure: Add system = 'linux' for meson when cross-compiling Date: Wed, 2 Sep 2020 17:49:24 +0200 Message-Id: <20200902154932.390595-8-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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.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/02 02:33:32 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: , 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 5645575688..cc9af72358 100755 --- a/configure +++ b/configure @@ -8163,6 +8163,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:58:59 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=1599062066; cv=none; d=zohomail.com; s=zohoarc; b=Lmj1+GhSDgZ0iCHAqucyN5g7Bhf+24hThtosU96ea/MpVqdSlFywT7NtfhVBn8MSesPrK8B1RvlcmQgH9eX4igkgo78PnRBJ84cBXGN+FprKqEfE/0KL6MdTmOwGouYxc+yMAyaWqxJSe+9CR99ps1I6clUtNtuOzKoomrX+gq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062066; h=Content-Type: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=Ne0HnvWxlpWhu/2NtU+BVT9bZ9Q6C64FOYtkUzdeaCCkFtCrwc6f4aP6mQb49l3h4SWx5jRoRhMQkSQB9rqITacLxpMsKMlJEWNYyAMKIp6tjCLbtqvgh24htwYvsoKkFuD1L0xLvJXNJ99NkdwGevj8fJTzaLNOnpPOqtd4A7c= 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 1599062066177108.16296606338312; Wed, 2 Sep 2020 08:54:26 -0700 (PDT) Received: from localhost ([::1]:34182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV5d-0005rh-Cs for importer@patchew.org; Wed, 02 Sep 2020 11:54:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1I-0000w5-KK for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41055 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 1kDV1G-0005Si-DE for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:56 -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-544-Z0KI6Br5PUmheCyhRJ_oow-1; Wed, 02 Sep 2020 11:49:51 -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 8E13310ABDB1; Wed, 2 Sep 2020 15:49:50 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF8845D9CC; Wed, 2 Sep 2020 15:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=EgvoQ9NQnM9s6iXksNI0/R63KZhXs73+28RhQRIHDUw=; b=c2pz/ejVgKEc3auzX7/UX5/1x6nyamH1j60o9HbPXp5cdsYRVImcjIS3dCLzdOskvt4NC2 Yle4ZXISMOg16N6YFYlO0VCvgVIKwQhAP2BZAahDXS+gKDPSFeL0jhAVylJ+P6HkTbka8R BdQeMy8Qz8IyhKS1+rMA/DZT79QsWrk= X-MC-Unique: Z0KI6Br5PUmheCyhRJ_oow-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 08/15] hw/m68k: QOMify the mcf5206 system integration module Date: Wed, 2 Sep 2020 17:49:25 +0200 Message-Id: <20200902154932.390595-9-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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=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/02 02:26:30 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: , 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 From nobody Sun Nov 16 05:58:59 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=1599062182; cv=none; d=zohomail.com; s=zohoarc; b=GNdlRSvwNbh8sPZfh3tADQnMbfzFMDnAd+uqKWwU2IJmdmvpCAbu1ElIFSDwt6/+n7gb0GdAkDi2CP/IUq6ITmTR2upNAVL26IUJv23eYfHXq3VREo7a1J5XpGDw6ped8DQrcvIp0NfGEJqv0H8U0GZDeU1KMeeBKQVvDOQVX/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062182; h=Content-Type:Content-Transfer-Encoding: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=bAvWGVgRdXH+V07442qtZdl0dTJeBpHCDS2KpP1OZpc=; b=UPhUh4ppXigBwbM23SdmYXlOeUj+v2vVZ28wdk8McKr1mA9j+Ueu7D0xTbhZIxK4+XZaUWx3gw+0NH8WMk/GNxYIMSICaL992fVOaZsfUFsf43AcEZv4jYNdN3tTy5xSS/vkS0Vyp8rGU23eTvuPFxk8/GyD/4VpYcDPE29xdwE= 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 1599062182137147.2965912790636; Wed, 2 Sep 2020 08:56:22 -0700 (PDT) Received: from localhost ([::1]:40530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV7V-0000I9-CR for importer@patchew.org; Wed, 02 Sep 2020 11:56:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1J-0000xZ-74 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:57 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:43656 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 1kDV1H-0005Sp-Gx for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:56 -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-522-tPe4Ve6MMSqNPCpa70XKmQ-1; Wed, 02 Sep 2020 11:49:52 -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 93764805EE8; Wed, 2 Sep 2020 15:49:51 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD3445D9CC; Wed, 2 Sep 2020 15:49:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bAvWGVgRdXH+V07442qtZdl0dTJeBpHCDS2KpP1OZpc=; b=EMX2jmXxjrVJpb9Q1x0ejG2K6WnpV8lAFMxlTpKq40aACrgGgsNuhvPf7Z+9QhtTQa4mpJ 4jDjGlMYoNCv5XbLc3y4RGJerhm5pqY0X84QwwBQ/o7jSsOkEaIvxc0RmOIE+a1H4sgmUu 9RLiLSdfQf4jLc9y1AyW+qPaZXpYZes= X-MC-Unique: tPe4Ve6MMSqNPCpa70XKmQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 09/15] tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS) Date: Wed, 2 Sep 2020 17:49:26 +0200 Message-Id: <20200902154932.390595-10-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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/02 03:24:55 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 Fix an error handling issue reported by Coverity: /qemu/tests/qtest/ahci-test.c: 1452 in prepare_iso() 1444 int fd =3D mkstemp(cdrom_path); >>> CID 1432375: Error handling issues (NEGATIVE_RETURNS) >>> "fd" is passed to a parameter that cannot be negative. 1452 ret =3D write(fd, patt, size); Reported-by: Coverity (CID 1432375) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200902080552.159806-1-philmd@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/ahci-test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c index ca4294f44f..5e1954852e 100644 --- a/tests/qtest/ahci-test.c +++ b/tests/qtest/ahci-test.c @@ -1443,6 +1443,7 @@ static int prepare_iso(size_t size, unsigned char **b= uf, char **name) ssize_t ret; int fd =3D mkstemp(cdrom_path); =20 + g_assert(fd !=3D -1); g_assert(buf); g_assert(name); patt =3D g_malloc(size); --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062374; cv=none; d=zohomail.com; s=zohoarc; b=Kas6T1ciOcCttZ9XyItUsjRYV8TVwkllvzDWEikIAhusBWtxPxF2/f6fKQS031Lm1JWlwvqv4q/9p5EIkm6qYABjBVbsB3HgKPUihFIL/4pUZ8jslYAVHINAbfHYd9a+bZy0W9b1OLCF/nUY03yLj3NyIKqa00QjIHrYZqCyN78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062374; h=Content-Type:Content-Transfer-Encoding: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=QBKdWnxnKVN0Ngtu49hX7Cummax17bw+GdxDY+jlWt0=; b=Gu1pi6skDRuy9FyJg1EGl4f6LjkSDbGeWh0IFFX8ayq4QSvRfV27DUyu5gUPVYp8SgcDyCU+qfADz87nKlXGRIP2sef+UwHgBVq33CwNfbKkqRN95Z9APLBotviGjwA5mclnWi+3ZSeuomT+91JiYn6zpcQOz+ZAnkvcH9s5vMY= 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 1599062374559681.9668105454083; Wed, 2 Sep 2020 08:59:34 -0700 (PDT) Received: from localhost ([::1]:54590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVAb-0006Ev-P8 for importer@patchew.org; Wed, 02 Sep 2020 11:59:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1K-00011K-Lk for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDV1I-0005T7-Kl for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:58 -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-570-Md9yEFFaM8egI32oGjIfBQ-1; Wed, 02 Sep 2020 11:49:53 -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 BCDB6425D8; Wed, 2 Sep 2020 15:49:52 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2B3E5D9D3; Wed, 2 Sep 2020 15:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QBKdWnxnKVN0Ngtu49hX7Cummax17bw+GdxDY+jlWt0=; b=SAXjf2mQXV4GE4eJeQ4hxvygeQUVd/PnINgG83TaHNY4FGAW6J7t8jG+OiuRJqTCEmJVah 8pEY9tME3xHtN8Q2UGk6IlSxXmW/bdRA8zFBmEXrWQhNWALGzR55qLQoElb1CUTdwHIcp0 YBblqZLVr/9yZ/DJKB76IYGUzr/AMi8= X-MC-Unique: Md9yEFFaM8egI32oGjIfBQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static Date: Wed, 2 Sep 2020 17:49:27 +0200 Message-Id: <20200902154932.390595-11-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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/09/02 02:42:29 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 The functions using these arrays expect a "const unsigned char *" argument, it is safe to declare these as 'static const'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200902080909.161034-1-philmd@redhat.com> Reviewed-by: Darren Kenny Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/tpm-tests.c | 4 ++-- tests/qtest/tpm-util.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c index a2f2838e15..70c80f8379 100644 --- a/tests/qtest/tpm-tests.c +++ b/tests/qtest/tpm-tests.c @@ -59,7 +59,7 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_fun= c *tx, tpm_util_startup(s, tx); tpm_util_pcrextend(s, tx); =20 - unsigned char tpm_pcrread_resp[] =3D + static const unsigned char tpm_pcrread_resp[] =3D "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00" "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85" "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89" @@ -107,7 +107,7 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_= path, tpm_util_startup(src_qemu, tx); tpm_util_pcrextend(src_qemu, tx); =20 - unsigned char tpm_pcrread_resp[] =3D + static const unsigned char tpm_pcrread_resp[] =3D "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00" "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85" "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89" diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c index e2b29ef0f8..3ed6c8548a 100644 --- a/tests/qtest/tpm-util.c +++ b/tests/qtest/tpm-util.c @@ -98,9 +98,9 @@ void tpm_util_tis_transfer(QTestState *s, void tpm_util_startup(QTestState *s, tx_func *tx) { unsigned char buffer[1024]; - unsigned char tpm_startup[] =3D + static const unsigned char tpm_startup[] =3D "\x80\x01\x00\x00\x00\x0c\x00\x00\x01\x44\x00\x00"; - unsigned char tpm_startup_resp[] =3D + static const unsigned char tpm_startup_resp[] =3D "\x80\x01\x00\x00\x00\x0a\x00\x00\x00\x00"; =20 tx(s, tpm_startup, sizeof(tpm_startup), buffer, sizeof(buffer)); @@ -112,14 +112,14 @@ void tpm_util_startup(QTestState *s, tx_func *tx) void tpm_util_pcrextend(QTestState *s, tx_func *tx) { unsigned char buffer[1024]; - unsigned char tpm_pcrextend[] =3D + static const unsigned char tpm_pcrextend[] =3D "\x80\x02\x00\x00\x00\x41\x00\x00\x01\x82\x00\x00\x00\x0a\x00\x00" "\x00\x09\x40\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00" "\x0b\x74\x65\x73\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" "\x00"; =20 - unsigned char tpm_pcrextend_resp[] =3D + static const unsigned char tpm_pcrextend_resp[] =3D "\x80\x02\x00\x00\x00\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" "\x01\x00\x00"; =20 @@ -133,7 +133,7 @@ void tpm_util_pcrread(QTestState *s, tx_func *tx, const unsigned char *exp_resp, size_t exp_resp_size) { unsigned char buffer[1024]; - unsigned char tpm_pcrread[] =3D + static const unsigned char tpm_pcrread[] =3D "\x80\x01\x00\x00\x00\x14\x00\x00\x01\x7e\x00\x00\x00\x01\x00\x0b" "\x03\x00\x04\x00"; =20 --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062269; cv=none; d=zohomail.com; s=zohoarc; b=Q7uLqrNNNfJ7sIZWLdpmJmHYsRzoSbWDVLGg+lqBu4GiS23is2SZMXPSS8L6BYFmc35YqvKfO5yh0CRcLayk6NjRHnJ3zc8Foqp6o+cHN8d95DTIBd75QNzrUa6Ae4LvZwj+Y5dHuuXK4fxtfhh57fy5dsbSxMzmO9ytye136Lo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062269; h=Content-Type:Content-Transfer-Encoding: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=wLbELblpV5S2N7qQ1QcNRijkVAuwaCSCO3+z9cGFr0M=; b=OWaUQAsp+weV7irgaNem3Per3+HiKEN8u50CWHrOQc5ElQN98mmqDVTM7BA/3PfrySWW58aSqO2tEeSCMTXnAWZ0GIJ3qF4iYMkhLdyK2HlBhpA1DIVE7Ajo0JrTw7OOcmJBiur8xdajRL7EvkwbWCZ+enDRTTP5XtGX3SDdtCc= 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 1599062269951380.4131560460071; Wed, 2 Sep 2020 08:57:49 -0700 (PDT) Received: from localhost ([::1]:46254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV8u-0002ju-Ri for importer@patchew.org; Wed, 02 Sep 2020 11:57:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1L-00012p-Cq for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDV1J-0005TM-KS for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:49:59 -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-269-WAX7e0yBOMCc2sTdMb3sXQ-1; Wed, 02 Sep 2020 11:49:54 -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 F41218015FA; Wed, 2 Sep 2020 15:49:53 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 294225D9CC; Wed, 2 Sep 2020 15:49:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wLbELblpV5S2N7qQ1QcNRijkVAuwaCSCO3+z9cGFr0M=; b=igLvzRtT1XawxFKECFQUZ+w54o9w47giYBwl0csodnRyUXbqMCFFnRN1FeGjxitKL7Z5Do 6rub5D3iHZW5GEIl2aosz3XGd1RyEKHiUNHRCgUk0pvSdruqFS400QvrD0folhlwaDnrRF 9F6+JK58Pj7zlhZeWU0LolKMJJWOC90= X-MC-Unique: WAX7e0yBOMCc2sTdMb3sXQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 11/15] tests/qtest/ipmi-kcs: Fix assert side-effect Date: Wed, 2 Sep 2020 17:49:28 +0200 Message-Id: <20200902154932.390595-12-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 Fix assert side-effect reported by Coverity: /qemu/tests/qtest/ipmi-kcs-test.c: 84 in kcs_wait_obf() 83 while (IPMI_KCS_CMDREG_GET_OBF() =3D=3D 0) { >>> CID 1432368: Incorrect expression (ASSERT_SIDE_EFFECT) >>> Argument "--count" of g_assert() has a side effect. The containi= ng function might work differently in a non-debug build. 84 g_assert(--count !=3D 0); Reported-by: Coverity (CID 1432368) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200902080801.160652-2-philmd@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/ipmi-kcs-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/ipmi-kcs-test.c b/tests/qtest/ipmi-kcs-test.c index 693a6aacb5..fc0a918c8d 100644 --- a/tests/qtest/ipmi-kcs-test.c +++ b/tests/qtest/ipmi-kcs-test.c @@ -81,7 +81,8 @@ static void kcs_wait_obf(void) { unsigned int count =3D 1000; while (IPMI_KCS_CMDREG_GET_OBF() =3D=3D 0) { - g_assert(--count !=3D 0); + --count; + g_assert(count !=3D 0); } } =20 --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062274; cv=none; d=zohomail.com; s=zohoarc; b=IkOqAIr8aLrmWG0Py8EssG5dLS4TS6DtshkyIwHXRmsNJHjHu4+1JROEyhlOyekar5EobgzLFmhTcChUynocDJugarE8y8XhKRU0gYSHZCM4Sx/a56+3+Fn/IOkfvVFR8xDu7PWM43v45st66LzB8zB/iRA+6FF32pSxDJ2Z7MU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062274; h=Content-Type:Content-Transfer-Encoding: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=WurcLtOxKZy7mryFcAFa6BU1M+4+DESXhtik/tsc4Wg=; b=SWXHaDcmPRGOBPCvUDRdE66KcpmQ3UwxDEIEWZKL+aIQEqLTtWZOniV78EOSEXlsRCXmEEKkkIbZXhDsk3DmQji4JxGRWT20ZfZA/1WpBFwQ4D4426bAV1mUcMf8lniJat8JDPs1RKp9faGBT0GPWAGVUFpZ1aRYxVYNCii/4p8= 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 1599062274983699.2822381112177; Wed, 2 Sep 2020 08:57:54 -0700 (PDT) Received: from localhost ([::1]:46674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDV90-0002uf-5g for importer@patchew.org; Wed, 02 Sep 2020 11:57:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1P-0001Cd-KT for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36413 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 1kDV1N-0005Tu-Cy for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:03 -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-357-Cr2ZcV6-Pu6FRGv-ymZ9_g-1; Wed, 02 Sep 2020 11:49:56 -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 375B6425D4; Wed, 2 Sep 2020 15:49:55 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EE1A5D9CC; Wed, 2 Sep 2020 15:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WurcLtOxKZy7mryFcAFa6BU1M+4+DESXhtik/tsc4Wg=; b=cxFLv/W8qszUQnjeUfXUXOIuT9kU6/tsv7Y2jkYnwRrz7sD9UR9WJL4vQHWHmg+o67djiG GNt3dUGN5GHEjA+lBX3OwDRL+pRrxF+sUeuOYrY7Y9ZWuSzYC7K/Q9+azNCMMsvGVj+eCG YjuJTTm6J2/XWKhYwGXwJ16yVuntpJ0= X-MC-Unique: Cr2ZcV6-Pu6FRGv-ymZ9_g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 12/15] libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref() Date: Wed, 2 Sep 2020 17:49:29 +0200 Message-Id: <20200902154932.390595-13-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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=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/02 02:07:24 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Markus Armbruster qmp_assert_error_class() does more than just assert: it also unrefs the @rsp argument. Rename to qmp_expect_error_and_unref() to reduce confusion. Signed-off-by: Markus Armbruster Message-Id: <20200902115733.1229537-1-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- tests/qtest/drive_del-test.c | 2 +- tests/qtest/libqos/libqtest.h | 4 ++-- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-cmd-test.c | 16 ++++++++-------- tests/qtest/qmp-test.c | 32 ++++++++++++++++---------------- tests/test-qga.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c index 2ab11ad225..2d765865ce 100644 --- a/tests/qtest/drive_del-test.c +++ b/tests/qtest/drive_del-test.c @@ -103,7 +103,7 @@ static void test_after_failed_device_add(void) " 'drive': 'drive0'" "}}", driver); g_assert(response); - qmp_assert_error_class(response, "GenericError"); + qmp_expect_error_and_unref(response, "GenericError"); =20 /* Delete the drive */ drive_del(qts); diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h index f5cf93c386..a6ee1654f2 100644 --- a/tests/qtest/libqos/libqtest.h +++ b/tests/qtest/libqos/libqtest.h @@ -704,13 +704,13 @@ void qtest_qmp_device_del(QTestState *qts, const char= *id); bool qmp_rsp_is_err(QDict *rsp); =20 /** - * qmp_assert_error_class: + * qmp_expect_error_and_unref: * @rsp: QMP response to check for error * @class: an error class * * Assert the response has the given error class and discard @rsp. */ -void qmp_assert_error_class(QDict *rsp, const char *class); +void qmp_expect_error_and_unref(QDict *rsp, const char *class); =20 /** * qtest_probe_child: diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 26f1223642..58f58e1ece 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -1359,7 +1359,7 @@ bool qmp_rsp_is_err(QDict *rsp) return !!error; } =20 -void qmp_assert_error_class(QDict *rsp, const char *class) +void qmp_expect_error_and_unref(QDict *rsp, const char *class) { QDict *error =3D qdict_get_qdict(rsp, "error"); =20 diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index f34e68858a..3109a9fe96 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -210,19 +210,19 @@ static void test_object_add_failure_modes(void) resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" " {'qom-type': 'memory-backend-ram', 'id': 'ram1' } }= "); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* attempt to create an object without qom-type */ resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" " {'id': 'ram1' } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* attempt to delete an object that does not exist */ resp =3D qtest_qmp(qts, "{'execute': 'object-del', 'arguments':" " {'id': 'ram1' } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* attempt to create 2 objects with duplicate id */ resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" @@ -236,7 +236,7 @@ static void test_object_add_failure_modes(void) " {'qom-type': 'memory-backend-ram', 'id': 'ram1'," " 'props': {'size': 1048576 } } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* delete ram1 object */ resp =3D qtest_qmp(qts, "{'execute': 'object-del', 'arguments':" @@ -251,7 +251,7 @@ static void test_object_add_failure_modes(void) " 'props': {'size': '1048576' } } }"); g_assert_nonnull(resp); /* now do it right */ - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" " {'qom-type': 'memory-backend-ram', 'id': 'ram1'," @@ -272,7 +272,7 @@ static void test_object_add_failure_modes(void) " {'qom-type': 'memory-backend-ram'," " 'props': {'size': 1048576 } } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* now do it right */ resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" @@ -294,7 +294,7 @@ static void test_object_add_failure_modes(void) " {'qom-type': 'memory-backend-ram', 'id': 'ram1'," " 'props': {'sized': 1048576 } } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* now do it right */ resp =3D qtest_qmp(qts, "{'execute': 'object-add', 'arguments':" @@ -321,7 +321,7 @@ static void test_object_add_failure_modes(void) resp =3D qtest_qmp(qts, "{'execute': 'object-del', 'arguments':" " {'id': 'ram1' } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 qtest_quit(qts); } diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c index 5950c3ebbb..e1032c5a21 100644 --- a/tests/qtest/qmp-test.c +++ b/tests/qtest/qmp-test.c @@ -38,7 +38,7 @@ static void assert_recovered(QTestState *qts) QDict *resp; =20 resp =3D qtest_qmp(qts, "{ 'execute': 'no-such-cmd' }"); - qmp_assert_error_class(resp, "CommandNotFound"); + qmp_expect_error_and_unref(resp, "CommandNotFound"); } =20 static void test_malformed(QTestState *qts) @@ -48,58 +48,58 @@ static void test_malformed(QTestState *qts) /* syntax error */ qtest_qmp_send_raw(qts, "{]\n"); resp =3D qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); assert_recovered(qts); =20 /* lexical error: impossible byte outside string */ qtest_qmp_send_raw(qts, "{\xFF"); resp =3D qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); assert_recovered(qts); =20 /* lexical error: funny control character outside string */ qtest_qmp_send_raw(qts, "{\x01"); resp =3D qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); assert_recovered(qts); =20 /* lexical error: impossible byte in string */ qtest_qmp_send_raw(qts, "{'bad \xFF"); resp =3D qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); assert_recovered(qts); =20 /* lexical error: control character in string */ qtest_qmp_send_raw(qts, "{'execute': 'nonexistent', 'id':'\n"); resp =3D qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); assert_recovered(qts); =20 /* lexical error: interpolation */ qtest_qmp_send_raw(qts, "%%p"); resp =3D qtest_qmp_receive(qts); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); assert_recovered(qts); =20 /* Not even a dictionary */ resp =3D qtest_qmp(qts, "null"); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* No "execute" key */ resp =3D qtest_qmp(qts, "{}"); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* "execute" isn't a string */ resp =3D qtest_qmp(qts, "{ 'execute': true }"); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* "arguments" isn't a dictionary */ resp =3D qtest_qmp(qts, "{ 'execute': 'no-such-cmd', 'arguments': [] }= "); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 /* extra key */ resp =3D qtest_qmp(qts, "{ 'execute': 'no-such-cmd', 'extra': true }"); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); } =20 static void test_qmp_protocol(void) @@ -121,7 +121,7 @@ static void test_qmp_protocol(void) =20 /* Test valid command before handshake */ resp =3D qtest_qmp(qts, "{ 'execute': 'query-version' }"); - qmp_assert_error_class(resp, "CommandNotFound"); + qmp_expect_error_and_unref(resp, "CommandNotFound"); =20 /* Test malformed commands before handshake */ test_malformed(qts); @@ -134,7 +134,7 @@ static void test_qmp_protocol(void) =20 /* Test repeated handshake */ resp =3D qtest_qmp(qts, "{ 'execute': 'qmp_capabilities' }"); - qmp_assert_error_class(resp, "CommandNotFound"); + qmp_expect_error_and_unref(resp, "CommandNotFound"); =20 /* Test valid command */ resp =3D qtest_qmp(qts, "{ 'execute': 'query-version' }"); @@ -154,7 +154,7 @@ static void test_qmp_protocol(void) /* Test command failure with 'id' */ resp =3D qtest_qmp(qts, "{ 'execute': 'human-monitor-command', 'id': 2= }"); g_assert_cmpint(qdict_get_int(resp, "id"), =3D=3D, 2); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); =20 qtest_quit(qts); } @@ -327,7 +327,7 @@ static void test_qmp_missing_any_arg(void) resp =3D qtest_qmp(qts, "{'execute': 'qom-set', 'arguments':" " { 'path': '/machine', 'property': 'rtc-time' } }"); g_assert_nonnull(resp); - qmp_assert_error_class(resp, "GenericError"); + qmp_expect_error_and_unref(resp, "GenericError"); qtest_quit(qts); } =20 diff --git a/tests/test-qga.c b/tests/test-qga.c index 4ac4c22109..65d7992edc 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -246,7 +246,7 @@ static void test_qga_invalid_oob(gconstpointer fix) ret =3D qmp_fd(fixture->fd, "{'exec-oob': 'guest-ping'}"); g_assert_nonnull(ret); =20 - qmp_assert_error_class(ret, "GenericError"); + qmp_expect_error_and_unref(ret, "GenericError"); } =20 static void test_qga_invalid_args(gconstpointer fix) --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062338; cv=none; d=zohomail.com; s=zohoarc; b=Tpl1+8AQ8W75q3C2IO91b9UNsvK5N4/WLFtoMIiJB8PdFT3iZmwGFRW39tPNxhmdP2g8rmwfyYxqZyVjJZ4/sTGsVvO7DiWO5iv6IrvQZ4EKclEUL80dySAJXm0F4woSUWh+C1fENBsB1RXbiDXB3BESVb5ZZ1fNLO4Ma09xXTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062338; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=uArgolhOjF5ZWs4AQePvKXSJB9ZggBrCPlGecRWiG2E=; b=CbBKL63Jq/e1ZVOoeRTXtj+M7bReMXG2VaXK/XLMfaYtUVUEpsVoO+0CEExDEOUvbz91/CMOmYS+0tXD1Ah7rp2zbSZ1XQghRnnpFg1oDw+81OjrzCM2MVNAovq7s+8pEGK11VDfCFhaBvrFz58r0QqU5lOril7744E4ICBA1pE= 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 159906233851580.11166785213516; Wed, 2 Sep 2020 08:58:58 -0700 (PDT) Received: from localhost ([::1]:52368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVA1-0005IC-OX for importer@patchew.org; Wed, 02 Sep 2020 11:58:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1P-0001Bs-5z for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24233 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 1kDV1N-0005Ts-7d for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:02 -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-451-gcnGVU8QOZ-eVYWMg3w_oQ-1; Wed, 02 Sep 2020 11:49:57 -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 6F732425E7; Wed, 2 Sep 2020 15:49:56 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9785E5D9CC; Wed, 2 Sep 2020 15:49:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=uArgolhOjF5ZWs4AQePvKXSJB9ZggBrCPlGecRWiG2E=; b=U7TX3QrVYGTNEX3Y7m9exGeM/xloneQSSu8+yJq/X47gTrzia31JwkuB4kpaOxif4mFCM/ nRE8ugYL9+gcJGPdc/3HhlObcbpAoNoL0BmIyy0h3k2u154sQ8uRVWp/VsSokVjvvqZN8C MYb0XUJnu5SZTaOeBEiyLb8yTmLhF3Q= X-MC-Unique: gcnGVU8QOZ-eVYWMg3w_oQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 13/15] gitlab/travis: Rework the disabled features tests Date: Wed, 2 Sep 2020 17:49:30 +0200 Message-Id: <20200902154932.390595-14-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 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: , 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" Let's focus on the gitlab-ci when testing the compilation with disabled features, thus add more switches there (and while we're at it, sort them also alphabetically). This should cover the test from the Travis CI now, too, so that we can remove the now-redundant job from the Travis CI. Message-Id: <20200806155306.13717-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 26 +++++++++++++++++++------- .travis.yml | 6 ------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7967b9a13..8ae3e31c3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,13 +190,25 @@ build-disabled: <<: *native_build_job_definition variables: IMAGE: fedora - CONFIGURE_ARGS: --disable-rdma --disable-slirp --disable-curl - --disable-capstone --disable-live-block-migration --disable-glusterfs - --disable-replication --disable-coroutine-pool --disable-smartcard - --disable-guest-agent --disable-curses --disable-libxml2 --disable-t= pm - --disable-qom-cast-debug --disable-spice --disable-vhost-vsock - --disable-vhost-net --disable-vhost-crypto --disable-vhost-user - TARGETS: i386-softmmu ppc64-softmmu mips64-softmmu i386-linux-user + CONFIGURE_ARGS: --disable-attr --disable-avx2 --disable-bochs + --disable-brlapi --disable-bzip2 --disable-cap-ng --disable-capstone + --disable-cloop --disable-coroutine-pool --disable-curl --disable-cu= rses + --disable-dmg --disable-docs --disable-glusterfs --disable-gnutls + --disable-gtk --disable-guest-agent --disable-iconv --disable-kvm + --disable-libiscsi --disable-libpmem --disable-libssh --disable-libu= sb + --disable-libxml2 --disable-linux-aio --disable-live-block-migration + --disable-lzo --disable-malloc-trim --disable-mpath --disable-nettle + --disable-numa --disable-parallels --disable-pie --disable-qcow1 + --disable-qed --disable-qom-cast-debug --disable-rbd --disable-rdma + --disable-replication --disable-sdl --disable-seccomp --disable-shee= pdog + --disable-slirp --disable-smartcard --disable-snappy --disable-spice + --disable-strip --disable-tpm --disable-usb-redir --disable-vdi + --disable-vhost-crypto --disable-vhost-net --disable-vhost-scsi + --disable-vhost-user --disable-vhost-vdpa --disable-vhost-vsock + --disable-virglrenderer --disable-vnc --disable-vte --disable-vvfat + --disable-xen --disable-zstd + TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu + s390x-softmmu i386-linux-user MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow =20 build-tcg-disabled: diff --git a/.travis.yml b/.travis.yml index 6695c0620f..1d0ade0a13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -159,12 +159,6 @@ jobs: - CONFIG=3D"--enable-debug-tcg --disable-system" - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-debug-tcg" =20 - - - name: "GCC some libs disabled (main-softmmu)" - env: - - CONFIG=3D"--disable-linux-aio --disable-cap-ng --disable-attr --= disable-brlapi --disable-libusb --disable-replication --target-list=3D${MAI= N_SOFTMMU_TARGETS}" - - # Module builds are mostly of interest to major distros - name: "GCC modules (main-softmmu)" env: --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062428; cv=none; d=zohomail.com; s=zohoarc; b=X6pZV7zp/ua+zMPq4koA+jXALPxjMPpVV3IiBrs4/QcOGJVV1wuaaBWSD+5Ez4POEJ9C+w7MLLsz/5Il6tzg6PbS/k0bO7iUQju0Gu4Cn8S748ldvH38C1mH19iS2gU99QTZxLbMPBG25SUgGGO6OV4vmpInINvtCMsivAtJwhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062428; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=DLKnJJlqyxKlTxPdWtjq8QMe68+OdMuREqKFecQvsfU=; b=i3ytmZ5fCTUO+2wWhow6bc5BqRZXyVhm2+QtIwLiS3mqmiEu94p1pdoBVXrj3+rZF/flZLHiycoIi0PDCKYwxzpT+Z4XyyjqC2j5Yw8Vqjx+0tuY4etCzdsjg5a/WsxdDKijbuoyHrIm25wZlTvigM6vhhb33mGM4b/zFtfmRpE= 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 1599062428916980.3398818328351; Wed, 2 Sep 2020 09:00:28 -0700 (PDT) Received: from localhost ([::1]:58282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVBS-0007mq-KJ for importer@patchew.org; Wed, 02 Sep 2020 12:00:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1Q-0001Ee-ET for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:04 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:60574 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 1kDV1N-0005U0-Rl for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:04 -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-456-DlmhCj00Pq2xBAq2lqi_qg-1; Wed, 02 Sep 2020 11:49: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 A770C807356; Wed, 2 Sep 2020 15:49:57 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF35E5D9CC; Wed, 2 Sep 2020 15:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=DLKnJJlqyxKlTxPdWtjq8QMe68+OdMuREqKFecQvsfU=; b=aOvvPrlD0E3T8kN8iAmcs7oKxkFU+SMxW1uCUHC0UCqQe0AKCUBIu0Qs6DV9Sa7Tc0hFSL Bs6jOXqqKf+Vm1UtnAUX0f66VAkl5/heOmlUNRN10i3hIhB7Wm9ZS2dHXzVGsZwMkpX8JU 5TVElVcNQfJ/ffYc6mKIEXRSXICqlCA= X-MC-Unique: DlmhCj00Pq2xBAq2lqi_qg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 14/15] gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job Date: Wed, 2 Sep 2020 17:49:31 +0200 Message-Id: <20200902154932.390595-15-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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=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/02 03:24:55 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: , 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" The fuzzer job finishes quite early, so we can run the unit tests and qtests with -fsanitize=3Daddress here without extending the total test time. Message-Id: <20200831153228.229185-1-thuth@redhat.com> Reviewed-by: Alexander Bulekov Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ae3e31c3f..5f2964a85e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,13 +255,15 @@ build-oss-fuzz: - mkdir build-oss-fuzz - CC=3D"clang" CXX=3D"clang++" CFLAGS=3D"-fsanitize=3Daddress" ./scripts/oss-fuzz/build.sh + - export ASAN_OPTIONS=3D"fast_unwind_on_malloc=3D0" - for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f | grep -v slirp); do grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || contin= ue ; echo Testing ${fuzzer} ... ; - ASAN_OPTIONS=3D"fast_unwind_on_malloc=3D0" - "${fuzzer}" -runs=3D1000 -seed=3D1 || exit 1 ; + "${fuzzer}" -runs=3D1000 -seed=3D1 || exit 1 ; done + # Unrelated to fuzzer: run some tests with -fsanitize=3Daddress + - cd build-oss-fuzz && make check-qtest-i386 check-unit =20 build-tci: <<: *native_build_job_definition --=20 2.18.2 From nobody Sun Nov 16 05:58:59 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=1599062562; cv=none; d=zohomail.com; s=zohoarc; b=dZAmLo/9RB+eBSR4xXDVScARwS/g+wPCd4sNTLsNbyVkIyNss0WcCqeM/xcuiFUpoPDRLI2McuAH38wfsSb1Z4Qo8faw7wltxkd600zXMcHVlTbPi+8tK+tNfTlnNgTrLz64CS5RjERvEi1EblrXT/U4yv9abgkpzvzXQpyE1o8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599062562; h=Content-Type:Content-Transfer-Encoding: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=60SKvN5b0Yga0q3rxcryWjErNLgIVr17FoYTDdlTYSU=; b=QcC2lobeGTSK4H4wsfTcQGJukYE2nyIFfFcJW/JlXSftxg7ikG3j4PvorxyCS7YYfX853Mntjf/d5fjVcMkGM22Oof4C6erBKkV1wo5gmN28kF+/FzUk49LB0HPLWHrWILWYNpMwLG0oFLH2uBNIOLXJHtR90TyvQ4hcO2uo8fg= 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 1599062562932872.0039845610642; Wed, 2 Sep 2020 09:02:42 -0700 (PDT) Received: from localhost ([::1]:37494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVDd-00032S-Ef for importer@patchew.org; Wed, 02 Sep 2020 12:02:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDV1V-0001MV-OP for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53141 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 1kDV1T-0005UL-0i for qemu-devel@nongnu.org; Wed, 02 Sep 2020 11:50: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-439-I66rbyCjOXSY8pQEQsiURw-1; Wed, 02 Sep 2020 11:49: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 C7B2480046A; Wed, 2 Sep 2020 15:49:58 +0000 (UTC) Received: from thuth.com (ovpn-112-129.ams2.redhat.com [10.36.112.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 125C25D9CC; Wed, 2 Sep 2020 15:49:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=60SKvN5b0Yga0q3rxcryWjErNLgIVr17FoYTDdlTYSU=; b=XqcGZf4tAJczycGR9KqqXiQcStTNnNkMe1uxjueLBCDZljkXFL1uQOqYjAwihywAy9e0pb iX1+SgOPOfaVxIQOgbISFzro3y+XA7J8/ZyovYWRGGf8hCQTj1EqhtWPG2/8zdBWkcAKFf YYpeS0CyX0C5UE++9CVNLKSWPudroS0= X-MC-Unique: I66rbyCjOXSY8pQEQsiURw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL v2 15/15] gitlab-ci.yml: Set artifacts expiration time Date: Wed, 2 Sep 2020 17:49:32 +0200 Message-Id: <20200902154932.390595-16-thuth@redhat.com> In-Reply-To: <20200902154932.390595-1-thuth@redhat.com> References: <20200902154932.390595-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/02 02:07:24 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) The default expiration time for artifacts seems to be very high (30 days?). Since we only need the artifacts to pass the binaries from one stage to the next one, we can decrease the expiration time to avoid to spam the file server too much. Two days should be enough in case someone still wants to have a look after the pipeline finished. Message-Id: <20200806161546.15325-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f2964a85e..ff959e4e03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,6 +74,7 @@ build-system-ubuntu: moxie-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build artifacts: + expire_in: 2 days paths: - build =20 @@ -104,6 +105,7 @@ build-system-debian: riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build artifacts: + expire_in: 2 days paths: - build =20 @@ -134,6 +136,7 @@ build-system-fedora: xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu MAKE_CHECK_ARGS: check-build artifacts: + expire_in: 2 days paths: - build =20 @@ -164,6 +167,7 @@ build-system-centos: x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build artifacts: + expire_in: 2 days paths: - build =20 --=20 2.18.2