From nobody Thu May 2 18:22:17 2024 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=1630587485; cv=none; d=zohomail.com; s=zohoarc; b=CedttYqMVJxBzB9wxxXuK3bUKant0vJTejLYUa4hzTdIvL5+aWo3+rmnsUxjO/9IiuUAXabp71XENG9NLUpSnaYoFbvd8XKD+mcmXK6wntEvrV3904RHLSec6d9qXloyTVUHdxxj+h7Vk71g93lujw53B6ODXNJgds1Josk7Ks4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587485; 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=x1XKetSn7zGWk6BbknG6wzhcjHofX8CpmP6t2I8CKMo=; b=fhi0SjkHKRT02o/FEjFDUTbhjJW2rGr73g14trl0+6pHoHxNevsb0dogMbTn+glivRZS0zt7zhVlgrPLhJXvjjz3rUdIPZhEkCu+khUIJaaQnpil4EIFfc2RXM8jufgUs8jZopB3SFhwDDAzhims/Fe7iJV9NK3Z13+mPD3TmIs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630587485577995.9154010208324; Thu, 2 Sep 2021 05:58:05 -0700 (PDT) Received: from localhost ([::1]:46146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmI8-0005xR-JT for importer@patchew.org; Thu, 02 Sep 2021 08:58:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9q-00056j-Oh for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9m-00072G-GL for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:29 -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-297-77_DeY3eOHqZAdgJE4XpOw-1; Thu, 02 Sep 2021 08:49:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE77B835DE1; Thu, 2 Sep 2021 12:49:20 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F384310016F2; Thu, 2 Sep 2021 12:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586965; 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=x1XKetSn7zGWk6BbknG6wzhcjHofX8CpmP6t2I8CKMo=; b=d21dxVj77PCiHeHpWGOPfYfJggarKf29QX/4rcRAmW4wvkSeJhrB2DmyN4bObP/lkcpyUn o7++1lrtDUXsgwdV+hCtg1zQhYRpk6Ouhpv3CjM+bhpXp51jEXanzrbsjoUjthSz6Kro/Z nqLT+gC5chv3dpZ0EGkXeWUUt6Ynf5M= X-MC-Unique: 77_DeY3eOHqZAdgJE4XpOw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 01/13] docs: add definitions of terms for CI/testing Date: Thu, 2 Sep 2021 14:48:59 +0200 Message-Id: <20210902124911.822423-2-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587486224100001 From: Willian Rampazzo To understand the current state of QEMU CI/testing and have a base to discuss the plans for the future, it is important to define some usual terms. This patch defines the terms for "Automated tests", "Unit testing", "Functional testing", "System testing", "Flaky tests", "Gating", and "Continuous Integration". Signed-off-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210831152939.97570-2-willianr@redhat.com> Signed-off-by: Thomas Huth --- docs/devel/ci-definitions.rst | 121 ++++++++++++++++++++++++++++++++++ docs/devel/ci.rst | 1 + 2 files changed, 122 insertions(+) create mode 100644 docs/devel/ci-definitions.rst diff --git a/docs/devel/ci-definitions.rst b/docs/devel/ci-definitions.rst new file mode 100644 index 0000000000..32e22ff468 --- /dev/null +++ b/docs/devel/ci-definitions.rst @@ -0,0 +1,121 @@ +Definition of terms +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This section defines the terms used in this document and correlates them w= ith +what is currently used on QEMU. + +Automated tests +--------------- + +An automated test is written on a test framework using its generic test +functions/classes. The test framework can run the tests and report their +success or failure [1]_. + +An automated test has essentially three parts: + +1. The test initialization of the parameters, where the expected parameter= s, + like inputs and expected results, are set up; +2. The call to the code that should be tested; +3. An assertion, comparing the result from the previous call with the expe= cted + result set during the initialization of the parameters. If the result + matches the expected result, the test has been successful; otherwise, i= t has + failed. + +Unit testing +------------ + +A unit test is responsible for exercising individual software components a= s a +unit, like interfaces, data structures, and functionality, uncovering erro= rs +within the boundaries of a component. The verification effort is in the +smallest software unit and focuses on the internal processing logic and da= ta +structures. A test case of unit tests should be designed to uncover errors= due +to erroneous computations, incorrect comparisons, or improper control flow= [2]_. + +On QEMU, unit testing is represented by the 'check-unit' target from 'make= '. + +Functional testing +------------------ + +A functional test focuses on the functional requirement of the software. +Deriving sets of input conditions, the functional tests should fully exerc= ise +all the functional requirements for a program. Functional testing is +complementary to other testing techniques, attempting to find errors like +incorrect or missing functions, interface errors, behavior errors, and +initialization and termination errors [3]_. + +On QEMU, functional testing is represented by the 'check-qtest' target from +'make'. + +System testing +-------------- + +System tests ensure all application elements mesh properly while the overa= ll +functionality and performance are achieved [4]_. Some or all system compon= ents +are integrated to create a complete system to be tested as a whole. System +testing ensures that components are compatible, interact correctly, and +transfer the right data at the right time across their interfaces. As syst= em +testing focuses on interactions, use case-based testing is a practical app= roach +to system testing [5]_. Note that, in some cases, system testing may requi= re +interaction with third-party software, like operating system images, datab= ases, +networks, and so on. + +On QEMU, system testing is represented by the 'check-acceptance' target fr= om +'make'. + +Flaky tests +----------- + +A flaky test is defined as a test that exhibits both a passing and a faili= ng +result with the same code on different runs. Some usual reasons for an +intermittent/flaky test are async wait, concurrency, and test order depend= ency +[6]_. + +Gating +------ + +A gate restricts the move of code from one stage to another on a +test/deployment pipeline. The step move is granted with approval. The appr= oval +can be a manual intervention or a set of tests succeeding [7]_. + +On QEMU, the gating process happens during the pull request. The approval = is +done by the project leader running its own set of tests. The pull request = gets +merged when the tests succeed. + +Continuous Integration (CI) +--------------------------- + +Continuous integration (CI) requires the builds of the entire application = and +the execution of a comprehensive set of automated tests every time there i= s a +need to commit any set of changes [8]_. The automated tests can be compose= d of +the unit, functional, system, and other tests. + +Keynotes about continuous integration (CI) [9]_: + +1. System tests may depend on external software (operating system images, + firmware, database, network). +2. It may take a long time to build and test. It may be impractical to bui= ld + the system being developed several times per day. +3. If the development platform is different from the target platform, it m= ay + not be possible to run system tests in the developer=E2=80=99s private = workspace. + There may be differences in hardware, operating system, or installed + software. Therefore, more time is required for testing the system. + +References +---------- + +.. [1] Sommerville, Ian (2016). Software Engineering. p. 233. +.. [2] Pressman, Roger S. & Maxim, Bruce R. (2020). Software Engineering, + A Practitioner=E2=80=99s Approach. p. 48, 376, 378, 381. +.. [3] Pressman, Roger S. & Maxim, Bruce R. (2020). Software Engineering, + A Practitioner=E2=80=99s Approach. p. 388. +.. [4] Pressman, Roger S. & Maxim, Bruce R. (2020). Software Engineering, + A Practitioner=E2=80=99s Approach. Software Engineering, p. 377. +.. [5] Sommerville, Ian (2016). Software Engineering. p. 59, 232, 240. +.. [6] Luo, Qingzhou, et al. An empirical analysis of flaky tests. + Proceedings of the 22nd ACM SIGSOFT International Symposium on + Foundations of Software Engineering. 2014. +.. [7] Humble, Jez & Farley, David (2010). Continuous Delivery: + Reliable Software Releases Through Build, Test, and Deployment, p. = 122. +.. [8] Humble, Jez & Farley, David (2010). Continuous Delivery: + Reliable Software Releases Through Build, Test, and Deployment, p. = 55. +.. [9] Sommerville, Ian (2016). Software Engineering. p. 743. diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst index a6a650968b..8d95247188 100644 --- a/docs/devel/ci.rst +++ b/docs/devel/ci.rst @@ -8,5 +8,6 @@ found at:: =20 https://wiki.qemu.org/Testing/CI =20 +.. include:: ci-definitions.rst .. include:: ci-jobs.rst .. include:: ci-runners.rst --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630587990; cv=none; d=zohomail.com; s=zohoarc; b=TmER7DCluvSW5yV8pW/DxZXmH0uL/MGAcHFGKHPEjnye9nINsgUqK03NpUqM30WuTkI2lntlMhBa+ypZ1E6sHsS9gXUhuUJ9ZgQTz0HR7NANFvWEvrt1gG4U/VkW30JcjJTxmT7vvYhRQzDXxv4uGjxdV40TRsLVhkxgCxRgxH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587990; 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=jZoEtknywEr55vZIll6RtNUrJPiXr8V7DhCpfJfCvRk=; b=B5pXgjL6A5IBTajWKLHimmpuHDOO7YYzPzfU+w9gclLAtI6x946ssr9SJD3WFnxpYAk9taUhiFLmGa2zxHf1N2XRkAVn6f8Vtd5dUig9mKzDsH6HntJzinmaGD6U7a3anpvCeoOzJNj/9D/4OQV4by7abgRzX1dL7OzV5asO7KQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630587989717220.63908126134493; Thu, 2 Sep 2021 06:06:29 -0700 (PDT) Received: from localhost ([::1]:39088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmQF-0004tQ-5q for importer@patchew.org; Thu, 02 Sep 2021 09:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9q-00056H-28 for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9l-000723-7r for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:28 -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-252-9EG5wXiLMMCnfjhkjGIVmw-1; Thu, 02 Sep 2021 08:49:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10E231940926; Thu, 2 Sep 2021 12:49:22 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F16010016F2; Thu, 2 Sep 2021 12:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586964; 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=jZoEtknywEr55vZIll6RtNUrJPiXr8V7DhCpfJfCvRk=; b=Zk3cEY9Dx5vXwI90fNholsweaSqlWHqDCeJw+Cv0li24Hdg1y+lITp+jpOg4K/JHqc5Ffs YP3u+MGNzkNcqk3C+F9EFPjptKZ8wxTHT30bOO5Qe1RLIKzkf8ww4HQP0ExAFh000qysuZ uHfty5AZZ8RldquPfeNmX2mMxpr4VV8= X-MC-Unique: 9EG5wXiLMMCnfjhkjGIVmw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 02/13] libqtest: check for g_setenv() failure Date: Thu, 2 Sep 2021 14:49:00 +0200 Message-Id: <20210902124911.822423-3-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587991404100001 From: Peter Maydell g_setenv() can fail; check for it when starting a QEMU process when we set the QEMU_AUDIO_DRV environment variable. Because this happens after fork() reporting an exact message via printf() is a bad idea; just exit(1), as we already do for the case of execlp() failure. Fixes: Coverity CID 1460117 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210820163750.9106-1-peter.maydell@linaro.org> Signed-off-by: Thomas Huth --- tests/qtest/libqtest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 825b13a44c..73f6b977a6 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -301,7 +301,9 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) s->expected_status =3D 0; s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { - g_setenv("QEMU_AUDIO_DRV", "none", true); + if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) { + exit(1); + } execlp("/bin/sh", "sh", "-c", command, NULL); exit(1); } --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630587788; cv=none; d=zohomail.com; s=zohoarc; b=O5S2wwuERspHphbsOk/3XnkGjl9S1qy7M5J5574/kliDGnXmGqCKesUcLRZYMmugnRD0qm3gIDH62twF+dlWa7Eh97Gc9OGYZQ2xpyVAhqsc51rbGyBNF7alNgR7dYuLJJo1k/b0Npsb2UweA6BLswuRcA89lKKe8dmFYyig0wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587788; 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=kvSGLmDQoJCOY+GW0INvLdpixURESMkqGYcc41wCcOM=; b=Z8H66iAc6/ZvpBQ//Dgdw8BgnnJ853AmjZ585x/M5eZfGAxA+oWIqpUNmSFkXtV0LX+3Gc7gm6d8mMqhafOJBh2jVJ3wzp9oJMvATKD5HF74T1EleRQuVNOQ45BhqMLQG3yUJm/LcTIROKmXS4AqdwAABYD3NOvRGfOxnuZxcTE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630587788760529.7252467451219; Thu, 2 Sep 2021 06:03:08 -0700 (PDT) Received: from localhost ([::1]:59060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmN1-0007Al-9r for importer@patchew.org; Thu, 02 Sep 2021 09:03:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9q-00056l-PP for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9o-00072g-55 for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:30 -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-509-Wf1k3AamN-GcJV5q6M1Ydw-1; Thu, 02 Sep 2021 08:49:24 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B6EF107ACCD; Thu, 2 Sep 2021 12:49:23 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6836510016F2; Thu, 2 Sep 2021 12:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586967; 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=kvSGLmDQoJCOY+GW0INvLdpixURESMkqGYcc41wCcOM=; b=fhj4uHXPVHfUezIe578kERUzvGMiA9M9eC+hPk//iEwbkVUn4EU7SXJCys4TUqth30PrGV DsIbphdChL4czj30gmXQsNfAhSQd5WvxctqtHAW+v0GjcnaQgtCxAav8fHwboRUO+4lbNJ ihQifYI5dJfZkQr7wTlXcZ844uILKAE= X-MC-Unique: Wf1k3AamN-GcJV5q6M1Ydw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/13] gitlab-ci: Merge "build-disabled" with "build-without-default-features" Date: Thu, 2 Sep 2021 14:49:01 +0200 Message-Id: <20210902124911.822423-4-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587799404100001 Content-Type: text/plain; charset="utf-8" Both jobs are testing more or less the same thing (building QEMU with features disabled), so we are wasting precious CI cycles here by doing this twice. Merge the jobs by using --without-default-features by default and just adding some additional --disable-... switches which are not covered by the generic switch (yet). And while we're at it, also test compilation with "--disable-fdt" (which forces us to change the list of targets in this job, though, since some targets do not work without fdt). Message-Id: <20210730143809.717079-2-thuth@redhat.com> Reviewed-by: Willian Rampazzo Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 97 +++++--------------------------------- 1 file changed, 13 insertions(+), 84 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 903ee65f32..f390f98044 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -202,85 +202,6 @@ acceptance-system-opensuse: MAKE_CHECK_ARGS: check-acceptance =20 =20 -build-disabled: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: - --disable-attr - --disable-auth-pam - --disable-avx2 - --disable-bochs - --disable-brlapi - --disable-bzip2 - --disable-cap-ng - --disable-capstone - --disable-cloop - --disable-coroutine-pool - --disable-curl - --disable-curses - --disable-dmg - --disable-docs - --disable-gcrypt - --disable-glusterfs - --disable-gnutls - --disable-gtk - --disable-guest-agent - --disable-iconv - --disable-keyring - --disable-kvm - --disable-libiscsi - --disable-libpmem - --disable-libssh - --disable-libudev - --disable-libusb - --disable-libxml2 - --disable-linux-aio - --disable-live-block-migration - --disable-lzo - --disable-malloc-trim - --disable-mpath - --disable-nettle - --disable-numa - --disable-opengl - --disable-parallels - --disable-pie - --disable-qcow1 - --disable-qed - --disable-qom-cast-debug - --disable-rbd - --disable-rdma - --disable-replication - --disable-sdl - --disable-seccomp - --disable-slirp - --disable-smartcard - --disable-snappy - --disable-sparse - --disable-spice - --disable-strip - --disable-tpm - --disable-usb-redir - --disable-vdi - --disable-vhost-crypto - --disable-vhost-net - --disable-vhost-scsi - --disable-vhost-kernel - --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 - # This jobs explicitly disable TCG (--disable-tcg), KVM is detected by # the configure script. The container doesn't contain Xen headers so # Xen accelerator is not detected / selected. As result it build the @@ -649,12 +570,20 @@ build-without-default-devices: build-without-default-features: extends: .native_build_job_template needs: - job: amd64-debian-container + job: amd64-fedora-container variables: - IMAGE: debian-amd64 - CONFIGURE_ARGS: --without-default-features --disable-user - --target-list-exclude=3Darm-softmmu,i386-softmmu,mipsel-softmmu,mi= ps64-softmmu,ppc-softmmu - MAKE_CHECK_ARGS: check-unit + IMAGE: fedora + CONFIGURE_ARGS: + --without-default-features + --disable-capstone + --disable-fdt + --disable-pie + --disable-qom-cast-debug + --disable-slirp + --disable-strip + TARGETS: avr-softmmu i386-softmmu mips64-softmmu s390x-softmmu sh4-sof= tmmu + sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user + MAKE_CHECK_ARGS: check-unit check-qtest SPEED=3Dslow =20 build-libvhost-user: stage: build --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630587590; cv=none; d=zohomail.com; s=zohoarc; b=LQjp4ZXExP/5yoZvRq+TF3K8imdFZyV7fC3iyJratfd68qyFa+pSY/bCPczPKInbsEaEBjO87aRvWLl15Ix/9oo+6hlwImB9JIZhrdS3TWal8+LJOmVynz7j4hhE/mrXn2FE8O8sPNjoIPds8Y1WghB7asz/M1kGE0NNxcunf5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587590; 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=HIRw8DY7nnTYNZWJCLDMI9ZQHGgEl1hGH6MtNAepgUE=; b=VwSuCA6cYHks8k4JHiYxa87pmCYIz+U15zpadNF427pi6L8+Gp3qyoGgKNKECqo6AZx6MtfDSaNahJkVsjYUIk5DAJj6963Tok+lKBFsZjn4V+P7Qyskrs88iP99KVK6NsEptgTDEDaFS0Zq4+/4NBm4MQbaSjUybXsrJJEbPEg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163058759014769.87912849496843; Thu, 2 Sep 2021 05:59:50 -0700 (PDT) Received: from localhost ([::1]:52984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmJp-0002Cv-6d for importer@patchew.org; Thu, 02 Sep 2021 08:59:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9u-00057s-GP for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9s-00073c-Aw for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:33 -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-545-dFgIV_FGOEy5SAYSbWS50Q-1; Thu, 02 Sep 2021 08:49:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4BA0C835DF0; Thu, 2 Sep 2021 12:49:24 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8595810074F1; Thu, 2 Sep 2021 12:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586971; 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=HIRw8DY7nnTYNZWJCLDMI9ZQHGgEl1hGH6MtNAepgUE=; b=QaGGcKyOvdypMy4Dsbs+eWXtuEscXNFMYixFHLywIjqlycJTudOqB4agdcNnkGIOA39YrN dgva2AT+y2MTuip1vNtRFA5OT9MzsSOWZqN8cTBPHUl3Y9Tlg5QyiwGes0dty6lgRdVvMM inKG1we2kBgKc5ATs8ALrRtzbydj0Bg= X-MC-Unique: dFgIV_FGOEy5SAYSbWS50Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/13] gitlab-ci: Remove superfluous "dnf install" statement Date: Thu, 2 Sep 2021 14:49:02 +0200 Message-Id: <20210902124911.822423-5-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587591462100003 Content-Type: text/plain; charset="utf-8" The container already features meson and ninja, so there is no need to try to install it with dnf again. Message-Id: <20210730143809.717079-3-thuth@redhat.com> Reviewed-by: Willian Rampazzo Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f390f98044..38f08452f1 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -590,8 +590,6 @@ build-libvhost-user: image: $CI_REGISTRY_IMAGE/qemu/fedora:latest needs: job: amd64-fedora-container - before_script: - - dnf install -y meson ninja-build script: - mkdir subprojects/libvhost-user/build - cd subprojects/libvhost-user/build --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630587988; cv=none; d=zohomail.com; s=zohoarc; b=HcVFNZBhBVblCTZIXJJineUUhki3yOm/A5Z5wT/rGZLzaNe8FThCHnMmgLRw4berqzS/NmbKbtiqiR78ndnBSg4f7wM3wi8SWxIN4ytKNPBuuH4B8IYh4U/HWIdFpAMOf42YINan3fgP4T3EAI+IUyeFeOOv1hSNppKyu//j84s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587988; 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=Wdaa9b5KTNEOKVCFJcI0sLfb2hf8emxeFzWb9Cn2I9U=; b=TD+wGasiC9b3OH+dU7NWA1PY583xY0MN56d2BmHnTMJs8iUaJk2OF/oLnRZDxbl8MpQXZA6J7NuYEzFjMGPbNJjrd98wlMf92CeickzHTC86yO9dhNroEhf34CvB4QB+ly7rAM0DJ04LUZPHc4HRSv+icM0jZyY8P9DD1FlUmi4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630587988556128.97197637297063; Thu, 2 Sep 2021 06:06:28 -0700 (PDT) Received: from localhost ([::1]:39058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmQF-0004qx-CZ for importer@patchew.org; Thu, 02 Sep 2021 09:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9u-00058K-IA for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9r-000736-9W for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:34 -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-478-aBbFj5AwOyaowW1io_mnPg-1; Thu, 02 Sep 2021 08:49:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B74A11940936; Thu, 2 Sep 2021 12:49:25 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9A0A10016F2; Thu, 2 Sep 2021 12:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586970; 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=Wdaa9b5KTNEOKVCFJcI0sLfb2hf8emxeFzWb9Cn2I9U=; b=Bim76n1eZpBhY8RjOYMN+fRLazLVfyi9jJKZfTAHcz7Fj+dm6KmlUHGjduVNr/WOBhlw9x LD6SF7jH/Jhuz93hO8s6wHwUnidw1D6FwYz6Qj4jjLRDi+ojyO9mWusMLby2jFPeK6pBZ9 C3QWrDegr5pcPw2kJWNUCQm+cf4CnCs= X-MC-Unique: aBbFj5AwOyaowW1io_mnPg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 05/13] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them Date: Thu, 2 Sep 2021 14:49:03 +0200 Message-Id: <20210902124911.822423-6-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587989090100001 The patch that recently introduced the S390X_RUNNER_AVAILABLE variable in custom-runners.yml missed that the bottom half of the file is rather about aarch64 than s390x. Thus rename the S390X_RUNNER_AVAILABLE to AARCH64_RUNNER_AVAILABLE in those jobs. Finally mention both variables in our CI documentation, too. Fixes: c5dd0f0342 ("Improve rules for the staging branch") Message-Id: <20210730143809.717079-4-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Signed-off-by: Thomas Huth --- .gitlab-ci.d/custom-runners.yml | 12 ++++++------ docs/devel/ci-jobs.rst | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index 564b94565d..0d3e4a7b4b 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -137,7 +137,7 @@ ubuntu-20.04-aarch64-all-linux-static: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+= bug/1838763 # --disable-glusterfs is needed because there's no static version of thos= e libs in distro supplied packages @@ -157,7 +157,7 @@ ubuntu-20.04-aarch64-all: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: - mkdir build - cd build @@ -174,7 +174,7 @@ ubuntu-20.04-aarch64-alldbg: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: - mkdir build - cd build @@ -193,7 +193,7 @@ ubuntu-20.04-aarch64-clang: rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' when: manual - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" when: manual script: - mkdir build @@ -211,7 +211,7 @@ ubuntu-20.04-aarch64-tci: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: - mkdir build - cd build @@ -228,7 +228,7 @@ ubuntu-20.04-aarch64-notcg: rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' when: manual - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" when: manual script: - mkdir build diff --git a/docs/devel/ci-jobs.rst b/docs/devel/ci-jobs.rst index 9cd9819786..277975e4ad 100644 --- a/docs/devel/ci-jobs.rst +++ b/docs/devel/ci-jobs.rst @@ -38,3 +38,14 @@ these artifacts are not already cached, downloading them= make the jobs reach the timeout limit). Set this variable to have the tests using the Avocado framework run automatically. =20 +AARCH64_RUNNER_AVAILABLE +~~~~~~~~~~~~~~~~~~~~~~~~ +If you've got access to an aarch64 host that can be used as a gitlab-CI +runner, you can set this variable to enable the tests that require this +kind of host. The runner should be tagged with "aarch64". + +S390X_RUNNER_AVAILABLE +~~~~~~~~~~~~~~~~~~~~~~ +If you've got access to an IBM Z host that can be used as a gitlab-CI +runner, you can set this variable to enable the tests that require this +kind of host. The runner should be tagged with "s390x". --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630588114; cv=none; d=zohomail.com; s=zohoarc; b=M33+psRhUR9l0nF9yeaLjGK0HdL5+wzgHXh4/Shc+a5FAaeMIe3dzOpPMT5SumFzEe37r6YEzJmeJIDNRpH8KbtW4Kj7cS6scq7gAY7D2UgJ7sOJb1q8vNLIWJzLQGqacQpssUWrEAfWM60fNbRq3H/TBzZGPXPbacpXT47yGZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630588114; 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=5JwPDKcm4ATpSAkg2n1iiG42WJIGryyWXP9qh6bNdw8=; b=jklGn91SM44iUToIygNLK3HoWMQrAzqnpnbtbISH26iAGFYWR87TggveH/9yK2E+sUdLSgvCHSHC02yCDJCqCEeRv7DbSDkr7LzWYCPWg1cJG7CCARtJHOvfMEWS2HFnQV/jWJmcFfudiVe+JudZBR6/4MDFuHCsx5/zMnOx7V4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630588114078662.481824678058; Thu, 2 Sep 2021 06:08:34 -0700 (PDT) Received: from localhost ([::1]:47542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmSF-0002Q5-BQ for importer@patchew.org; Thu, 02 Sep 2021 09:08:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9s-00057L-JP for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44630) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9q-000731-DF for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:32 -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-286-OB97aTs1OKWNSOpRxzjEXw-1; Thu, 02 Sep 2021 08:49:27 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED9F6FC81; Thu, 2 Sep 2021 12:49:26 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2258D10016F2; Thu, 2 Sep 2021 12:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586969; 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=5JwPDKcm4ATpSAkg2n1iiG42WJIGryyWXP9qh6bNdw8=; b=NyVBG2BQ9SR0tsf3Oq887ezBtAUdzU0XgAfHKDIfUwhnaePxIWUzhlz3KZtlaADTGqfIC7 q83aq1oYSBep9KD4eIjlBv5tPkiiUGFlCHe2pYxKe4i18fjpJpU6/dc4y+oOgYRgLhwrli LOXQVuOiej90Z7UgoOqvIWyFT+QtGcg= X-MC-Unique: OB97aTs1OKWNSOpRxzjEXw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/13] gitlab-ci: Don't try to use the system libfdt in the debian job Date: Thu, 2 Sep 2021 14:49:04 +0200 Message-Id: <20210902124911.822423-7-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630588116076100001 libfdt in Debian is too old to be usable for QEMU. So far we were silently falling back to the internal dtc submodule, but since this is wrong, let's remove the --enable-fdt=3Dsystem switch here now. Message-Id: <20210827151718.178988-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Acked-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 38f08452f1..175ebe43d3 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -74,7 +74,6 @@ build-system-debian: job: amd64-debian-container variables: IMAGE: debian-amd64 - CONFIGURE_ARGS: --enable-fdt=3Dsystem TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630588476; cv=none; d=zohomail.com; s=zohoarc; b=Tm9hPzXUzBYom0hKNi1R2jLW0D7V/RISFWu3GCNaMEdd/LoJZ/LRzScdeqM/kXK0A6ygVDQBuqIvtEnqYcx04Q4OvjtD+ZNq1LqjwOAgPNWsIcvf0Td3EzgcSC2i50NSiwCh0smhSngJLya347Fy3dN8bFVn5Mj7EyismoRqGhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630588476; 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=peS/IAyxam/Jeuo5krFHpggifKYax0ZYDXwVRIFU8hk=; b=LCJ7MSgS3vxqD4c/2e7LRcbX3pGeYy9CwRGlc2wl4IQU8gXNIx+yIKRVHWgguTMqIpdXJsCAl65YkTpyS0uaAZxoSoaFmPXi8gJZldESs2NemTfwt0im0+12o07M5sEAiXBSNNF3el65TA+clciXk12dcSp0rPVnY+jLOIwY/5E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163058847655572.59747651968075; Thu, 2 Sep 2021 06:14:36 -0700 (PDT) Received: from localhost ([::1]:36246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmY7-0005U5-Bi for importer@patchew.org; Thu, 02 Sep 2021 09:14:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9w-0005Ad-St for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9r-00073B-9V for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:36 -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-204-4ffcMFh_PzKvHVeoBeDh_w-1; Thu, 02 Sep 2021 08:49:29 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30A37107ACC7; Thu, 2 Sep 2021 12:49:28 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E40410016F2; Thu, 2 Sep 2021 12:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586970; 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=peS/IAyxam/Jeuo5krFHpggifKYax0ZYDXwVRIFU8hk=; b=JDyA0A90utlU9xh8KOC2agoKwjntUmj+IM4WsRDah6asMF/Cm63Wug4N5rHy+Qe1nXypwa wnzmXyMb8srggKZD1hY1/VNSIqfjhv3Eo2V+cpV7f9LcwlJUPtBdPI5QaVbtbHZtVFrfyp rB0aAcA79ymxSU30RFzgaX1OtIA24SY= X-MC-Unique: 4ffcMFh_PzKvHVeoBeDh_w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/13] meson.build: Fix the check for a usable libfdt Date: Thu, 2 Sep 2021 14:49:05 +0200 Message-Id: <20210902124911.822423-8-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630588477205100001 The check for libfdt currently has a flaw: If there is a system libfdt, the meson.build code initialized the fdt variable with fdt =3D cc.find_library(= ...). However, if this libfdt is too old and there is no internal dtc module available, it continues with "fdt" pointing to the old and unusable version. The check later in the file that tries to detect whether libfdt is necessary then fails to trigger: if not fdt.found() and fdt_required.length() > 0 error('fdt not available but required by targets ' + ', '.join(fdt_requir= ed)) endif The build fails then during compilation instead, which is of course bad since this is quite confusing and already wasted quite some time of the use= r. Thus if libfdt is not usable, we should unset the "fdt" variable immediately again, so that the build already fails during the configuration phase. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/255 Message-Id: <20210827120901.150276-2-thuth@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Thomas Huth --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index bf63784812..6f7177428e 100644 --- a/meson.build +++ b/meson.build @@ -1916,6 +1916,7 @@ if have_system fdt_opt =3D 'internal' else fdt_opt =3D 'disabled' + fdt =3D not_found endif endif if fdt_opt =3D=3D 'internal' --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630587805; cv=none; d=zohomail.com; s=zohoarc; b=b4D4a7tpek+Vpj0/AFUWDW0xtVdyPFPU16yQQ7FRZahA7pQEdbtmWwfKoQ6t+4B5FwHUPI0YI6YPCNvqCZ8D7oTPSKJMlNeB1W/zZjFmSgS+DbmXvj7O5CrXA3PMFe++8o4Wr9ILTYLusntkP927yqJSSxJWa3XevFZH6cxyGRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587805; 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=6rqA3K9F3FH10/7wD1F+o+9rwIXYOs1faRHBea7/k5M=; b=DuW5tuvfNOkDAvNkML7zVBmP71VAlIRjGom4K4avHSbf6EIy3L/ClscIQWpHv8Eyw7IBJGkKzM+qRqQPgxTPseQaXrdZtQwQ0Paq/2Uz6INKIa0ALpiMJWuYhmAvW1W//ueml1boJFTd4I6JnIYOy5AlTDxSnBlhIiqH+MWYo30= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630587805654169.4220133212673; Thu, 2 Sep 2021 06:03:25 -0700 (PDT) Received: from localhost ([::1]:59776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmNI-0007i4-FL for importer@patchew.org; Thu, 02 Sep 2021 09:03:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9u-00058n-P9 for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9s-00073h-BA for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:34 -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-518-_xjFe40CO5yi5l7rmeo7FA-1; Thu, 02 Sep 2021 08:49:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C82E1083E8F; Thu, 2 Sep 2021 12:49:29 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8535610016F2; Thu, 2 Sep 2021 12:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586971; 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=6rqA3K9F3FH10/7wD1F+o+9rwIXYOs1faRHBea7/k5M=; b=SW4byJSUlW2NRNu7xeyQxcza4rUdbLq5s7rwJTwLpWhcIHom9oSQxVsI2/23E5eV3e6Bms iacVL6r7Jbvrq4LZ4gqixz8snYjcfRZy6bzAqFQcMNKh/Q+eRCc7RyZ5PkM1HJ3IdG4SuT /Mvj9MBokormt0ZzdwEv6QoB6wXRfYY= X-MC-Unique: _xjFe40CO5yi5l7rmeo7FA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/13] meson.build: Don't use internal libfdt if the user requested the system libfdt Date: Thu, 2 Sep 2021 14:49:06 +0200 Message-Id: <20210902124911.822423-9-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587814903100001 If the users ran configure with --enable-libfdt=3Dsystem, they likely did that on purpose. We should not silently fall back to the internal libfdt if the system libfdt is not usable, but report the problem with a proper message instead. Message-Id: <20210827120901.150276-3-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Thomas Huth --- meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meson.build b/meson.build index 6f7177428e..ecfdce921c 100644 --- a/meson.build +++ b/meson.build @@ -1912,6 +1912,8 @@ if have_system int main(void) { fdt_check_full(NULL, 0); return 0; }''', dependencies: fdt) fdt_opt =3D 'system' + elif fdt_opt =3D=3D 'system' + error('system libfdt requested, but it is too old (1.5.1 or newer r= equired)') elif have_internal fdt_opt =3D 'internal' else --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630587996; cv=none; d=zohomail.com; s=zohoarc; b=QFYpjLehyiPkrpWShKHk9rU3o9F4wkgMFSag6r0DONELOT6khXb9LIaalmqjCeZ64PH7YIp8ovtwyaQeM0DIWzFRzBafZA7ugK7SNKdMjDos9M40kcS1oR55KJ7GlMMsAJrVxHv2b8hJmiClW0/CK+tiBT8KNaBBlJHjNJrom8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630587996; 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=4EUv8iL7NxMA/intfzzPkJ+814b8qIkaWcJNgQYex4k=; b=KczbFnAgQF/6OSD7uubO3sYKnZ+vcXhfHjVq8a10vOIjG4Re8zI4iufokUR+iNizILfxt71ip67vpFr5WGIVm87HLKHvGn692wAZM211jFI4S7KUD0uO/J3O7k6zb5BXA1eJtGr/YcWoAcSLotDTwKmcLr6CfkAlDsgC9ZlY7wg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630587996225879.7652293710624; Thu, 2 Sep 2021 06:06:36 -0700 (PDT) Received: from localhost ([::1]:39784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmQN-0005Sq-6h for importer@patchew.org; Thu, 02 Sep 2021 09:06:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9y-0005Bt-Ur for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46151) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9t-00073y-Uq for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:37 -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-419-xw4omFn6Mqqdi2CH4yIyvw-1; Thu, 02 Sep 2021 08:49:31 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DB5F1083E90; Thu, 2 Sep 2021 12:49:30 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C9AD1000358; Thu, 2 Sep 2021 12:49:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586973; 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=4EUv8iL7NxMA/intfzzPkJ+814b8qIkaWcJNgQYex4k=; b=ESHrz1nkCd1lnHlAmswo6vCm5PHIr6sWDDDa/n94YA20cpjE9xiFQOoYi1QUbF13wEEVbC 1ULn/k4yn2hVfcnbdrZsUxCkjnA/OdWUoKR9ULJTjgDiMkaMVGr6WFtuzxGNL6wvQihLz+ rcw7Eiep8ArMleLy28ZcSaWjYVbRYa4= X-MC-Unique: xw4omFn6Mqqdi2CH4yIyvw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/13] configure / meson: Move the GBM handling to meson.build Date: Thu, 2 Sep 2021 14:49:07 +0200 Message-Id: <20210902124911.822423-10-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630587997879100001 Content-Type: text/plain; charset="utf-8" The GBM library detection does not need to be in the configure script, since it does not have any user-facing options (there are no --enable-gbm or --disable-gbm switches). Let's move it to meson.build instead, so we don't have to clutter config-host.mak with the related switches. Additionally, only check for GBM if it is really required, i.e. if we either compile with OpenGL or with virglrenderer support. Message-Id: <20210714085045.797168-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- configure | 14 -------------- contrib/vhost-user-gpu/meson.build | 5 ++--- meson.build | 14 ++++++++------ 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 9a79a004d7..d63b173410 100755 --- a/configure +++ b/configure @@ -3452,13 +3452,6 @@ esac ########################################## # opengl probe (for sdl2, gtk) =20 -gbm=3D"no" -if $pkg_config gbm; then - gbm_cflags=3D"$($pkg_config --cflags gbm)" - gbm_libs=3D"$($pkg_config --libs gbm)" - gbm=3D"yes" -fi - if test "$opengl" !=3D "no" ; then epoxy=3Dno if $pkg_config epoxy; then @@ -4681,13 +4674,6 @@ if test "$opengl" =3D "yes" ; then echo "OPENGL_LIBS=3D$opengl_libs" >> $config_host_mak fi =20 -if test "$gbm" =3D "yes" ; then - echo "CONFIG_GBM=3Dy" >> $config_host_mak - echo "GBM_LIBS=3D$gbm_libs" >> $config_host_mak - echo "GBM_CFLAGS=3D$gbm_cflags" >> $config_host_mak -fi - - if test "$avx2_opt" =3D "yes" ; then echo "CONFIG_AVX2_OPT=3Dy" >> $config_host_mak fi diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 4cb52a91d7..92c8f3a86a 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -1,6 +1,5 @@ -if 'CONFIG_TOOLS' in config_host and virgl.found() \ - and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host \ - and pixman.found() +if 'CONFIG_TOOLS' in config_host and virgl.found() and gbm.found() \ + and 'CONFIG_LINUX' in config_host and pixman.found() executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm= .c'), dependencies: [qemuutil, pixman, gbm, virgl, vhost_user, open= gl], install: true, diff --git a/meson.build b/meson.build index ecfdce921c..83310980f1 100644 --- a/meson.build +++ b/meson.build @@ -472,11 +472,6 @@ if not get_option('zstd').auto() or have_block required: get_option('zstd'), method: 'pkg-config', kwargs: static_kwargs) endif -gbm =3D not_found -if 'CONFIG_GBM' in config_host - gbm =3D declare_dependency(compile_args: config_host['GBM_CFLAGS'].split= (), - link_args: config_host['GBM_LIBS'].split()) -endif virgl =3D not_found if not get_option('virglrenderer').auto() or have_system virgl =3D dependency('virglrenderer', @@ -816,11 +811,17 @@ coreaudio =3D not_found if 'CONFIG_AUDIO_COREAUDIO' in config_host coreaudio =3D declare_dependency(link_args: config_host['COREAUDIO_LIBS'= ].split()) endif + opengl =3D not_found if 'CONFIG_OPENGL' in config_host opengl =3D declare_dependency(compile_args: config_host['OPENGL_CFLAGS']= .split(), link_args: config_host['OPENGL_LIBS'].split(= )) endif +gbm =3D not_found +if virgl.found() or 'CONFIG_OPENGL' in config_host + gbm =3D dependency('gbm', method: 'pkg-config', required: false, + kwargs: static_kwargs) +endif =20 gnutls =3D not_found gnutls_crypto =3D not_found @@ -1244,6 +1245,7 @@ config_host_data.set('CONFIG_MPATH', mpathpersist.fou= nd()) config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api) config_host_data.set('CONFIG_CURL', curl.found()) config_host_data.set('CONFIG_CURSES', curses.found()) +config_host_data.set('CONFIG_GBM', gbm.found()) config_host_data.set('CONFIG_GLUSTERFS', glusterfs.found()) if glusterfs.found() config_host_data.set('CONFIG_GLUSTERFS_XLATOR_OPT', glusterfs.version().= version_compare('>=3D4')) @@ -3086,7 +3088,7 @@ summary_info +=3D {'U2F support': u2f.found()} summary_info +=3D {'libusb': libusb.found()} summary_info +=3D {'usb net redir': usbredir.found()} summary_info +=3D {'OpenGL support': config_host.has_key('CONFIG_OPENGL= ')} -summary_info +=3D {'GBM': config_host.has_key('CONFIG_GBM')} +summary_info +=3D {'GBM': gbm.found()} summary_info +=3D {'libiscsi support': libiscsi.found()} summary_info +=3D {'libnfs support': libnfs.found()} if targetos =3D=3D 'windows' --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630588323; cv=none; d=zohomail.com; s=zohoarc; b=LQULKNFlwUG1vPwJQ65AHt+enmKGYX3Jr5v8oxNoI2c9CpX2iIctBO7ehFlS0KpV+mzGH19UPHlA/5bbJW+7kCgh45qAQlsJuxX8C2yA4/TPPKIGGQpA6x3hHxhiWur97g3X+kHPi28Yr6bT4TlaxQPrMtUlYz0CeAbo8ZW7yGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630588323; 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=YJuO4X7OFW85IDNdVVLbJ0yOhIXK+QU5l/sHCYyRezs=; b=R1wVa7n9C++dRqr4Y023iMKOWSPRPXqdc2yIXw7smMDnssC877wAtcSfixKrSta0HYGAthiV8Dhk8CEnHEFM10a9bcZ+pDLjbXrS6HVzqw/eGQEBeTs3Qkh0Q/d5UjsqhRqU4H6+Q2C1TraYBd3uT8bsAARMtjhHWwFolCmtxYY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16305883234267.377997047129725; Thu, 2 Sep 2021 06:12:03 -0700 (PDT) Received: from localhost ([::1]:56358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmVd-00006T-JS for importer@patchew.org; Thu, 02 Sep 2021 09:12:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLmA0-0005JN-Nv for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9y-00074g-Ie for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:40 -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-437-zijJ4_JHPy2sGpF5hSDwWQ-1; Thu, 02 Sep 2021 08:49:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B48E801B3C; Thu, 2 Sep 2021 12:49:31 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD64710016F2; Thu, 2 Sep 2021 12:49:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586975; 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=YJuO4X7OFW85IDNdVVLbJ0yOhIXK+QU5l/sHCYyRezs=; b=HHl/VVvol/VBo/KE4O0AmLm0YpQGW5Q4UfivMk4f9LCapo+eX90b2Kvtq/C9YHwz2PleF0 JJJ3mxZlnYBVXT18c4pYfP7F6r8un6sAS3dZVjn49pgM2yZ7xKoCfRgA45TEx8uI40uQeB ooOZB54XPMWwuO+ymiuyojTxF1D78iM= X-MC-Unique: zijJ4_JHPy2sGpF5hSDwWQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 10/13] scripts: Remove the "show-fixed-bugs.sh" file Date: Thu, 2 Sep 2021 14:49:08 +0200 Message-Id: <20210902124911.822423-11-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630588325263100001 Since we are not using Launchpad anymore, there is no more need for this script. Message-Id: <20210825142143.142037-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Signed-off-by: Thomas Huth --- scripts/show-fixed-bugs.sh | 91 -------------------------------------- 1 file changed, 91 deletions(-) delete mode 100755 scripts/show-fixed-bugs.sh diff --git a/scripts/show-fixed-bugs.sh b/scripts/show-fixed-bugs.sh deleted file mode 100755 index a095a4d6ba..0000000000 --- a/scripts/show-fixed-bugs.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# This script checks the git log for URLs to the QEMU launchpad bugtracker -# and optionally checks whether the corresponding bugs are not closed yet. - -show_help () { - echo "Usage:" - echo " -s : Start searching at this commit" - echo " -e : End searching at this commit" - echo " -c : Check if bugs are still open" - echo " -b : Open bugs in browser" -} - -while getopts "s:e:cbh" opt; do - case "$opt" in - s) start=3D"$OPTARG" ;; - e) end=3D"$OPTARG" ;; - c) check_if_open=3D1 ;; - b) show_in_browser=3D1 ;; - h) show_help ; exit 0 ;; - *) echo "Use -h for help." ; exit 1 ;; - esac -done - -if [ "x$start" =3D "x" ]; then - start=3D$(git tag -l 'v[0-9]*\.[0-9]*\.0' | tail -n 2 | head -n 1) -fi -if [ "x$end" =3D "x" ]; then - end=3D$(git tag -l 'v[0-9]*\.[0-9]*\.0' | tail -n 1) -fi - -if [ "x$start" =3D "x" ] || [ "x$end" =3D "x" ]; then - echo "Could not determine start or end revision ... Please note that t= his" - echo "script must be run from a checked out git repository of QEMU." - exit 1 -fi - -echo "Searching git log for bugs in the range $start..$end" - -urlstr=3D'https://bugs.launchpad.net/\(bugs\|qemu/+bug\)/' -bug_urls=3D$(git log $start..$end \ - | sed -n '\,'"$urlstr"', s,\(.*\)\('"$urlstr"'\)\([0-9]*\).*,\2\4,p' \ - | sort -u) - -echo Found bug URLs: -for i in $bug_urls ; do echo " $i" ; done - -if [ "x$check_if_open" =3D "x1" ]; then - echo - echo "Checking which ones are still open..." - for i in $bug_urls ; do - if ! curl -s -L "$i" | grep "value status" | grep -q "Fix Released= " ; then - echo " $i" - final_bug_urls=3D"$final_bug_urls $i" - fi - done -else - final_bug_urls=3D$bug_urls -fi - -if [ "x$final_bug_urls" =3D "x" ]; then - echo "No open bugs found." -elif [ "x$show_in_browser" =3D "x1" ]; then - # Try to determine which browser we should use - if [ "x$BROWSER" !=3D "x" ]; then - bugbrowser=3D"$BROWSER" - elif command -v xdg-open >/dev/null 2>&1; then - bugbrowser=3Dxdg-open - elif command -v gnome-open >/dev/null 2>&1; then - bugbrowser=3Dgnome-open - elif [ "$(uname)" =3D "Darwin" ]; then - bugbrowser=3Dopen - elif command -v sensible-browser >/dev/null 2>&1; then - bugbrowser=3Dsensible-browser - else - echo "Please set the BROWSER variable to the browser of your choic= e." - exit 1 - fi - # Now show the bugs in the browser - first=3D1 - for i in $final_bug_urls; do - "$bugbrowser" "$i" - if [ $first =3D 1 ]; then - # if it is the first entry, give the browser some time to start - # (to avoid messages like "Firefox is already running, but is - # not responding...") - sleep 4 - first=3D0 - fi - done -fi --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630588120; cv=none; d=zohomail.com; s=zohoarc; b=dubcqg5SQTCM0p2zIP8y/Qy7/nezwo36DPHMASI1ViL7id3O3E8c4JYLfOdPX/OkMmtJdpMGrFji059ay+FIt/eIxxL3s2mmvqtKpNbUXnXWMV5nJCZW+I8RhyPYhBy2hsDBmALAompFh/cg1ZbVh1mJwem00+b9hP6SsggRH6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630588120; 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=Sk/MbQHGrW2wOM0H5ZZaRI/aoRqGzYqvlSSR3juL2Bk=; b=YJn55SI0FwXMOzFXU7VpqM7MZ/XJIqwsTpDVQtp7iaMdH8zqWRWzHdLCXWXiN8Nw3jaHjC0397tbYuIzKxYQb5u5Wggmu9hKn12OUj+YTaO8s67KLzFYoF5j0KbaUM+1dM6uv00gII+NeFgo2i3HzD/4aA976kwYMm1vV+1MQuk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630588120704118.9487156635123; Thu, 2 Sep 2021 06:08:40 -0700 (PDT) Received: from localhost ([::1]:48278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmSN-0002st-Na for importer@patchew.org; Thu, 02 Sep 2021 09:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9y-0005Bw-Ve for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27999) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9w-00074T-JH for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:38 -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-48-zd1EeT5lOtOsW6M53vC9kg-1; Thu, 02 Sep 2021 08:49:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE0751083E8F; Thu, 2 Sep 2021 12:49:32 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10E891000358; Thu, 2 Sep 2021 12:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586974; 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=Sk/MbQHGrW2wOM0H5ZZaRI/aoRqGzYqvlSSR3juL2Bk=; b=Rtd3r6RNVc82txLATZQYEFOIDmy5/JeFJY1yB/dWcTwHSgmpyXTWko9fzZ0ouuvwupFiC8 sTkORBAZB/EyNFdUTfkGzUDBy7N8/jSTrQ5qTEV2fY8Q6UYWN71wlSmpMgBLYYJM4twEl8 I8PevHUTmn3f275mlhFFeSDTYuMX+JQ= X-MC-Unique: zd1EeT5lOtOsW6M53vC9kg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 11/13] softmmu/vl: Add a "grab-mod" parameter to the -display sdl option Date: Thu, 2 Sep 2021 14:49:09 +0200 Message-Id: <20210902124911.822423-12-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630588121419100001 Content-Type: text/plain; charset="utf-8" The -display sdl option is not using QAPI internally yet, and uses hand- crafted parsing instead (see parse_display() in vl.c), which is quite ugly, since most of the other code is using the QAPIfied DisplayOption already. Unfortunately, the "alt_grab" and "ctrl_grab" use underscores in their names which has recently been forbidden in new QAPI code, so a straight conversion is not possible. While we could add some exceptions to the QAPI schema parser for this, the way these parameters have been designed was maybe a bad idea anyway: First, it's not possible to enable both parameters at the same time, thus instead of two boolean parameters it would be better to have only one multi-choice parameter instead. Second, the naming is also somewhat unfortunate since the "alt_grab" parameter is not about the ALT key, but rather about the left SHIFT key that has to be used additionally when the parameter is enabled. So instead of trying to QAPIfy "alt_grab" and "ctrl_grab", let's rather introduce an alternative to these parameters instead, a new parameter called "grab-mod" which can either be set to "lshift-lctrl-lalt" or to "rctrl". In case we ever want to support additional modes later, we can then also simply extend the list of supported strings here. Message-Id: <20210825092023.81396-2-thuth@redhat.com> Reviewed-by: Gerd Hoffmann Signed-off-by: Thomas Huth --- qemu-options.hx | 6 +++++- softmmu/vl.c | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 83aa59a920..0bff756ded 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1834,7 +1834,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_SDL) "-display sdl[,alt_grab=3Don|off][,ctrl_grab=3Don|off][,gl=3Don|core|e= s|off]\n" - " [,show-cursor=3Don|off][,window-close=3Don|off]\n" + " [,grab-mod=3D][,show-cursor=3Don|off][,window-close= =3Don|off]\n" #endif #if defined(CONFIG_GTK) "-display gtk[,full-screen=3Don|off][,gl=3Don|off][,grab-on-hover=3Don= |off]\n" @@ -1880,6 +1880,10 @@ SRST window; see the SDL documentation for other possibilities). Valid parameters are: =20 + ``grab-mod=3D`` : Used to select the modifier keys for toggl= ing + the mouse grabbing in conjunction with the "g" key. `` can be + either `lshift-lctrl-lalt` or `rctrl`. + ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing =20 ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing diff --git a/softmmu/vl.c b/softmmu/vl.c index ea05bb39c5..2176e3c5ae 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1017,15 +1017,24 @@ static void parse_display(const char *p) * parse_display_qapi() due to some options not in * DisplayOptions, specifically: * - ctrl_grab + alt_grab - * Not clear yet what happens to them long-term. Should - * replaced by something better or deprecated and dropped. + * They can't be moved into the QAPI since they use underscore= s, + * thus they will get replaced by "grab-mod" in the long term */ #if defined(CONFIG_SDL) dpy.type =3D DISPLAY_TYPE_SDL; while (*opts) { const char *nextopt; =20 - if (strstart(opts, ",alt_grab=3D", &nextopt)) { + if (strstart(opts, ",grab-mod=3D", &nextopt)) { + opts =3D nextopt; + if (strstart(opts, "lshift-lctrl-lalt", &nextopt)) { + alt_grab =3D 1; + } else if (strstart(opts, "rctrl", &nextopt)) { + ctrl_grab =3D 1; + } else { + goto invalid_sdl_args; + } + } else if (strstart(opts, ",alt_grab=3D", &nextopt)) { opts =3D nextopt; if (strstart(opts, "on", &nextopt)) { alt_grab =3D 1; --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630588114; cv=none; d=zohomail.com; s=zohoarc; b=QJXuYZWAyYkLxfUbry6jOy7RHqJYZ6izu2w2R2Rd8N8TQ9bVU52ZiF+oE7RW/tDgMF2ZVLWZsUZ5QTYKhlfencq6yr7K8EkeMSmEFFCIBvlbYw43Ucaxd3CIeYKoBI4EHo3q9R/BkbVz0c+QBasBot1Xld8rc+j1V9COnec00Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630588114; 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=VQQAW8Rb5AEQvgaGxy3djvSVBI1Ixd29wh+C8dJ/vyI=; b=DCekWuXZcqBcR+ZMBREfHVM1u1HcWmrg9X7ImKKGlH/sx7IFABBd+pHFd8TuLY945mAfIPYaD+XsvUaUacxhGfLb8LxR9B5KofdInGNOmxNCQJZ7g9AoOp/54jsxc8Hoi1tuaL9d8S4fq62FXtsSZ5136/ziQ8IlXvQe5Fu8bjc= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630588114114880.3947972817673; Thu, 2 Sep 2021 06:08:34 -0700 (PDT) Received: from localhost ([::1]:47558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmSG-0002Qi-PF for importer@patchew.org; Thu, 02 Sep 2021 09:08:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLmA0-0005IL-G4 for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9y-000754-IC for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:40 -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-423-VsvnvTirOUmesDGKvAqhDw-1; Thu, 02 Sep 2021 08:49:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21BE5107ACCA; Thu, 2 Sep 2021 12:49:34 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4912A100AE35; Thu, 2 Sep 2021 12:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586976; 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=VQQAW8Rb5AEQvgaGxy3djvSVBI1Ixd29wh+C8dJ/vyI=; b=fGr32lTq7BroCSpyRej+CCKwlpk2l1I1URbJgxkrlXIW5/aHxhSkGDDfahnl3/Pc+74fI9 xRlzZHc0/nS2SZ/GcVih6MIiHCNYALQLAN7nTI/Ee4pLV36eKsdXKgh6b+ymT4vGdbuDOK IoJNj1szPFSRWG8R9ErdC3DXNAHTUS0= X-MC-Unique: VsvnvTirOUmesDGKvAqhDw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 12/13] softmmu/vl: Deprecate the old grab options Date: Thu, 2 Sep 2021 14:49:10 +0200 Message-Id: <20210902124911.822423-13-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630588116083100002 Content-Type: text/plain; charset="utf-8" The alt_grab and ctrl_grab parameter of the -display sdl option prevent the QAPIfication of the "sdl" part of the -display option, so we should eventually remove them. And since this feature is also rather niche anyway, we should not clutter the top-level option list with these, so let's also deprecate the "-alt-grab" and the "-ctrl-grab" options while we're at it. Once the deprecation period of "alt_grab" and "ctrl_grab" is over, we then can finally switch the -display sdl option to use QAPI internally, too. Message-Id: <20210825092023.81396-3-thuth@redhat.com> Reviewed-by: Gerd Hoffmann Acked-by: Peter Krempa Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 10 ++++++++++ qemu-options.hx | 12 ++++++++---- softmmu/vl.c | 6 ++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1e1a5e96ad..65d8b4370f 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -138,6 +138,16 @@ an underscore between "window" and "close"). The ``-no-quit`` is a synonym for ``-display ...,window-close=3Doff`` which should be used instead. =20 +``-alt-grab`` and ``-display sdl,alt_grab=3Don`` (since 6.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. + +``-ctrl-grab`` and ``-display sdl,ctrl_grab=3Don`` (since 6.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,grab-mod=3Drctrl`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index 0bff756ded..4f46233527 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1884,9 +1884,11 @@ SRST the mouse grabbing in conjunction with the "g" key. `` can be either `lshift-lctrl-lalt` or `rctrl`. =20 - ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing + ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing. + This parameter is deprecated - use ``grab-mod`` instead. =20 - ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing + ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing. + This parameter is deprecated - use ``grab-mod`` instead. =20 ``gl=3Don|off|core|es`` : Use OpenGL for displaying =20 @@ -1971,7 +1973,8 @@ SRST ``-alt-grab`` Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Note that this also affects the special keys (for fullscreen, monitor-mode - switching, etc). + switching, etc). This option is deprecated - please use + ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. ERST =20 DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, @@ -1981,7 +1984,8 @@ SRST ``-ctrl-grab`` Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). Note that this also affects the special keys (for fullscreen, monitor-mode - switching, etc). + switching, etc). This option is deprecated - please use + ``-display sdl,grab-mod=3Drctrl`` instead. ERST =20 DEF("no-quit", 0, QEMU_OPTION_no_quit, diff --git a/softmmu/vl.c b/softmmu/vl.c index 2176e3c5ae..e9346b49d2 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1043,6 +1043,7 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } + warn_report("alt_grab is deprecated, use grab-mod instead.= "); } else if (strstart(opts, ",ctrl_grab=3D", &nextopt)) { opts =3D nextopt; if (strstart(opts, "on", &nextopt)) { @@ -1052,6 +1053,7 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } + warn_report("ctrl_grab is deprecated, use grab-mod instead= ."); } else if (strstart(opts, ",window_close=3D", &nextopt) || strstart(opts, ",window-close=3D", &nextopt)) { if (strstart(opts, ",window_close=3D", NULL)) { @@ -3245,9 +3247,13 @@ void qemu_init(int argc, char **argv, char **envp) break; case QEMU_OPTION_alt_grab: alt_grab =3D 1; + warn_report("-alt-grab is deprecated, please use " + "-display sdl,grab-mod=3Dlshift-lctrl-lalt ins= tead."); break; case QEMU_OPTION_ctrl_grab: ctrl_grab =3D 1; + warn_report("-ctrl-grab is deprecated, please use " + "-display sdl,grab-mod=3Drctrl instead."); break; case QEMU_OPTION_no_quit: dpy.has_window_close =3D true; --=20 2.27.0 From nobody Thu May 2 18:22:17 2024 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=1630588689; cv=none; d=zohomail.com; s=zohoarc; b=WZ3/suc+GDYYHbweFIpIQJvl1YLtsKWRBPiYcrNdnoeNGlV62GGKw9e6M2x+CE/v/YDsYnOSjtRy9MSOK0wPU/Qr36j2QLWFnwzjkEUtiRABqiDaMkh7b0wVcpVOQB3dbuWGX6P1oKZ+NkwDjYbqCoO/uvVjNvjxAXJgHmTBeOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630588689; 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=LptmPP+SlNGQRhguMZhsqLaj+Ithzai8E32562ydMcs=; b=ZVm5lWX72dwBbbXspcBN0Q2CyRddyKrqh9KSbojsCM/c6E1bCuK71/fhAQdFZNGMJrodXHofRMLJ9iiriyx7d6WRz52js3+DdFuVL7/5n6HUAGhTU02Np17oD2Q72CvonrfYO3vjaSzMuENI1lXvLNLzihT1CXJERBeJL5ksNpQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630588689861440.43330435690257; Thu, 2 Sep 2021 06:18:09 -0700 (PDT) Received: from localhost ([::1]:45104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLmbY-00034C-Nj for importer@patchew.org; Thu, 02 Sep 2021 09:18:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLmA0-0005Hd-9U for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLm9y-00075v-J8 for qemu-devel@nongnu.org; Thu, 02 Sep 2021 08:49:39 -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-229-alLTVw80NuO-QhVSXK-CDQ-1; Thu, 02 Sep 2021 08:49:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FBDA801AE3; Thu, 2 Sep 2021 12:49:35 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 802EF10016F2; Thu, 2 Sep 2021 12:49:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630586977; 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=LptmPP+SlNGQRhguMZhsqLaj+Ithzai8E32562ydMcs=; b=dRcOE76doAPNFqxDlXpjjlmnEc6/QKG3d+Fh50K2gIvMDwIvF5vzJBM6YIvsRfeqo+gDfY W/SLfW+NNuy1hlAbKK0x0MdWHSmmtzCxOzCDl5hwM+TnzEeDv0gbXSIKocrKkSnh0+k1AG mjc2x2yJCdYXy4AnOTJ6cwHgeDMjB9w= X-MC-Unique: alLTVw80NuO-QhVSXK-CDQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 13/13] softmmu/vl: Deprecate the -sdl and -curses option Date: Thu, 2 Sep 2021 14:49:11 +0200 Message-Id: <20210902124911.822423-14-thuth@redhat.com> In-Reply-To: <20210902124911.822423-1-thuth@redhat.com> References: <20210902124911.822423-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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) X-ZM-MESSAGEID: 1630588690672100001 Content-Type: text/plain; charset="utf-8" It's not that much complicated to type "-display sdl" or "-display curses", so we should not clutter our main option name space with such simple wrapper options and rather present the users with a concise interface instead. Thus let's deprecate the "-sdl" and "-curses" wrapper options now. Message-Id: <20210825092023.81396-4-thuth@redhat.com> Reviewed-by: Gerd Hoffmann Acked-by: Peter Krempa Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 10 ++++++++++ softmmu/vl.c | 3 +++ 2 files changed, 13 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 65d8b4370f..6145573be1 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -148,6 +148,16 @@ Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` inst= ead. =20 Use ``-display sdl,grab-mod=3Drctrl`` instead. =20 +``-sdl`` (since 6.2) +'''''''''''''''''''' + +Use ``-display sdl`` instead. + +``-curses`` (since 6.2) +''''''''''''''''''''''' + +Use ``-display curses`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index e9346b49d2..55ab70eb97 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2889,6 +2889,8 @@ void qemu_init(int argc, char **argv, char **envp) dpy.type =3D DISPLAY_TYPE_NONE; break; case QEMU_OPTION_curses: + warn_report("-curses is deprecated, " + "use -display curses instead."); #ifdef CONFIG_CURSES dpy.type =3D DISPLAY_TYPE_CURSES; #else @@ -3262,6 +3264,7 @@ void qemu_init(int argc, char **argv, char **envp) "-display ...,window-close=3Doff instead."); break; case QEMU_OPTION_sdl: + warn_report("-sdl is deprecated, use -display sdl instead.= "); #ifdef CONFIG_SDL dpy.type =3D DISPLAY_TYPE_SDL; break; --=20 2.27.0