From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109474; cv=none; d=zohomail.com; s=zohoarc; b=giZ+aK0L5OYZTdMp+dvIsfJA4XtDWMX4gLNMS/xQMP1mDHra8tSnSQbRwIfU40GoR9TpFFFoYnXifO4p6bNes4DbkijlVVYlRrtXjv9V2/c73wo4uO2Jw/JbgXn3rHb32i/QXuk5UTd81eumKgv6G34sNu4s+tZ+2q7XYBiz35Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109474; h=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=jHPa0rm1AU7E2rxqP9YpAcfulea+NzcuonwymZX2s8o=; b=Z2JlFuxZfa6pQ4i8/Ks0pC0eufZzebTqoLIcnEYLZGlVPw/ZuyXdiKE9ZilgRt9cmCgDSSdoXSL3ExNCpfmQiJOBYpQT+LQpxLTdwVwTePRb6W7behilM36PDD4Y2+4KuqsAYAW50wwHwbjLJ7sk6Y0zWI5P4eVoOLDzTuMU9IQ= 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+importer2=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 1678109474529600.5762291616002; Mon, 6 Mar 2023 05:31:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvD-0002Ki-2P; Mon, 06 Mar 2023 08:30:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAus-0002DB-1i for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAup-0007RR-6A for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-300-ZcPwHsQhOqmeHpwEMtfh0Q-1; Mon, 06 Mar 2023 08:30:05 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01692857AA1; Mon, 6 Mar 2023 13:30:05 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CF8640C10FA; Mon, 6 Mar 2023 13:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHPa0rm1AU7E2rxqP9YpAcfulea+NzcuonwymZX2s8o=; b=QNyyG82+yvwgS2UWyMULUEmH49aiSBUbbB5wEC6AA3k0arMKgJeuxS7EzWtR0TcvrTKlB8 8PriQ4CgApZWjwXli/dAb83FKsmsEj0wQYH9b/sEKNke9Ldcc2c4BAwF6uDFWw39xxSJhx f+yq+PZMy4s10W9oN8THoq7ic8G1t04= X-MC-Unique: ZcPwHsQhOqmeHpwEMtfh0Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 01/16] docs/about/build-platforms: Refine the distro support policy Date: Mon, 6 Mar 2023 14:29:47 +0100 Message-Id: <20230306133002.418421-2-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109475360100003 Content-Type: text/plain; charset="utf-8" For long-term distributions that release a new version only very seldom, we limit the support to five years after the initial release. Otherwise, we might need to support distros like openSUSE 15 for up to 7 or even more years in total due to our "two more years after the next major release" rule, which is just way too much to handle in a project like QEMU that only has limited human resources. Message-Id: <20230223193257.1068205-1-thuth@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- docs/about/build-platforms.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 20b97c3310..89cae5a6bb 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -67,7 +67,8 @@ Non-supported architectures may be removed in the future = following the Linux OS, macOS, FreeBSD, NetBSD, OpenBSD ----------------------------------------- =20 -The project aims to support the most recent major version at all times. Su= pport +The project aims to support the most recent major version at all times for +up to five years after its initial release. Support for the previous major version will be dropped 2 years after the new major version is released or when the vendor itself drops support, whichever com= es first. In this context, third-party efforts to extend the lifetime of a di= stro --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109533; cv=none; d=zohomail.com; s=zohoarc; b=Oypkn8CQZ7EyQJMCbuYyEKSiUEodr+jThK9eyY2m327ebXGl5L9a/jnVmrMpwgG3FdyuKGTGuK8Xc66Drg0d8rEfC1WlQHyLCEdHfcN6HTC919t4y7G1pRxN9uT6d9TCG7TssXkG3hZF+SKBfoeb1jW97iWLN1f0oaA+Zkd96BI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109533; h=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=NiyEML7jUQU6oIhG4edKu9ogrZdmJN4g1ZEYRqafWWQ=; b=jVjTFNakST4S5F1+AXM0tsk7x4hVC6Y9Qo3WF2jK5xWtSa/ASgpIZlID6eVO+a+xCnAffJzlkzdKMoHrAU7sADDWsSJyb9JYQPEn6C+cTPv7BLS+JY1ym1dMs9G6nN7U4xlBplwCKrdxXFQ7/sz0O2Y6qjRKdr1wIFpbRujwC70= 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+importer2=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 1678109533261897.2751120811574; Mon, 6 Mar 2023 05:32:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvV-0002RS-CX; Mon, 06 Mar 2023 08:30:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAur-0002D9-3K for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAup-0007S8-6I for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:12 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-12-sLdjYdt2MsCxegpMDCwZAw-1; Mon, 06 Mar 2023 08:30:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DCB3D183B3CE; Mon, 6 Mar 2023 13:30:05 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42C4C40C10FA; Mon, 6 Mar 2023 13:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NiyEML7jUQU6oIhG4edKu9ogrZdmJN4g1ZEYRqafWWQ=; b=R/hVyz4i2KQai9PG8vN1pSV3h3Z29UXOqbw/L0l3UU83QKO6YVCSDT15tLiT1Gbuacuejh hLc6CiEWGQhsfaJNZRaObk3Aj24TRRO9c5zmJZZA8JaYcIByLYGKVKuveF0gZGv4yb5ac9 PI6lp4mCt0OKxWUCVtYWzxDeNahPxVU= X-MC-Unique: sLdjYdt2MsCxegpMDCwZAw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 02/16] Hexagon (meson.build): define min bison version Date: Mon, 6 Mar 2023 14:29:48 +0100 Message-Id: <20230306133002.418421-3-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109533627100003 Content-Type: text/plain; charset="utf-8" From: Matheus Tavares Bernardino Hexagon's idef-parser machinery uses some bison features that are not available at older versions. The most preeminent example (as it can be used as a sentinel) is "%define parse.error verbose". This was introduced in version 3.0 of the tool, which is able to compile qemu-hexagon just fine. However, compilation fails with the previous minor bison release, v2.7. So let's assert the minimum version at meson.build to give a more comprehensive error message for those trying to compile QEMU. [1]: https://www.gnu.org/software/bison/manual/html_node/_0025define-Summar= y.html#index-_0025define-parse_002eerror Signed-off-by: Matheus Tavares Bernardino Reviewed-by: Thomas Huth Reviewed-by: Alessandro Di Federico Reviewed-by: Taylor Simpson Message-Id: Signed-off-by: Thomas Huth --- target/hexagon/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index c9d31d095c..42b03c81e6 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -183,7 +183,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in targ= et_dirs ) =20 bison =3D generator( - find_program('bison'), + find_program('bison', version: '>=3D3.0'), output: ['@BASENAME@.tab.c', '@BASENAME@.tab.h'], arguments: ['@INPUT@', '--defines=3D@OUTPUT1@', '--output=3D@OUTPU= T0@'] ) --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109522; cv=none; d=zohomail.com; s=zohoarc; b=mZTx2fJtLEoy09uWbq6HzmtEGcIitqrp7Dmi7CTbs7mGC6tOWKV/Vp5QtboNzAUMHb7EwfTmQq3K2/bSvSDbmJcKu/j/LDyjr3tUGTjAug0po2+T9cjYalMDRee5qUJX44Cc17xttTNdaebOttZeRirNFMd/zuySRmLdJGJ0MrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109522; 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=HgXaHNsLm/w0+NNQN3ylAOHNHJXv0PQ+tu0A8yysIzc=; b=HXVHdheDogLz9ZUfS/rOQX4MIk5wVjyeU2E11hhHL9tn3qmthOCKlsFg6bIJpPLPPl+LnsqJUvfUg07Mn2Wa7DVUNWKlouphXIwQQyLcKOdP2zmyMPNi5mcDfyaFydCQ/VqoD2xtk0qPF4v4hmV0YBAyeywX/3oPzK5E1hV/HJo= 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+importer2=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 1678109522780672.834605282778; Mon, 6 Mar 2023 05:32:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvy-0003D6-L0; Mon, 06 Mar 2023 08:31:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAur-0002D8-3M for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAup-0007SA-5m for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:12 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-141-D1zTRuMhNMmLxO3m-bCa1w-1; Mon, 06 Mar 2023 08:30:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6200848D9B; Mon, 6 Mar 2023 13:30:06 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3130640C10FA; Mon, 6 Mar 2023 13:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109410; 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=HgXaHNsLm/w0+NNQN3ylAOHNHJXv0PQ+tu0A8yysIzc=; b=ZJJm4X79MIHAEY41n2kQoJZ/kfe/BG5q69zRVm0rzN7cimbE1ApL4zrL+uJMz6mqBzNMQw imJQNteCduENxkwSGpmzjYtAJCqsJX9C2JHcspavU06LcI2KKamWUdVxLoq9OK16Zo7JPd 7o3qArt16OjuVXdtfpUKBkP+sLAzzOs= X-MC-Unique: D1zTRuMhNMmLxO3m-bCa1w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/16] test: Check vnc enable before compiling vnc test Date: Mon, 6 Mar 2023 14:29:49 +0100 Message-Id: <20230306133002.418421-4-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109523572100001 From: Juan Quintela Signed-off-by: Juan Quintela Message-Id: <20230301104450.1017-1-quintela@redhat.com> Reviewed-by: Thomas Huth Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Thomas Huth --- tests/qtest/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 29a4efb4c2..62eecf2edf 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -309,10 +309,12 @@ qtests =3D { 'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'), } =20 -gvnc =3D dependency('gvnc-1.0', required: false) -if gvnc.found() - qtests +=3D {'vnc-display-test': [gvnc]} - qtests_generic +=3D [ 'vnc-display-test' ] +if vnc.found() + gvnc =3D dependency('gvnc-1.0', required: false) + if gvnc.found() + qtests +=3D {'vnc-display-test': [gvnc]} + qtests_generic +=3D [ 'vnc-display-test' ] + endif endif =20 if dbus_display --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109884; cv=none; d=zohomail.com; s=zohoarc; b=OY0AHwZHBfjGxvHCGXWLialbNbuk1+Tmi1MUAP4JDV52d7ELJvH/LMmOdCfOKSC9BLWC2NKJahAR8G7XrfUgjKtFKLtUWWjejOLQBl9iJI3qyQ3C74V8YclAV73fO/F7KfrHq6eKtpeNx1eWkoLCVqqa485/cAx2OJ5WD59xgmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109884; h=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=3JaVZcW7ml3Z0VKLkzj7DxkyKBCJ1V5N6R1yW9jgnos=; b=kCXiNv/DrdGRS5lujlKExQfh26TG5V26biDqL+la0n7uFj2WW1wgz0z9qvA/tMEULNIdV9TTaY1a/kNpgHW6Kt0WeV1jUrS+nCHWQoMK8K/y2GjFZkcAx7C2+ifkfJgg1k7VLFiKAOSuNuh0MBgKN+nZPuAW4oqVDVmh8PWG248= 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+importer2=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 1678109884658472.34845900173707; Mon, 6 Mar 2023 05:38:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAw8-00041T-Jh; Mon, 06 Mar 2023 08:31:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAus-0002DD-9e for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuq-0007Sb-R2 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:14 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-102-eBpK0OGOMsGBtxuazBTo6g-1; Mon, 06 Mar 2023 08:30:08 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F6FB100F909; Mon, 6 Mar 2023 13:30:07 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16F5640C1106; Mon, 6 Mar 2023 13:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3JaVZcW7ml3Z0VKLkzj7DxkyKBCJ1V5N6R1yW9jgnos=; b=hn78AGQR/YkTh6Ldmf/eQPSq1Hg2f1U5Q2m6Se9qsXiWrdPMWc94UPXlwTa9FRBiNqU2SP ilQoMXfYPL/J6OHYzU8B87JZrbPZ3YEaxegK8Mt8DePJEKR0QVTT5hBDzz4Y4Yk+OhwE5b uKyb5Wl0Q2uN4CecIPpWZMoFJpcaL/c= X-MC-Unique: eBpK0OGOMsGBtxuazBTo6g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/16] include/hw/i386: Clean up includes in x86.h Date: Mon, 6 Mar 2023 14:29:50 +0100 Message-Id: <20230306133002.418421-5-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109886170100013 Content-Type: text/plain; charset="utf-8" nmi.h and notify.h are not needed here, drop them to speed up the compiling a little bit. Message-Id: <20230210111438.1114600-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- include/hw/i386/x86.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 0b337a036c..da19ae1546 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -18,10 +18,8 @@ #define HW_I386_X86_H =20 #include "exec/hwaddr.h" -#include "qemu/notify.h" =20 #include "hw/boards.h" -#include "hw/nmi.h" #include "hw/intc/ioapic.h" #include "hw/isa/isa.h" #include "qom/object.h" --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109503; cv=none; d=zohomail.com; s=zohoarc; b=nqeiVeZxf3mDqmj9p/l9vihya8/Ph8Bg8gbUKyOauJjSiU4KwTYL0fflGgRtpZrWhyppthqnEHav5hfXDHeSC8An8BZeFlX2DLR1g5Ve8B3NbRLkJw8Ti+/o+Sm9h3KkfSijKMspznmAtb7CAiH/4DnJYzoUoaPdm/algPPcptA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109503; 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=kS8KasNfTswDnNXAFuB51+ZIYfmtL/DoevufufiD6oU=; b=IQTvzoPY6TokBab/Kpd1NGblokDJO5WWzIaRJkWREGhirVp/vrjEXt2Y4J5tYoBE6Ao47znnP7UUu87snZkzLiZkfvLz2pZ9MxbdkPIi8Dku5tFWSXdiMSoTl9mZaefXIhZILebqFJ4osjl2ZVBfEUBvK+prfVgqmLWG6miTHHw= 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+importer2=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 1678109503272130.77741533233575; Mon, 6 Mar 2023 05:31:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAw0-0003Zi-Hb; Mon, 06 Mar 2023 08:31:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAus-0002DE-Cy for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuq-0007Si-Sb for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:14 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-Uji9_Pd6OOOzxsHDwBasmw-1; Mon, 06 Mar 2023 08:30:08 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 828431C05B0A; Mon, 6 Mar 2023 13:30:08 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id E52DB40C945A; Mon, 6 Mar 2023 13:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109412; 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=kS8KasNfTswDnNXAFuB51+ZIYfmtL/DoevufufiD6oU=; b=A/uPk9DtxxE/KemTGK94gNh1egGqkxuvdy8HToS7GMAsYyBmM69mmpIVWD/dB/gsE8b1Ci 8hjcKvRa1gV1rjbaGXh0dvv3LXkb6lYBaRBXrEW+FNPuwexeu/r+ccDL/0dkmffAVqNe+O r4yeBgw6kqcmb463eFschcSZBJcVb6A= X-MC-Unique: Uji9_Pd6OOOzxsHDwBasmw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 05/16] docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation Date: Mon, 6 Mar 2023 14:29:51 +0100 Message-Id: <20230306133002.418421-6-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109503533100001 Hardly anybody still uses 32-bit x86 hosts today, so we should start deprecating them to stop wasting our time and CI minutes here. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wilfred Mallawa Message-Id: <20230306084658.29709-2-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 15084f7bea..1ca9dc33d6 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -196,6 +196,17 @@ CI coverage support may bitrot away before the depreca= tion process completes. The little endian variants of MIPS (both 32 and 64 bit) are still a supported host architecture. =20 +System emulation on 32-bit x86 hosts (since 8.0) +'''''''''''''''''''''''''''''''''''''''''''''''' + +Support for 32-bit x86 host deployments is increasingly uncommon in mainst= ream +OS distributions given the widespread availability of 64-bit x86 hardware. +The QEMU project no longer considers 32-bit x86 support for system emulati= on to +be an effective use of its limited resources, and thus intends to disconti= nue +it. Since all recent x86 hardware from the past >10 years is capable of the +64-bit x86 extensions, a corresponding 64-bit OS should be used instead. + + QEMU API (QAPI) events ---------------------- =20 --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109773; cv=none; d=zohomail.com; s=zohoarc; b=l3jIJ0wubF7wU+KRywuxVylaMbmm4CDi1B7wo0SBIJWjlvKM8pmaYTc6f2R7k1imaCVyQ2Km8m8/HW2XT8LWrPWviawEvRY+UDTblCEkZ9L/jIWARFCpnuXWXbysF9j2BUba2Y+tiLvEs7Ax2YWtqOLORhwz2we3LyDlD3vDhwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109773; 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=GxvtnRTxvPlVVnGaElpphYs+9Dfdgq1Stsq+dNOzG28=; b=Lzk43aI72Q/Ecb276JhvmzkfKGrr4UDhvZgxWcfA9P1wDUTD07aFbdWushJ6uMkk88HoOSCa5n0y6qIMPWVNLdTm7FbjFZ4Sp0VX2G0WePOQPuRma6JY/B3qizJqmrQF7SoNYK3kldK84nZN3MBngkyX6BrcGpAz7TtTSZvpzVw= 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+importer2=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 1678109773266886.5109166306889; Mon, 6 Mar 2023 05:36:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvv-0002gL-78; Mon, 06 Mar 2023 08:31:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAut-0002DN-AX for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAur-0007Sz-Eu for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-VN34VidpMG2FX8Hr8w3P6g-1; Mon, 06 Mar 2023 08:30:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DA661C05B06; Mon, 6 Mar 2023 13:30:09 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB3EB40C10FA; Mon, 6 Mar 2023 13:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109412; 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=GxvtnRTxvPlVVnGaElpphYs+9Dfdgq1Stsq+dNOzG28=; b=SHNqA8JoyOepGDtTLhe73Gx3dWxb0QVsA2Neld8Sz1PiKskUy0fq3ogYfWx2XB9nmvu1+K iWIQviPtcE94JARo/TVw9g80/Ag3tQt7SUwQcJwIOScmGjSsSx3yQI5TZyovfv6rkAlSmO mdITnBSqsSQxRBwy7iW1hFw0TuLEhjQ= X-MC-Unique: VN34VidpMG2FX8Hr8w3P6g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 06/16] gitlab-ci.d/crossbuilds: Drop the i386 system emulation job Date: Mon, 6 Mar 2023 14:29:52 +0100 Message-Id: <20230306133002.418421-7-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109775353100003 Hardly anybody still uses 32-bit x86 environments for running QEMU with full system emulation, so let's stop wasting our scarce CI minutes with this job. (There are still the 32-bit MinGW and TCI jobs around for having some compile test coverage on 32-bit) Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wilfred Mallawa Message-Id: <20230306084658.29709-4-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- .gitlab-ci.d/crossbuilds.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index d3a31a2112..a25cb87ae4 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -43,16 +43,6 @@ cross-arm64-user: variables: IMAGE: debian-arm64-cross =20 -cross-i386-system: - extends: - - .cross_system_build_job - - .cross_test_artifacts - needs: - job: i386-fedora-cross-container - variables: - IMAGE: fedora-i386-cross - MAKE_CHECK_ARGS: check-qtest - cross-i386-user: extends: - .cross_user_build_job --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109445; cv=none; d=zohomail.com; s=zohoarc; b=cSVpDMBG9Yfgw7k8TLiDFuth5KRdKZWOsnMJGObEbaH7Vf0xEy+9LJsEqKoAjEjWNpwDJK5Hlug2OhBqznHc/Of/R3inXT+EqIWC+WKanHsvPYnwO7SfX8oF8Ub/FFv8G5vYyeKyDRcQQYxUEmQwbfwtLJ0wp649hlJQFaga0cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109445; 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=dU6+qv0UcWDwkP6bN+TjXZd2hebGsXxnHQ2DJ1WX2nU=; b=W3gr6kEnO4G1rVeBbD+53wk4P540aiGKHpP5uEIiAxdRuE73k1DrDnWKr/+MA2rLwb3Q5mFIpu6vGURFdFFpXPAvK55XPjDV5qidos8oXuNc8haBXBgsKh2X6h5+xj6PbJlhhu6LFesC0dIl3EicPQ+NOmoN2yWSvTScFbsYL3U= 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+importer2=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 167810944562033.69235487256776; Mon, 6 Mar 2023 05:30:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAv5-0002H0-4N; Mon, 06 Mar 2023 08:30:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAus-0002DC-3Q for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuq-0007Se-F6 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-63-tjjs29M3NF2tpbAyrbAR3g-1; Mon, 06 Mar 2023 08:30:10 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 47AA4100F908; Mon, 6 Mar 2023 13:30:10 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0B9D40C10FA; Mon, 6 Mar 2023 13:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109411; 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=dU6+qv0UcWDwkP6bN+TjXZd2hebGsXxnHQ2DJ1WX2nU=; b=iB9z54kacW7YoCSZZ32RW5Eo+nQKMeFHwh1wUU4Qx0eq68gcidJ5x+Hju2PucPTRQYRunz aAqYDJseTaDYT5WH6ferd+GYi3pH3trMS7tdiuTs7eT+5fF0vzfcdKZNQegruuE+0F/l/F ElqbqbKf6Kgy/U6m70u/clRM1BP3WYU= X-MC-Unique: tjjs29M3NF2tpbAyrbAR3g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/16] docs/about/deprecated: Deprecate 32-bit arm hosts for system emulation Date: Mon, 6 Mar 2023 14:29:53 +0100 Message-Id: <20230306133002.418421-8-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109447584100003 For running QEMU in system emulation mode, the user needs a rather strong host system, i.e. not only an embedded low-frequency controller. All recent beefy arm host machines should support 64-bit now, it's unlikely that anybody is still seriously using QEMU on a 32-bit arm CPU, so we deprecate the 32-bit arm hosts here to finally save use some time and precious CI minutes. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wilfred Mallawa Message-Id: <20230306084658.29709-5-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1ca9dc33d6..7cf6e14614 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -206,6 +206,15 @@ be an effective use of its limited resources, and thus= intends to discontinue it. Since all recent x86 hardware from the past >10 years is capable of the 64-bit x86 extensions, a corresponding 64-bit OS should be used instead. =20 +System emulation on 32-bit arm hosts (since 8.0) +'''''''''''''''''''''''''''''''''''''''''''''''' + +Since QEMU needs a strong host machine for running full system emulation, = and +all recent powerful arm hosts support 64-bit, the QEMU project deprecates = the +support for running any system emulation on 32-bit arm hosts in general. U= se +64-bit arm hosts for system emulation instead. (Note: "user" mode emulation +continuous to be supported on 32-bit arm hosts, too) + =20 QEMU API (QAPI) events ---------------------- --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109706; cv=none; d=zohomail.com; s=zohoarc; b=XH+HLwbJDTZmUji19rX0aB4RoYPfkOc4PlsY4MEejj2BR43sTF9z3/yMsrGhPWNOqqN/4SfMBoFeMlpH5Lxh47qqbcgr1u7dZfHKIDQu+SCVG43aT3TOwhB5k1FyUe6R5qLU2dyeuSpVCglmy5SBH3Sy3Dt9BUBeB6krq2mBetw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109706; 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=NesvX9J7cFq3kpAeNAmZ2EBHH1xqH6bWsM7emReZQqk=; b=WhD00zySHVwg7uWZtAwmlrR19vURjGUj7atkM3XIPEAc73jCqkB/O29si/n3MjvIaEYUlhk1Azr3ysDm/LiKG3r9IbtUMt8APH6XlW6qZv1mdFIRTLeT3zqvzbY7mhbCQ82EOQg4gZZBd/lieSEQMwJ0lBbrtsjbXmlPgaZvIDo= 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+importer2=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 1678109706925552.8058921441052; Mon, 6 Mar 2023 05:35:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvz-0003Mu-Lc; Mon, 06 Mar 2023 08:31:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAvi-0002gE-Hc for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:31:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAvg-0007fz-Tw for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:31:06 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-wNGTB65ENFunKHAeESWWhg-1; Mon, 06 Mar 2023 08:30:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2011438149A2; Mon, 6 Mar 2023 13:30:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87DE240C10FA; Mon, 6 Mar 2023 13:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109463; 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=NesvX9J7cFq3kpAeNAmZ2EBHH1xqH6bWsM7emReZQqk=; b=KQ84KAwBbCVNOx7mjZHPzQqaGyM1Epb5FE7hOWYT+w0f25/szBC4EgB9ZXPrNyyFYFYujn rFzn7xdtVyO2hPEmxl3nH4ctjrQE2T4HKd02K2/e7RefOYTN02nVLN1LvWpvjjJWq9DY6j gF63Sm9hoyCR/TscpaMuwaM2f3KBl70= X-MC-Unique: wNGTB65ENFunKHAeESWWhg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/16] gitlab-ci.d/crossbuilds: Drop the 32-bit arm system emulation jobs Date: Mon, 6 Mar 2023 14:29:54 +0100 Message-Id: <20230306133002.418421-9-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109708234100007 Hardly anybody still uses 32-bit arm environments for running QEMU, so let's stop wasting our scarce CI minutes with these jobs. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wilfred Mallawa Message-Id: <20230306084658.29709-6-thuth@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/crossbuilds.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index a25cb87ae4..61b8ac86ee 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,13 +1,6 @@ include: - local: '/.gitlab-ci.d/crossbuild-template.yml' =20 -cross-armel-system: - extends: .cross_system_build_job - needs: - job: armel-debian-cross-container - variables: - IMAGE: debian-armel-cross - cross-armel-user: extends: .cross_user_build_job needs: @@ -15,13 +8,6 @@ cross-armel-user: variables: IMAGE: debian-armel-cross =20 -cross-armhf-system: - extends: .cross_system_build_job - needs: - job: armhf-debian-cross-container - variables: - IMAGE: debian-armhf-cross - cross-armhf-user: extends: .cross_user_build_job needs: --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109527; cv=none; d=zohomail.com; s=zohoarc; b=aY2vUWstK8GHmMdSXV/sR3qe06aWK0wsYQ/62Ij1Jubd3V36MwGJh/6OFMSzLnTtL4N0gnxfKvPXqqk8GvYJpFw77KcKVye61NuAnm9CBYkGOxFLt0at6EajJxwAvpzDwVVa6jToJJGq100FdmNL80URJWt9AWs5HS17os4HO2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109527; h=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=j74eENbG/i42s9LMh45ehsEHaqHqVmuXLEJtRm2Y1mU=; b=Q1xeVZ8W9QgRg5Bpwg1O5exdxnLhSGABAJWpJyfzx25IxGO/5I+tnOnjOWZtAYriSHIKaG5czG2WgvcWerNtjy5JVlVNpOFGc1Fu4S5I3rs/tWxHlQf8npAJafXojzGWZZZy+S0kDAClB52oMpeOG38pQdDkw4aDf3h+JJYmkLI= 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+importer2=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 1678109527402212.2622025152731; Mon, 6 Mar 2023 05:32:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvw-0002vA-8Q; Mon, 06 Mar 2023 08:31:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuy-0002FX-3T for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuw-0007Tu-3E for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:19 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-hNdGmYoROL-usFCE3iBkdA-1; Mon, 06 Mar 2023 08:30:13 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBBCD1C05B0A; Mon, 6 Mar 2023 13:30:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E5DF40C10FA; Mon, 6 Mar 2023 13:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j74eENbG/i42s9LMh45ehsEHaqHqVmuXLEJtRm2Y1mU=; b=JynyrENfMSDpOAcCJ6gWU9cEsBxOx7ydAyl61khJBaLgRfnPMinUPTa75HuSnrY/HeWsl2 W6m+Vg+MY5v1Ep6C0PtJ+7DlJh71s+Ev9yahs4+RN5X+948iMOS+NwSmqx9gwjNDmhTvIJ NuK34YQ5aBQvSH/ULBEEuP5oSqxfG60= X-MC-Unique: hNdGmYoROL-usFCE3iBkdA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/16] tests/qtest/readconfig: Rework test_object_rng_resp into a generic function Date: Mon, 6 Mar 2023 14:29:55 +0100 Message-Id: <20230306133002.418421-10-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109529625100003 Content-Type: text/plain; charset="utf-8" test_object_rng_resp() can be reworked quite easily to allow testing for arbitrary objects in the qom-list response. Message-Id: <20230228211533.201837-2-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/readconfig-test.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c index 9ef870643d..26d79b5e4b 100644 --- a/tests/qtest/readconfig-test.c +++ b/tests/qtest/readconfig-test.c @@ -124,13 +124,15 @@ static void test_spice(void) } #endif =20 -static void test_object_rng_resp(QObject *res) +static void test_object_available(QObject *res, const char *name, + const char *type) { Visitor *v; g_autoptr(ObjectPropertyInfoList) objs =3D NULL; ObjectPropertyInfoList *tmp; ObjectPropertyInfo *obj; - bool seen_rng =3D false; + bool object_available =3D false; + g_autofree char *childtype =3D g_strdup_printf("child<%s>", type); =20 g_assert(res); v =3D qobject_input_visitor_new(res); @@ -142,16 +144,15 @@ static void test_object_rng_resp(QObject *res) g_assert(tmp->value); =20 obj =3D tmp->value; - if (g_str_equal(obj->name, "rng0") && - g_str_equal(obj->type, "child")) { - seen_rng =3D true; + if (g_str_equal(obj->name, name) && g_str_equal(obj->type, childty= pe)) { + object_available =3D true; break; } =20 tmp =3D tmp->next; } =20 - g_assert(seen_rng); + g_assert(object_available); =20 visit_free(v); } @@ -170,7 +171,7 @@ static void test_object_rng(void) resp =3D qtest_qmp(qts, "{ 'execute': 'qom-list'," " 'arguments': {'path': '/objects' }}"); - test_object_rng_resp(qdict_get(resp, "return")); + test_object_available(qdict_get(resp, "return"), "rng0", "rng-builtin"= ); qobject_unref(resp); =20 qtest_quit(qts); --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109705; cv=none; d=zohomail.com; s=zohoarc; b=YQ1BquHwdcC0Q8SrcPqOIWjffgvfS+thUuaoF5IoE8bODyRTwDFlxW/IAuFeqqheurkljs5jBOuR9kRSer5RMx5caxG+y1QEXxybW06ch7SDgsDiFLBZpm/HXY/zfyyy3caoKfNO5kiigz0sd8K3GJOxZnf8jZVS4CnkBo2xGOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109705; h=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=Q/0wXgG/FTGtL4N0FkdXvWzeC+aO9IRuiZ5LcRkaaeA=; b=k932og4cuROO0z40OYRygDrl9gGYua0cV3PVLayRWZc058g5q0fp91kSC/o3CTcRdWcfMSZIJCsdLONaUlY0OVFlV+J1+Z6I7Re9Thg3DBY3vq/nZ99eB7ZZsP84Unh/B+cy3DEaIXbuYrXNpGQQsg59TyPU3mdgEwd0sJAcTCs= 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+importer2=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 16781097059671017.715501107643; Mon, 6 Mar 2023 05:35:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvV-0002RL-C8; Mon, 06 Mar 2023 08:30:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuv-0002EO-1g for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAut-0007Ta-Dz for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:16 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-271-8Cxhlue_P_KeweEkj5lKyA-1; Mon, 06 Mar 2023 08:30:13 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E3B993C10694; Mon, 6 Mar 2023 13:30:12 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 388584014CF3; Mon, 6 Mar 2023 13:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q/0wXgG/FTGtL4N0FkdXvWzeC+aO9IRuiZ5LcRkaaeA=; b=UCuPYTxPWe72D0vTUZYXSjkXTu0PfD7TE9I/PznCZ1IdQzevR8UNnUQqLFZybiGGlblJiG Ugglx1twomAl8UcMgMzCahT7vyNZwjLtj5+cnMmIp652n9wK1wTCXClEs+YQNZl1pm7Ge8 DzSonydXrh2EGSBscI23MbnyIWZppng= X-MC-Unique: 8Cxhlue_P_KeweEkj5lKyA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 10/16] tests/qtest/readconfig: Test docs/config/ich9-ehci-uhci.cfg Date: Mon, 6 Mar 2023 14:29:56 +0100 Message-Id: <20230306133002.418421-11-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109706588100001 Content-Type: text/plain; charset="utf-8" We've got some sample config files in docs/config/ but no means of regression checking them. Thus let's test them in our readconfig qtest, starting with ich9-ehci-uhci.cfg. Note: To enable the test to read the config files from the build folder, we have to install a symlink for docs/config in the build directory. Message-Id: <20230228211533.201837-3-thuth@redhat.com> Signed-off-by: Thomas Huth --- configure | 1 + tests/qtest/readconfig-test.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/configure b/configure index 219ff13748..7290493729 100755 --- a/configure +++ b/configure @@ -2262,6 +2262,7 @@ fi # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. LINKS=3D"Makefile" +LINKS=3D"$LINKS docs/config" LINKS=3D"$LINKS pc-bios/optionrom/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS pc-bios/vof/Makefile" diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c index 26d79b5e4b..2160603880 100644 --- a/tests/qtest/readconfig-test.c +++ b/tests/qtest/readconfig-test.c @@ -177,6 +177,26 @@ static void test_object_rng(void) qtest_quit(qts); } =20 +static void test_docs_config_ich9(void) +{ + QTestState *qts; + QDict *resp; + QObject *qobj; + + qts =3D qtest_initf("-nodefaults -readconfig docs/config/ich9-ehci-uhc= i.cfg"); + + resp =3D qtest_qmp(qts, "{ 'execute': 'qom-list'," + " 'arguments': {'path': '/machine/peripheral' }= }"); + qobj =3D qdict_get(resp, "return"); + test_object_available(qobj, "ehci", "ich9-usb-ehci1"); + test_object_available(qobj, "uhci-1", "ich9-usb-uhci1"); + test_object_available(qobj, "uhci-2", "ich9-usb-uhci2"); + test_object_available(qobj, "uhci-3", "ich9-usb-uhci3"); + qobject_unref(resp); + + qtest_quit(qts); +} + int main(int argc, char *argv[]) { const char *arch; @@ -187,6 +207,7 @@ int main(int argc, char *argv[]) if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64")) { qtest_add_func("readconfig/x86/memdev", test_x86_memdev); + qtest_add_func("readconfig/x86/ich9-ehci-uhci", test_docs_config_i= ch9); } #ifdef CONFIG_SPICE qtest_add_func("readconfig/spice", test_spice); --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109577; cv=none; d=zohomail.com; s=zohoarc; b=GMQMFyWhbNcXFpuU0IS4521Y6XdBFzuQWYNrbfpO9xJeJ0kMmXkvE9S1NG6S3008aIOQkMGSCJHiXIa35GihER3evok79DxuJpdRhsPvqpvEOPh0cZQ3U5F2XG1oAcOcop0ILVVU7vIPc7RKWBLq6NYnE4y2dWUyb2yAW3H11LA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109577; h=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=YNUD2BDhEhX7V0FEnRe/SCADc/rRylFseT1d5wJSPBE=; b=LiyjEw8ZiZCM0dYy606S7huACsEHOAOGUGu3SdiM5uzfgt7ZM/P8ulVN6yfTmiOVU9V4/Nay8ZlzIxS2sj8nWrmsxEyuFslRJ72A0ANtNDPxzTZOS8COTGNhW4gO0QRaNk14Cbfrhd/7HjmkyNVfdsVJGHRl0C1f91kX+g01UIk= 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+importer2=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 1678109577809236.69297038101922; Mon, 6 Mar 2023 05:32:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvx-00032F-Hz; Mon, 06 Mar 2023 08:31:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuz-0002H1-Do for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuw-0007UE-IZ for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:21 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-mCiSxN05NTmXY4M4tdHY5w-1; Mon, 06 Mar 2023 08:30:14 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA03C183B3C3; Mon, 6 Mar 2023 13:30:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 361E640C10FA; Mon, 6 Mar 2023 13:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YNUD2BDhEhX7V0FEnRe/SCADc/rRylFseT1d5wJSPBE=; b=ajTCl+uRwW1TH3UCH4HJ/WU2hB1jw5jsEfXfXpxWc1vPKHNHJIM8EY3IKAFXmHRgqdsLJI 8E/JBG7fn/DCa6WTK9pu2Ukp3rtWGAYKj7NiccimHi7Wjv3TR2Xy9UdVAni89z+hJvdprn B6NR6eGVQQgh0zOeIjiOfQrqlqKZAQ4= X-MC-Unique: mCiSxN05NTmXY4M4tdHY5w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 11/16] docs/config: Set the "kvm" accelerator via "[accel]" section Date: Mon, 6 Mar 2023 14:29:57 +0100 Message-Id: <20230306133002.418421-12-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109578974100003 Content-Type: text/plain; charset="utf-8" Configuring the accelerator should nowadays be done via the "-accel" command line parameter, and thus via the "[accel]" section in config files. We also need this change for the upcoming qtests that will use these config files, since the qtests are already using "-accel" for setting the "qtest" accelerator and QEMU does not like mixing "-accel ..." and "-machine accel=3D...". Message-Id: <20230228211533.201837-4-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/config/mach-virt-graphical.cfg | 4 +++- docs/config/mach-virt-serial.cfg | 4 +++- docs/config/q35-emulated.cfg | 2 ++ docs/config/q35-virtio-graphical.cfg | 2 ++ docs/config/q35-virtio-serial.cfg | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/config/mach-virt-graphical.cfg b/docs/config/mach-virt-gr= aphical.cfg index d6d31b17f5..eba76eb198 100644 --- a/docs/config/mach-virt-graphical.cfg +++ b/docs/config/mach-virt-graphical.cfg @@ -56,9 +56,11 @@ =20 [machine] type =3D "virt" - accel =3D "kvm" gic-version =3D "host" =20 +[accel] + accel =3D "kvm" + [memory] size =3D "1024" =20 diff --git a/docs/config/mach-virt-serial.cfg b/docs/config/mach-virt-seria= l.cfg index 18a7c83731..324b0542ff 100644 --- a/docs/config/mach-virt-serial.cfg +++ b/docs/config/mach-virt-serial.cfg @@ -62,9 +62,11 @@ =20 [machine] type =3D "virt" - accel =3D "kvm" gic-version =3D "host" =20 +[accel] + accel =3D "kvm" + [memory] size =3D "1024" =20 diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg index 99ac918e78..c8806e6d36 100644 --- a/docs/config/q35-emulated.cfg +++ b/docs/config/q35-emulated.cfg @@ -61,6 +61,8 @@ =20 [machine] type =3D "q35" + +[accel] accel =3D "kvm" =20 [memory] diff --git a/docs/config/q35-virtio-graphical.cfg b/docs/config/q35-virtio-= graphical.cfg index 4207f11e4f..148b5d2c5e 100644 --- a/docs/config/q35-virtio-graphical.cfg +++ b/docs/config/q35-virtio-graphical.cfg @@ -55,6 +55,8 @@ =20 [machine] type =3D "q35" + +[accel] accel =3D "kvm" =20 [memory] diff --git a/docs/config/q35-virtio-serial.cfg b/docs/config/q35-virtio-ser= ial.cfg index d2830aec5e..023291390e 100644 --- a/docs/config/q35-virtio-serial.cfg +++ b/docs/config/q35-virtio-serial.cfg @@ -60,6 +60,8 @@ =20 [machine] type =3D "q35" + +[accel] accel =3D "kvm" =20 [memory] --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109541; cv=none; d=zohomail.com; s=zohoarc; b=CTlRT6+wwYl14mohzMEEkdfHxVpSbwqj7ET6gahEMKQznMvxP49jxXlkASCuloFAcbE+XWxvtAJ76/RguPnsjSFVeltlLAYXKPzoQyP84TZNESuAB8mgLU6oC+AfgRUMHa0H2xQGHAGFoQ0SAYvfL2ODbJEJCAv/CIT0yCGY7YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109541; h=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=NZl4S/shIyvcK8HyBWvvznRmTrxATnoSSf5yfmCaFQ0=; b=eKsjtYb00HLypjqr/BRufYN+S6t7DRlX2WudkNrRn8m1KglJr8vHgk0V5IOC7iGCWNP7yv9IN6652a8mbbbozY9NlWcurQban/Tq3gH/+sX4J0QLBE8F8PvojJ+B6tdPioVU3eBq+C0z888nf0cXOirPnwOXvk0GDV+PSzAr+YM= 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+importer2=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 1678109541084577.0023518470488; Mon, 6 Mar 2023 05:32:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvw-0002wl-PN; Mon, 06 Mar 2023 08:31:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuw-0002EV-Ov for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuu-0007Tq-Po for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:18 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-298-tPzlOAdhMMKTJtebWSydlQ-1; Mon, 06 Mar 2023 08:30:14 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D46D811E9C; Mon, 6 Mar 2023 13:30:14 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13E0B4014CF3; Mon, 6 Mar 2023 13:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NZl4S/shIyvcK8HyBWvvznRmTrxATnoSSf5yfmCaFQ0=; b=ay+dpSv7QHRAC+UEZ0uDHTwW+c3Qcatdv+qBRvI7qk9iO62Dxp4r35oI9wYCMUxI04OPOM KPajODPNyIgzkVgtg1hkSNV6ZL8sqUwAObfikQ/ZlZKMGWrHOehC0QzVc9lLcjCstcEFfQ DbFeR28ihKbXgYvQYGp2KYayGnugY/o= X-MC-Unique: tPzlOAdhMMKTJtebWSydlQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 12/16] tests/qtest/readconfig-test: Allow testing for arbitrary memory sizes Date: Mon, 6 Mar 2023 14:29:58 +0100 Message-Id: <20230306133002.418421-13-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109541673100001 Content-Type: text/plain; charset="utf-8" Make test_x86_memdev_resp() more flexible by allowing arbitrary memory sizes as parameter here. Message-Id: <20230228211533.201837-5-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/readconfig-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c index 2160603880..533623f638 100644 --- a/tests/qtest/readconfig-test.c +++ b/tests/qtest/readconfig-test.c @@ -48,7 +48,7 @@ static QTestState *qtest_init_with_config(const char *cfg= data) return qts; } =20 -static void test_x86_memdev_resp(QObject *res) +static void test_x86_memdev_resp(QObject *res, const char *mem_id, int siz= e) { Visitor *v; g_autoptr(MemdevList) memdevs =3D NULL; @@ -63,8 +63,8 @@ static void test_x86_memdev_resp(QObject *res) g_assert(!memdevs->next); =20 memdev =3D memdevs->value; - g_assert_cmpstr(memdev->id, =3D=3D, "ram"); - g_assert_cmpint(memdev->size, =3D=3D, 200 * MiB); + g_assert_cmpstr(memdev->id, =3D=3D, mem_id); + g_assert_cmpint(memdev->size, =3D=3D, size * MiB); =20 visit_free(v); } @@ -80,7 +80,7 @@ static void test_x86_memdev(void) qts =3D qtest_init_with_config(cfgdata); /* Test valid command */ resp =3D qtest_qmp(qts, "{ 'execute': 'query-memdev' }"); - test_x86_memdev_resp(qdict_get(resp, "return")); + test_x86_memdev_resp(qdict_get(resp, "return"), "ram", 200); qobject_unref(resp); =20 qtest_quit(qts); --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109491; cv=none; d=zohomail.com; s=zohoarc; b=awv60TWaTSBrgUG9EQ8dqwHqyNOgWebFJM6WcSkgbVuyqwASC85L3PSQV/46H2PmaNz1AvnQ+OUPKV1lZunUkBFgZhfxIuO41tf6fbqu+A71OMQEQGiBNZo579SI213Eh2/1tjAxzDy/+ouoLeA7W80j6O5jv7Y0MxmUwog4Gzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109491; h=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=9tnOOPBlv8niq6Z/b140HdDHwlS3o7YiJrCtF6qcku4=; b=XHDSuC6qM/XV0JnPLQKTQRayEK/Pwwrgx0q76znWPBDip6LcqPh1pnDpF9wMLoa7OF+i7N92KK0rbMd6sLWqvNR7uC4eZLBWXzVwzeys5UDEb9PrCU/pjkyG5nQMOxWkiMQ5aS3OkziDvebGzL7U2z7VX4BHjS1AkuMe5mXWXLA= 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+importer2=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 1678109491492620.1492788622893; Mon, 6 Mar 2023 05:31:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAvw-0002vD-FM; Mon, 06 Mar 2023 08:31:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuy-0002Fe-CA for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuw-0007UB-Gw for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:20 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-214-tUIB-QDiN6yd_XsUUuE9Og-1; Mon, 06 Mar 2023 08:30:15 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B112802D2E; Mon, 6 Mar 2023 13:30:15 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0A974014CF3; Mon, 6 Mar 2023 13:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9tnOOPBlv8niq6Z/b140HdDHwlS3o7YiJrCtF6qcku4=; b=Ky6/c4A5oaMEFaeI7PM3YxIqUU7zJ3ruigF8o+IcuyMhr0XL5Np46a/e287ZBKawjqema0 msrT4KaAS5uIqegxK4lKnsSoAgYkq0zMxMVWBI8F/OzXiRhsgqezvbbiu2QQXQv/aBtF+c u6shP6+4DOzFQ9t1VDUAFjxUbpAVV0E= X-MC-Unique: tUIB-QDiN6yd_XsUUuE9Og-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 13/16] tests/qtest: Move mkimg() and have_qemu_img() from libqos to libqtest Date: Mon, 6 Mar 2023 14:29:59 +0100 Message-Id: <20230306133002.418421-14-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109493509100003 Content-Type: text/plain; charset="utf-8" These two functions can be useful for other qtests beside the qos-test, too, so move them to libqtest instead. Message-Id: <20230228211533.201837-6-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/libqos/libqos.h | 2 -- tests/qtest/libqtest.h | 21 +++++++++++++++ tests/qtest/libqos/libqos.c | 49 +--------------------------------- tests/qtest/libqtest.c | 52 +++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 50 deletions(-) diff --git a/tests/qtest/libqos/libqos.h b/tests/qtest/libqos/libqos.h index 12d05b2365..c04950e2b1 100644 --- a/tests/qtest/libqos/libqos.h +++ b/tests/qtest/libqos/libqos.h @@ -27,8 +27,6 @@ QOSState *qtest_boot(QOSOps *ops, const char *cmdline_fmt= , ...) G_GNUC_PRINTF(2, 3); void qtest_common_shutdown(QOSState *qs); void qtest_shutdown(QOSState *qs); -bool have_qemu_img(void); -void mkimg(const char *file, const char *fmt, unsigned size_mb); void mkqcow2(const char *file, unsigned size_mb); void migrate(QOSState *from, QOSState *to, const char *uri); void prepare_blkdebug_script(const char *debug_fn, const char *event); diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index fcf1c3c3b3..3380cc1f54 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -832,4 +832,25 @@ void qtest_qom_set_bool(QTestState *s, const char *pat= h, const char *property, * Returns: Value retrieved from property. */ bool qtest_qom_get_bool(QTestState *s, const char *path, const char *prope= rty); + +/** + * have_qemu_img: + * + * Returns: true if "qemu-img" is available. + */ +bool have_qemu_img(void); + +/** + * mkimg: + * @file: File name of the image that should be created + * @fmt: Format, e.g. "qcow2" or "raw" + * @size_mb: Size of the image in megabytes + * + * Create a disk image with qemu-img. Note that the QTEST_QEMU_IMG + * environment variable must point to the qemu-img file. + * + * Returns: true if the image has been created successfully. + */ +bool mkimg(const char *file, const char *fmt, unsigned size_mb); + #endif diff --git a/tests/qtest/libqos/libqos.c b/tests/qtest/libqos/libqos.c index 5ffda080ec..5c0fa1f7c5 100644 --- a/tests/qtest/libqos/libqos.c +++ b/tests/qtest/libqos/libqos.c @@ -137,56 +137,9 @@ void migrate(QOSState *from, QOSState *to, const char = *uri) migrate_allocator(&from->alloc, &to->alloc); } =20 -bool have_qemu_img(void) -{ - char *rpath; - const char *path =3D getenv("QTEST_QEMU_IMG"); - if (!path) { - return false; - } - - rpath =3D realpath(path, NULL); - if (!rpath) { - return false; - } else { - free(rpath); - return true; - } -} - -void mkimg(const char *file, const char *fmt, unsigned size_mb) -{ - gchar *cli; - bool ret; - int rc; - GError *err =3D NULL; - char *qemu_img_path; - gchar *out, *out2; - char *qemu_img_abs_path; - - qemu_img_path =3D getenv("QTEST_QEMU_IMG"); - g_assert(qemu_img_path); - qemu_img_abs_path =3D realpath(qemu_img_path, NULL); - g_assert(qemu_img_abs_path); - - cli =3D g_strdup_printf("%s create -f %s %s %uM", qemu_img_abs_path, - fmt, file, size_mb); - ret =3D g_spawn_command_line_sync(cli, &out, &out2, &rc, &err); - if (err || !g_spawn_check_exit_status(rc, &err)) { - fprintf(stderr, "%s\n", err->message); - g_error_free(err); - } - g_assert(ret && !err); - - g_free(out); - g_free(out2); - g_free(cli); - free(qemu_img_abs_path); -} - void mkqcow2(const char *file, unsigned size_mb) { - return mkimg(file, "qcow2", size_mb); + g_assert_true(mkimg(file, "qcow2", size_mb)); } =20 void prepare_blkdebug_script(const char *debug_fn, const char *event) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 2bfd460531..eaa1e8185f 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -1625,3 +1625,55 @@ bool qtest_qom_get_bool(QTestState *s, const char *p= ath, const char *property) =20 return b; } + +bool have_qemu_img(void) +{ + char *rpath; + const char *path =3D getenv("QTEST_QEMU_IMG"); + if (!path) { + return false; + } + + rpath =3D realpath(path, NULL); + if (!rpath) { + return false; + } else { + free(rpath); + return true; + } +} + +bool mkimg(const char *file, const char *fmt, unsigned size_mb) +{ + gchar *cli; + bool ret; + int rc; + GError *err =3D NULL; + char *qemu_img_path; + gchar *out, *out2; + char *qemu_img_abs_path; + + qemu_img_path =3D getenv("QTEST_QEMU_IMG"); + if (!qemu_img_path) { + return false; + } + qemu_img_abs_path =3D realpath(qemu_img_path, NULL); + if (!qemu_img_abs_path) { + return false; + } + + cli =3D g_strdup_printf("%s create -f %s %s %uM", qemu_img_abs_path, + fmt, file, size_mb); + ret =3D g_spawn_command_line_sync(cli, &out, &out2, &rc, &err); + if (err || !g_spawn_check_exit_status(rc, &err)) { + fprintf(stderr, "%s\n", err->message); + g_error_free(err); + } + + g_free(out); + g_free(out2); + g_free(cli); + free(qemu_img_abs_path); + + return ret && !err; +} --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109535; cv=none; d=zohomail.com; s=zohoarc; b=aiGOFTyvy/ht/osPN6yHKx7t85NWSsczBmwYDy+Q6YyVzJ1C5J0i5VxlpROctkD48p9EuQXmllMdyYy+FoqUEIuDSiDKs/DbIzEuXdV7YQNOX6m7jfJcthSVWAuqGtdPtH16Z3OSmnU9NXk7syNErhXwUNxPVw4iyyWqoYd0es8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109535; h=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=z8QgqZ9d0by4vhWd+VuzZk2l0VZVGr+I9VceecO0F+c=; b=RJHUGZTdlOcHugIV2QerjP0jsHPB1QZcrGyLAheSnlNz8QESUaIKlEpTCgLdxlqgTUIpUSR0eYFnA7BRdGedqfspxMJV2j1IQ4GVdqUaFfSA7eB3AXjsWzFH22ArKh7LtjxBehOKD3Zlclh6Fb/hy1BIxeJR0/Yvykux6Tl4oU0= 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+importer2=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 1678109535698177.23716446881213; Mon, 6 Mar 2023 05:32:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAw0-0003bw-Rg; Mon, 06 Mar 2023 08:31:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAv0-0002Jg-AZ for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAuy-0007Ur-Io for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:22 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-221-TJq4f-wpO7KhyJtp21VEyw-1; Mon, 06 Mar 2023 08:30:16 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74D673C10689; Mon, 6 Mar 2023 13:30:16 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0B5D40C945A; Mon, 6 Mar 2023 13:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z8QgqZ9d0by4vhWd+VuzZk2l0VZVGr+I9VceecO0F+c=; b=fukk/MAvpCvO5kKEwCATb8j+2TLiobjKA4JZJX6pYsVrSRAoA4UQRpsfIYZXHZbv20sTQZ CXUiF7G54gAMcBcCgX9Pua3o53W2EPBg5pf2ocy4HJF6FmHuu93V0QhZxbV2oqmW8YVJUb a6wJxDwBlHQa4WxEKO1qKmHhxl9FUXk= X-MC-Unique: TJq4f-wpO7KhyJtp21VEyw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 14/16] tests/qtest/readconfig: Test docs/config/q35-emulated.cfg Date: Mon, 6 Mar 2023 14:30:00 +0100 Message-Id: <20230306133002.418421-15-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109537654100011 Content-Type: text/plain; charset="utf-8" This config file uses accel =3D "kvm", so it can only work on Linux. It also uses two hard-coded image names which we have to replace with unique temporary files to avoid race conditions. So after creating the temporary image files, we also have to create a copy of the config file where we replaced the hard-coded image names. Once everything is in place, we can start QEMU with this config file and check that everything is available in QEMU. Message-Id: <20230228211533.201837-7-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/readconfig-test.c | 131 ++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c index 533623f638..fe64376e85 100644 --- a/tests/qtest/readconfig-test.c +++ b/tests/qtest/readconfig-test.c @@ -197,6 +197,132 @@ static void test_docs_config_ich9(void) qtest_quit(qts); } =20 +#ifdef CONFIG_LINUX + +static char *make_temp_img(const char *template, const char *format, int s= ize) +{ + GError *error =3D NULL; + char *temp_name; + int fd; + + /* Create a temporary image names */ + fd =3D g_file_open_tmp(template, &temp_name, &error); + if (fd =3D=3D -1) { + fprintf(stderr, "unable to create file: %s\n", error->message); + g_error_free(error); + return NULL; + } + close(fd); + + if (!mkimg(temp_name, format, size)) { + fprintf(stderr, "qemu-img failed to create %s\n", temp_name); + g_free(temp_name); + return NULL; + } + + return temp_name; +} + +static void test_docs_q35_emulated(void) +{ + QTestState *qts; + QDict *resp; + QObject *qobj; + int ret, i; + g_autofree char *cfg_file =3D NULL, *sedcmd =3D NULL; + g_autofree char *hd_file =3D NULL, *cd_file =3D NULL; + + struct { + const char *name; + const char *type; + } devices[] =3D { + { "ich9-pcie-port-1", "ioh3420" }, + { "ich9-pcie-port-2", "ioh3420" }, + { "ich9-pcie-port-3", "ioh3420" }, + { "ich9-pcie-port-4", "ioh3420" }, + { "ich9-pci-bridge", "i82801b11-bridge" }, + { "ich9-ehci-1", "ich9-usb-ehci1" }, + { "ich9-ehci-2", "ich9-usb-ehci2" }, + { "ich9-uhci-1", "ich9-usb-uhci1" }, + { "ich9-uhci-2", "ich9-usb-uhci2" }, + { "ich9-uhci-3", "ich9-usb-uhci3" }, + { "ich9-uhci-4", "ich9-usb-uhci4" }, + { "ich9-uhci-5", "ich9-usb-uhci5" }, + { "ich9-uhci-6", "ich9-usb-uhci6" }, + { "sata-disk", "ide-hd" }, + { "sata-optical-disk", "ide-cd" }, + { "net", "e1000" }, + { "video", "VGA" }, + { "ich9-hda-audio", "ich9-intel-hda" }, + { "ich9-hda-duplex", "hda-duplex" }, + }; + + /* Check that all the devices are available in the QEMU binary */ + for (i =3D 0; i < ARRAY_SIZE(devices); i++) { + if (!qtest_has_device(devices[i].type)) { + g_test_skip("one of the required devices is not available"); + return; + } + } + + hd_file =3D make_temp_img("qtest_disk_XXXXXX.qcow2", "qcow2", 1); + cd_file =3D make_temp_img("qtest_cdrom_XXXXXX.iso", "raw", 1); + if (!hd_file || !cd_file) { + g_test_skip("could not create disk images"); + goto cleanup; + } + + /* Create a temporary config file where we replace the disk image name= s */ + ret =3D g_file_open_tmp("q35-emulated-XXXXXX.cfg", &cfg_file, NULL); + if (ret =3D=3D -1) { + g_test_skip("could not create temporary config file"); + goto cleanup; + } + close(ret); + + sedcmd =3D g_strdup_printf("sed -e 's,guest.qcow2,%s,' -e 's,install.i= so,%s,'" + " docs/config/q35-emulated.cfg > '%s'", + hd_file, cd_file, cfg_file); + ret =3D system(sedcmd); + if (ret) { + g_test_skip("could not modify temporary config file"); + goto cleanup; + } + + qts =3D qtest_initf("-machine none -nodefaults -readconfig %s", cfg_fi= le); + + /* Check memory size */ + resp =3D qtest_qmp(qts, "{ 'execute': 'query-memdev' }"); + test_x86_memdev_resp(qdict_get(resp, "return"), "pc.ram", 1024); + qobject_unref(resp); + + resp =3D qtest_qmp(qts, "{ 'execute': 'qom-list'," + " 'arguments': {'path': '/machine/peripheral' }= }"); + qobj =3D qdict_get(resp, "return"); + + /* Check that all the devices have been created */ + for (i =3D 0; i < ARRAY_SIZE(devices); i++) { + test_object_available(qobj, devices[i].name, devices[i].type); + } + + qobject_unref(resp); + + qtest_quit(qts); + +cleanup: + if (hd_file) { + unlink(hd_file); + } + if (cd_file) { + unlink(cd_file); + } + if (cfg_file) { + unlink(cfg_file); + } +} + +#endif /* CONFIG_LINUX */ + int main(int argc, char *argv[]) { const char *arch; @@ -208,6 +334,11 @@ int main(int argc, char *argv[]) g_str_equal(arch, "x86_64")) { qtest_add_func("readconfig/x86/memdev", test_x86_memdev); qtest_add_func("readconfig/x86/ich9-ehci-uhci", test_docs_config_i= ch9); +#ifdef CONFIG_LINUX + if (qtest_has_accel("kvm")) { + qtest_add_func("readconfig/x86/q35-emulated", test_docs_q35_em= ulated); + } +#endif } #ifdef CONFIG_SPICE qtest_add_func("readconfig/spice", test_spice); --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109532; cv=none; d=zohomail.com; s=zohoarc; b=P+TAjsI6PL4mhZ+JR3R5RfTHfmLxXyzuRHIQ20SS6SOqf4j42J3OQv+sPxCe606J5/iUmuCuHOvC5HakqsE2bBirv2nIYiPVsugHckyl3tXww+LWgIS7UawZLbHMwL2kzNw6IqXIbrl9sHuNNKgQlT/G2CfHQh2XXFf3+uVIe2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109532; h=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=2Yyrt6CiWHoBljSro16ah2Kmc5MCn3FrjeEBRMmgB8A=; b=HY6BRB5bB9gjRCVtsbOutg1uoW3xqN5KgA9kKo9bkQq6UOCXUqLHiP9FumVAxss9L9e0rZyz71FgisTve80FtBa8be5QTR3lcqhiZmZJYfF0hZ4OocIvko/wNLQay7x4jISZzhpzBHp7Nwwb4qKTF81L3S7OR8MJ0E3tRfmERwk= 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+importer2=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 1678109532454585.1619549668058; Mon, 6 Mar 2023 05:32:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAw9-00045M-47; Mon, 06 Mar 2023 08:31:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAv5-0002KX-Ba for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAv3-0007Ve-63 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:27 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-530-fmyLP1n4MQK9J8F-UlrpJw-1; Mon, 06 Mar 2023 08:30:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FB9185A5A3; Mon, 6 Mar 2023 13:30:17 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9E454014CF3; Mon, 6 Mar 2023 13:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Yyrt6CiWHoBljSro16ah2Kmc5MCn3FrjeEBRMmgB8A=; b=B7EG+YiXYRHHN78aNvkgmD1zPeonZN85/cq8j1t9a+w5SgTlbZDFvJcRrPWQ1Ga/6+AaR1 c7cVzNBQLuHZfCRhuaBI4X0M9C9fFOD7qhWX46jJ7BNIE25QD9MN7/DettUqkzkize55FY 1HMeGfCUTd/IlIfblWRgE6MHoGNw3RA= X-MC-Unique: fmyLP1n4MQK9J8F-UlrpJw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 15/16] pc-bios: Add support for List-Directed IPL from ECKD DASD Date: Mon, 6 Mar 2023 14:30:01 +0100 Message-Id: <20230306133002.418421-16-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109533683100004 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Check for a List Directed IPL Boot Record, which would supersede the CCW ty= pe entries. If the record is valid, proceed to use the new style pointers and perform LD-IPL. Each block pointer is interpreted as either an LD-IPL pointer or a legacy CCW pointer depending on the type of IPL initiated. In either case CCW- or LD-IPL is transparent to the user and will boot the = same image regardless of which set of pointers is used. Because the interactive = boot menu is only written with the old style pointers, the menu will be disabled= for List Directed IPL from ECKD DASD. If the LD-IPL fails, retry the IPL using the CCW type pointers. If no LD-IPL boot record is found, simply perform CCW type IPL as usual. Signed-off-by: Jared Rossi Message-Id: <20230221174548.1866861-2-jrossi@linux.ibm.com> [thuth: Drop some superfluous parantheses] Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/bootmap.h | 30 ++++++- pc-bios/s390-ccw/bootmap.c | 157 ++++++++++++++++++++++++++++--------- 2 files changed, 148 insertions(+), 39 deletions(-) diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h index 3946aa3f8d..d4690a88c2 100644 --- a/pc-bios/s390-ccw/bootmap.h +++ b/pc-bios/s390-ccw/bootmap.h @@ -45,9 +45,23 @@ typedef struct EckdBlockPtr { * it's 0 for TablePtr, ScriptPtr, and SectionPtr */ } __attribute__ ((packed)) EckdBlockPtr; =20 -typedef struct ExtEckdBlockPtr { +typedef struct LdEckdCHS { + uint32_t cylinder; + uint8_t head; + uint8_t sector; +} __attribute__ ((packed)) LdEckdCHS; + +typedef struct LdEckdBlockPtr { + LdEckdCHS chs; /* cylinder/head/sector is an address of the block */ + uint8_t reserved[4]; + uint16_t count; + uint32_t pad; +} __attribute__ ((packed)) LdEckdBlockPtr; + +/* bptr is used for CCW type IPL, while ldptr is for list-directed IPL */ +typedef union ExtEckdBlockPtr { EckdBlockPtr bptr; - uint8_t reserved[8]; + LdEckdBlockPtr ldptr; } __attribute__ ((packed)) ExtEckdBlockPtr; =20 typedef union BootMapPointer { @@ -57,6 +71,15 @@ typedef union BootMapPointer { ExtEckdBlockPtr xeckd; } __attribute__ ((packed)) BootMapPointer; =20 +typedef struct BootRecord { + uint8_t magic[4]; + uint32_t version; + uint64_t res1; + BootMapPointer pgt; + uint8_t reserved[510 - 32]; + uint16_t os_id; +} __attribute__ ((packed)) BootRecord; + /* aka Program Table */ typedef struct BootMapTable { uint8_t magic[4]; @@ -292,7 +315,8 @@ typedef struct IplVolumeLabel { struct { unsigned char key[4]; /* =3D=3D "VOL1" */ unsigned char volser[6]; - unsigned char reserved[6]; + unsigned char reserved[64]; + EckdCHS br; /* Location of Boot Record for list-directed IPL */ } f; }; } __attribute__((packed)) IplVolumeLabel; diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 994e59c0b0..a2137449dc 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -72,42 +72,74 @@ static inline void verify_boot_info(BootInfo *bip) "Bad block size in zIPL section of the 1st record."); } =20 -static block_number_t eckd_block_num(EckdCHS *chs) +static void eckd_format_chs(ExtEckdBlockPtr *ptr, bool ldipl, + uint64_t *c, + uint64_t *h, + uint64_t *s) +{ + if (ldipl) { + *c =3D ptr->ldptr.chs.cylinder; + *h =3D ptr->ldptr.chs.head; + *s =3D ptr->ldptr.chs.sector; + } else { + *c =3D ptr->bptr.chs.cylinder; + *h =3D ptr->bptr.chs.head; + *s =3D ptr->bptr.chs.sector; + } +} + +static block_number_t eckd_chs_to_block(uint64_t c, uint64_t h, uint64_t s) { const uint64_t sectors =3D virtio_get_sectors(); const uint64_t heads =3D virtio_get_heads(); - const uint64_t cylinder =3D chs->cylinder - + ((chs->head & 0xfff0) << 12); - const uint64_t head =3D chs->head & 0x000f; + const uint64_t cylinder =3D c + ((h & 0xfff0) << 12); + const uint64_t head =3D h & 0x000f; const block_number_t block =3D sectors * heads * cylinder + sectors * head - + chs->sector - - 1; /* block nr starts with zero */ + + s - 1; /* block nr starts with zero */ return block; } =20 -static bool eckd_valid_address(BootMapPointer *p) +static block_number_t eckd_block_num(EckdCHS *chs) { - const uint64_t head =3D p->eckd.chs.head & 0x000f; + return eckd_chs_to_block(chs->cylinder, chs->head, chs->sector); +} + +static block_number_t gen_eckd_block_num(ExtEckdBlockPtr *ptr, bool ldipl) +{ + uint64_t cyl, head, sec; + eckd_format_chs(ptr, ldipl, &cyl, &head, &sec); + return eckd_chs_to_block(cyl, head, sec); +} =20 +static bool eckd_valid_chs(uint64_t cyl, uint64_t head, uint64_t sector) +{ if (head >=3D virtio_get_heads() - || p->eckd.chs.sector > virtio_get_sectors() - || p->eckd.chs.sector <=3D 0) { + || sector > virtio_get_sectors() + || sector <=3D 0) { return false; } =20 if (!virtio_guessed_disk_nature() && - eckd_block_num(&p->eckd.chs) >=3D virtio_get_blocks()) { + eckd_chs_to_block(cyl, head, sector) >=3D virtio_get_blocks()) { return false; } =20 return true; } =20 -static block_number_t load_eckd_segments(block_number_t blk, uint64_t *add= ress) +static bool eckd_valid_address(ExtEckdBlockPtr *ptr, bool ldipl) +{ + uint64_t cyl, head, sec; + eckd_format_chs(ptr, ldipl, &cyl, &head, &sec); + return eckd_valid_chs(cyl, head, sec); +} + +static block_number_t load_eckd_segments(block_number_t blk, bool ldipl, + uint64_t *address) { block_number_t block_nr; - int j, rc; + int j, rc, count; BootMapPointer *bprs =3D (void *)_bprs; bool more_data; =20 @@ -117,7 +149,7 @@ static block_number_t load_eckd_segments(block_number_t= blk, uint64_t *address) do { more_data =3D false; for (j =3D 0;; j++) { - block_nr =3D eckd_block_num(&bprs[j].xeckd.bptr.chs); + block_nr =3D gen_eckd_block_num(&bprs[j].xeckd, ldipl); if (is_null_block_number(block_nr)) { /* end of chunk */ break; } @@ -129,11 +161,26 @@ static block_number_t load_eckd_segments(block_number= _t blk, uint64_t *address) break; } =20 - IPL_assert(block_size_ok(bprs[j].xeckd.bptr.size), + /* List directed pointer does not store block size */ + IPL_assert(ldipl || block_size_ok(bprs[j].xeckd.bptr.size), "bad chunk block size"); - IPL_assert(eckd_valid_address(&bprs[j]), "bad chunk ECKD addr"= ); =20 - if ((bprs[j].xeckd.bptr.count =3D=3D 0) && unused_space(&(bprs= [j+1]), + if (!eckd_valid_address(&bprs[j].xeckd, ldipl)) { + /* + * If an invalid address is found during LD-IPL then break= and + * retry as CCW + */ + IPL_assert(ldipl, "bad chunk ECKD addr"); + break; + } + + if (ldipl) { + count =3D bprs[j].xeckd.ldptr.count; + } else { + count =3D bprs[j].xeckd.bptr.count; + } + + if (count =3D=3D 0 && unused_space(&bprs[j + 1], sizeof(EckdBlockPtr))) { /* This is a "continue" pointer. * This ptr should be the last one in the current @@ -149,11 +196,10 @@ static block_number_t load_eckd_segments(block_number= _t blk, uint64_t *address) /* Load (count+1) blocks of code at (block_nr) * to memory (address). */ - rc =3D virtio_read_many(block_nr, (void *)(*address), - bprs[j].xeckd.bptr.count+1); + rc =3D virtio_read_many(block_nr, (void *)(*address), count + = 1); IPL_assert(rc =3D=3D 0, "code chunk read failed"); =20 - *address +=3D (bprs[j].xeckd.bptr.count+1) * virtio_get_block_= size(); + *address +=3D (count + 1) * virtio_get_block_size(); } } while (more_data); return block_nr; @@ -237,8 +283,10 @@ static void run_eckd_boot_script(block_number_t bmt_bl= ock_nr, uint64_t address; BootMapTable *bmt =3D (void *)sec; BootMapScript *bms =3D (void *)sec; + /* The S1B block number is NULL_BLOCK_NR if and only if it's an LD-IPL= */ + bool ldipl =3D (s1b_block_nr =3D=3D NULL_BLOCK_NR); =20 - if (menu_is_enabled_zipl()) { + if (menu_is_enabled_zipl() && !ldipl) { loadparm =3D eckd_get_boot_menu_index(s1b_block_nr); } =20 @@ -249,7 +297,7 @@ static void run_eckd_boot_script(block_number_t bmt_blo= ck_nr, memset(sec, FREE_SPACE_FILLER, sizeof(sec)); read_block(bmt_block_nr, sec, "Cannot read Boot Map Table"); =20 - block_nr =3D eckd_block_num(&bmt->entry[loadparm].xeckd.bptr.chs); + block_nr =3D gen_eckd_block_num(&bmt->entry[loadparm].xeckd, ldipl); IPL_assert(block_nr !=3D -1, "Cannot find Boot Map Table Entry"); =20 memset(sec, FREE_SPACE_FILLER, sizeof(sec)); @@ -264,13 +312,18 @@ static void run_eckd_boot_script(block_number_t bmt_b= lock_nr, } =20 address =3D bms->entry[i].address.load_address; - block_nr =3D eckd_block_num(&bms->entry[i].blkptr.xeckd.bptr.chs); + block_nr =3D gen_eckd_block_num(&bms->entry[i].blkptr.xeckd, ldipl= ); =20 do { - block_nr =3D load_eckd_segments(block_nr, &address); + block_nr =3D load_eckd_segments(block_nr, ldipl, &address); } while (block_nr !=3D -1); } =20 + if (ldipl && bms->entry[i].type !=3D BOOT_SCRIPT_EXEC) { + /* Abort LD-IPL and retry as CCW-IPL */ + return; + } + IPL_assert(bms->entry[i].type =3D=3D BOOT_SCRIPT_EXEC, "Unknown script entry type"); write_reset_psw(bms->entry[i].address.load_address); /* no return */ @@ -380,6 +433,23 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode) /* no return */ } =20 +static block_number_t eckd_find_bmt(ExtEckdBlockPtr *ptr) +{ + block_number_t blockno; + uint8_t tmp_sec[MAX_SECTOR_SIZE]; + BootRecord *br; + + blockno =3D gen_eckd_block_num(ptr, 0); + read_block(blockno, tmp_sec, "Cannot read boot record"); + br =3D (BootRecord *)tmp_sec; + if (!magic_match(br->magic, ZIPL_MAGIC)) { + /* If the boot record is invalid, return and try CCW-IPL instead */ + return NULL_BLOCK_NR; + } + + return gen_eckd_block_num(&br->pgt.xeckd, 1); +} + static void print_eckd_msg(void) { char msg[] =3D "Using ECKD scheme (block size *****), "; @@ -401,28 +471,43 @@ static void print_eckd_msg(void) =20 static void ipl_eckd(void) { - XEckdMbr *mbr =3D (void *)sec; - LDL_VTOC *vlbl =3D (void *)sec; + IplVolumeLabel *vlbl =3D (void *)sec; + LDL_VTOC *vtoc =3D (void *)sec; + block_number_t ldipl_bmt; /* Boot Map Table for List-Directed IPL */ =20 print_eckd_msg(); =20 - /* Grab the MBR again */ + /* Block 2 can contain either the CDL VOL1 label or the LDL VTOC */ memset(sec, FREE_SPACE_FILLER, sizeof(sec)); - read_block(0, mbr, "Cannot read block 0 on DASD"); + read_block(2, vlbl, "Cannot read block 2"); =20 - if (magic_match(mbr->magic, IPL1_MAGIC)) { - ipl_eckd_cdl(); /* only returns in case of error */ - return; + /* + * First check for a list-directed-format pointer which would + * supersede the CCW pointer. + */ + if (eckd_valid_address((ExtEckdBlockPtr *)&vlbl->f.br, 0)) { + ldipl_bmt =3D eckd_find_bmt((ExtEckdBlockPtr *)&vlbl->f.br); + if (ldipl_bmt) { + sclp_print("List-Directed\n"); + /* LD-IPL does not use the S1B bock, just make it NULL */ + run_eckd_boot_script(ldipl_bmt, NULL_BLOCK_NR); + /* Only return in error, retry as CCW-IPL */ + sclp_print("Retrying IPL "); + print_eckd_msg(); + } + memset(sec, FREE_SPACE_FILLER, sizeof(sec)); + read_block(2, vtoc, "Cannot read block 2"); } =20 - /* LDL/CMS? */ - memset(sec, FREE_SPACE_FILLER, sizeof(sec)); - read_block(2, vlbl, "Cannot read block 2"); + /* Not list-directed */ + if (magic_match(vtoc->magic, VOL1_MAGIC)) { + ipl_eckd_cdl(); /* may return in error */ + } =20 - if (magic_match(vlbl->magic, CMS1_MAGIC)) { + if (magic_match(vtoc->magic, CMS1_MAGIC)) { ipl_eckd_ldl(ECKD_CMS); /* no return */ } - if (magic_match(vlbl->magic, LNX1_MAGIC)) { + if (magic_match(vtoc->magic, LNX1_MAGIC)) { ipl_eckd_ldl(ECKD_LDL); /* no return */ } =20 --=20 2.31.1 From nobody Fri May 3 19:48:20 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678109885; cv=none; d=zohomail.com; s=zohoarc; b=Js1ypSMqT4dd6glMOPqAg7SapZgwY/KVzGfYM8vKqDyP5ui1YseqjTlEF4BWlnTw5yDxPxXjzooTsoOSSgarARFaCYK1siPDcR3wqDKwo6VupTAnzrx/fzvFTbIA8TQv5C/dCXu2fhcq4dQLsT/DnTC4IeNmETFWr3geOrywLlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678109885; h=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=UuKSCGlnqZ1RlzzMRsKGrxjXRiPEQP7BzhCqfp+bNb0=; b=Q6X4Clonfb359qPDqJWeavJn/jItnU1C+Fccr2JfYI5JowsyOI4PpVccnjaMzeM51H8WxkmBoV8vz9jq16FlWk0Kgn6fCoIinVZPr1kcJdN4+WjsBpDCF2Y4T0dCIPDDNO2QQaE3j1JWy05GJ8+6axvYtxBh2whIegKfUtYunt8= 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+importer2=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 1678109885121880.6907306062388; Mon, 6 Mar 2023 05:38:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAwA-0004Dd-9n; Mon, 06 Mar 2023 08:31:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAvA-0002LA-Gf for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZAv8-0007WJ-0e for qemu-devel@nongnu.org; Mon, 06 Mar 2023 08:30:32 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-1tmDNz81PYGLfu0mIrIoMA-1; Mon, 06 Mar 2023 08:30:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 597FF280BF6B; Mon, 6 Mar 2023 13:30:18 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF02940C10FA; Mon, 6 Mar 2023 13:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678109429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UuKSCGlnqZ1RlzzMRsKGrxjXRiPEQP7BzhCqfp+bNb0=; b=DE10+8Ke+s9qW4l3E0gZVAYDJuEs7xmeXM1cnjSZ/FkAMW7AryDadN7O3tMljHbZ29juAX 8OB6uuYlb6uDzTMll5XtXZEXqxBXExM4UpXpwTaLgsjk9BKrNq7R8vQewM21L9c6DtNxaN +4Qg5BwFQq6sglA/s3xu0057ohcEcDE= X-MC-Unique: 1tmDNz81PYGLfu0mIrIoMA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 16/16] pc-bios/s390-ccw: Update s390-ccw.img with the list-directed IPL fix Date: Mon, 6 Mar 2023 14:30:02 +0100 Message-Id: <20230306133002.418421-17-thuth@redhat.com> In-Reply-To: <20230306133002.418421-1-thuth@redhat.com> References: <20230306133002.418421-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678109886198100015 Content-Type: text/plain; charset="utf-8" This update includes the list-directed IPL fix from Jared Rossi. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw.img | Bin 42608 -> 42608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img index 554fcbd1b7af8ea5f8f0d887fba98d52b7a8611d..c9a5a21c50b9e78a7048d456d84= 2ddbfdf9e6ba3 100644 GIT binary patch delta 7990 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 delta 7429 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 --=20 2.31.1