From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214410; cv=none; d=zohomail.com; s=zohoarc; b=kH2GDczdGu2bf2rboNun+DVFu4NHNru+TMOzxEtoMdlq1g5AwDqYA7x9peUzOcCZXYaogR+Ky3gUotIdVoXxkui9oFXGjh2jSGtvgXRBHG76xxq/VzxjOu92NAfc0dt+iBk6Ng/EQN9NJrNEKzOsmB+jFPRFLXIuaoyoiwrmNHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214410; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OI5mO5LZQ5/mmpwpAUKU/P6EZRhdpxebFDszEb7tRss=; b=Ilii3MEJpEa4vQJSqBHpqjUtFXoY775EhkaniB+AvP9gOdiZ5xhswUPVmddSc9OjmdMRTfKCNcmt6S2a3LaoBfIUYnu2YPXNfc3ihJEoJmw8S1760AWQVuvv3gWlS7tmapsGp1aDbDkPf5pJGi0WUuAaeW6lF8qznlNBAygoVvA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214410024893.6128200814436; Tue, 19 Jul 2022 00:06:50 -0700 (PDT) Received: from localhost ([::1]:52570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhJh-0004uT-1h for importer@patchew.org; Tue, 19 Jul 2022 03:06:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHM-00025I-Ui for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45668) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHL-0002yU-FK for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:24 -0400 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-Hx1-qLKHOU-kQyPv9s30sQ-1; Tue, 19 Jul 2022 03:04:15 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F58D85A585; Tue, 19 Jul 2022 07:04:15 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E02A404754B; Tue, 19 Jul 2022 07:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OI5mO5LZQ5/mmpwpAUKU/P6EZRhdpxebFDszEb7tRss=; b=L2wKk9v+EKjllRmsZ3TvR0tENRYliXy8SyMx/VF5qxxc5wo9aWEjr4hU67exVY4e9P5ZJC bJK6Ud4HFJMD4OytGzfL608gN5mGNFpQcTzgPxBoU4pkTA7aV7GL8zxmYVIwX6uk7LPB1L CZPZC45GZE6BCgC+Oru4Yw3iH/uvxIg= X-MC-Unique: Hx1-qLKHOU-kQyPv9s30sQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 01/14] qga: treat get-guest-fsinfo as "best effort" Date: Tue, 19 Jul 2022 09:03:59 +0200 Message-Id: <20220719070412.16757-2-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214411667100001 From: John Snow In some container environments, there may be references to block devices witnessable from a container through /proc/self/mountinfo that reference devices we simply don't have access to in the container, and cannot provide information about. Instead of failing the entire fsinfo command, return stub information for these failed lookups. This allows test-qga to pass under docker tests, which are in turn used by the CentOS VM tests. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20220708153503.18864-2-jsnow@redhat.com> Signed-off-by: Thomas Huth --- qga/commands-posix.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index f18530d85f..954efed01b 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1207,7 +1207,15 @@ static void build_guest_fsinfo_for_device(char const= *devpath, =20 syspath =3D realpath(devpath, NULL); if (!syspath) { - error_setg_errno(errp, errno, "realpath(\"%s\")", devpath); + if (errno !=3D ENOENT) { + error_setg_errno(errp, errno, "realpath(\"%s\")", devpath); + return; + } + + /* ENOENT: This devpath may not exist because of container config = */ + if (!fs->name) { + fs->name =3D g_path_get_basename(devpath); + } return; } =20 --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214575; cv=none; d=zohomail.com; s=zohoarc; b=QmhUZzXFBJSQNg0fqxSIr3bB/ezRZ+qaSmGX0kRy8ZfdmPc52Z78Ej8B7TrRw+zoRBDtGw42A0u362Mo70/ME18DX4spCjkIC6affi9S8VBrrMEphagIBPccTjZZOUj953RBPrfnGl3XGBPwMnUGNN8AbX5PMO5uz4nfhrr96Ew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214575; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kft+hvz7tGodfnhR4aUpMan8cIoarll6c7RRVXIbJR4=; b=h33I6IWZsbe9ULc3mDSDTwgJ3erzflVDmZfdhEVuKCtvZaUJRXRE7cQoRyd9hxu3aArIFCEzTacRP49oHv8WyfrcPGzUKMbOrUY0kp7+qcfPREXUGLwUe2fK8MB6slX1XqPnP28U3tuAspfEgccxoFYlCj6bB7dsEN0G4gpB+18= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165821457557863.38249159849022; Tue, 19 Jul 2022 00:09:35 -0700 (PDT) Received: from localhost ([::1]:60990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhMM-0002Dg-HA for importer@patchew.org; Tue, 19 Jul 2022 03:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHM-00023q-UV for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHJ-0002yB-Kq for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:23 -0400 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-191-ralvMQusNcu1OcP1pn4E-A-1; Tue, 19 Jul 2022 03:04:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B6951C04B4D; Tue, 19 Jul 2022 07:04:16 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E8D540CF8E5; Tue, 19 Jul 2022 07:04:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kft+hvz7tGodfnhR4aUpMan8cIoarll6c7RRVXIbJR4=; b=Xd6FxHtk9cwv0VJghQdR2hi3BJQxTXGe0idnGZi16qV6PpSn1jgYmUp6DQsl0wS2FmLgyE xrGdSKXj9L3FWUGIYkGED6qEtFfSMplCSvI6MtEXl61UU6McDJaJyt4zbMIvrhuZPoisBn kuuvePk6FW1tEUyyA2AusZHUWhZA/B8= X-MC-Unique: ralvMQusNcu1OcP1pn4E-A-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 02/14] tests/vm: use 'cp' instead of 'ln' for temporary vm images Date: Tue, 19 Jul 2022 09:04:00 +0200 Message-Id: <20220719070412.16757-3-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214577075100002 From: John Snow If the initial setup fails, you've permanently altered the state of the downloaded image in an unknowable way. Use 'cp' like our other test setup scripts do. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-3-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/centos b/tests/vm/centos index 5c7bc1c1a9..be4f6ff2f1 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -34,7 +34,7 @@ class CentosVM(basevm.BaseVM): def build_image(self, img): cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2") img_tmp =3D img + ".tmp" - subprocess.check_call(["ln", "-f", cimg, img_tmp]) + subprocess.check_call(['cp', '-f', cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh() --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214585; cv=none; d=zohomail.com; s=zohoarc; b=H8KNxt0gopziTNOuqbnc9ln+E96sbiHE03lgO+Y/T6/C9eKi/rQAmqlP/o+ckgJjtHONuoZ2XVBNJ439rbFyRy/0NJfEvGQYGuYZh3lfwASYQziIi+tokqZU7ovZ1oEwjaXRtpyPDOhI7aQCJdS6ReogaSKOBeE5d2ON/CKJd7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214585; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eqJhDeJ2CjcW2U1DPOhP20A1Cfj8V8usWwKs8mmbKOs=; b=HW3RXlYQWmWIJo/gEKscHnZbzFF88onRArL45Bt5Qm3BOC9oEripZQeTErvA5Q//vD4SZ6o7Q8M7wiobyXllZ6ZhtOTsG6FH+5UwfsY52rAlVphLjEOn/z1RqGfK5xl7IYXClXh75cjbKL5ccukgfxExhF2OGe8bVJqb7JSwFuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214585086625.0646129608218; Tue, 19 Jul 2022 00:09:45 -0700 (PDT) Received: from localhost ([::1]:33304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhMV-0002aV-6B for importer@patchew.org; Tue, 19 Jul 2022 03:09:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHa-0002oz-Ey for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54390) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHY-00030Y-Py for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:38 -0400 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-267-a9pdntg-Nae1JRfedywspw-1; Tue, 19 Jul 2022 03:04:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 27F9A101A54E; Tue, 19 Jul 2022 07:04:17 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AFE640CFD0A; Tue, 19 Jul 2022 07:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eqJhDeJ2CjcW2U1DPOhP20A1Cfj8V8usWwKs8mmbKOs=; b=Mnmji99rggzp4dCXKVcwy6mYZCMZnMtcshNJeWOerxp30ERxQE0QKC8qSx8Y67cP+TwhC9 c7jO2l1NtlTAQTx7WBfHs+ieFN4sk0sUpr2GtU8AMJYPcgcss1FxA2wcxp3ZZ/eckIce6I b/eW6U1Spm78WFLbIlb3xYFne7JYzRo= X-MC-Unique: a9pdntg-Nae1JRfedywspw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 03/14] tests/vm: switch CentOS 8 to CentOS 8 Stream Date: Tue, 19 Jul 2022 09:04:01 +0200 Message-Id: <20220719070412.16757-4-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214587304100001 From: John Snow The old CentOS image didn't work anymore because it was already EOL at the beginning of 2022. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-4-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/centos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/centos b/tests/vm/centos index be4f6ff2f1..3a527c47b3 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# CentOS image +# CentOS 8 Stream image # -# Copyright 2018 Red Hat Inc. +# Copyright 2018, 2022 Red Hat Inc. # # Authors: # Fam Zheng @@ -32,7 +32,7 @@ class CentosVM(basevm.BaseVM): """ =20 def build_image(self, img): - cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2") + cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qco= w2") img_tmp =3D img + ".tmp" subprocess.check_call(['cp', '-f', cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214734; cv=none; d=zohomail.com; s=zohoarc; b=Ap9raFB7dQ8V44kNs5otcHvyRGdgn7Cm/azElmvrN/eMeW3wc7zBGdTI7EsXipCBMK7Et93w4ZZqf0bHC1xeIDLOVsRJAbkW9F4/GV6o6kABpeuQbRWkEZmBSfFvWjo+RVwamFiYxdILYSfmAIFBcnp9iNL/1GrxPkZfivWvBtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214734; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ie2E0PICPsSSJlEqg0tOY96CwVdSAJYzac1Q1eAULLk=; b=KpeExIJqUS6SlRNRwenZhyA2uV5jRzs/k56ZiYfBT1lYlYiKIh9VU9KXE1OTk5nlfkCcCEt0DyNPtE9YcnwU8K0KbXmns2zxQ2D/igm5Uep0H9/fxgNhS6l/GFP7N6EYazO1BK8aLv+b6kLbSQnfEhQx6+a3MVvlvBtkqhtWwcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214734211338.0748396257826; Tue, 19 Jul 2022 00:12:14 -0700 (PDT) Received: from localhost ([::1]:39948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhOu-0007EX-V3 for importer@patchew.org; Tue, 19 Jul 2022 03:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHS-0002KE-Jz for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHQ-0002zN-CV for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:30 -0400 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-660-yamuuct0MqSxwPsIBehing-1; Tue, 19 Jul 2022 03:04:18 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 14BA0101A588; Tue, 19 Jul 2022 07:04:18 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57A9B40CFD0A; Tue, 19 Jul 2022 07:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ie2E0PICPsSSJlEqg0tOY96CwVdSAJYzac1Q1eAULLk=; b=MJTXK1gst+1Io81B4V5/kLrIEt9KoNnBUkmRk27CNN2xwStZsXUNmU931qfqkLgmTGMOQ+ AAYXKPv/f7pBBRGBfQ4B59dOSeesEDGctKwN/m+5rzKBTMlr9uiMBME88rtQP7HU0u/4vG x8OlSxXaU0MTQcrODU73ElIyC8i4DXE= X-MC-Unique: yamuuct0MqSxwPsIBehing-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 04/14] tests/vm: switch centos.aarch64 to CentOS 8 Stream Date: Tue, 19 Jul 2022 09:04:02 +0200 Message-Id: <20220719070412.16757-5-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, URI_DOTEDU=1.246 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214735848100001 From: John Snow Switch this test over to using a cloud image like the base CentOS8 VM test, which helps make this script a bit simpler too. Note: At time of writing, this test seems pretty flaky when run without KVM support for aarch64. Certain unit tests like migration-test, virtio-net-failover, test-hmp and qom-test seem quite prone to fail under TCG. Still, this is an improvement in that at least pure build tests are functional. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-5-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/centos.aarch64 | 174 ++++++---------------------------------- 1 file changed, 24 insertions(+), 150 deletions(-) diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 index 96c450f8be..2de7ef6992 100755 --- a/tests/vm/centos.aarch64 +++ b/tests/vm/centos.aarch64 @@ -20,150 +20,38 @@ import time import traceback import aarch64vm =20 + DEFAULT_CONFIG =3D { 'cpu' : "max", 'machine' : "virt,gic-version=3Dmax", - 'install_cmds' : "yum install -y make ninja-build git python3 gcc gcc-= c++ flex bison, "\ - "yum install -y glib2-devel perl pixman-devel zlib-devel, "\ - "alternatives --set python /usr/bin/python3, "\ - "sudo dnf config-manager "\ - "--add-repo=3Dhttps://download.docker.com/linux/centos/docker-ce.r= epo,"\ - "sudo dnf install --nobest -y docker-ce.aarch64,"\ - "systemctl enable docker", + 'install_cmds' : ( + "dnf config-manager --set-enabled powertools, " + "dnf config-manager --add-repo=3Dhttps://download.docker.com/linux= /centos/docker-ce.repo, " + "dnf install -y make ninja-build git python38 gcc gcc-c++ flex bis= on "\ + "glib2-devel perl pixman-devel zlib-devel docker-ce.aarch64, " + "systemctl enable docker, " + ), # We increase beyond the default time since during boot # it can take some time (many seconds) to log into the VM. 'ssh_timeout' : 60, } =20 + class CentosAarch64VM(basevm.BaseVM): - name =3D "centos.aarch64" + name =3D "centos8.aarch64" arch =3D "aarch64" - login_prompt =3D "localhost login:" - prompt =3D '[root@localhost ~]#' - image_name =3D "CentOS-8-aarch64-1905-dvd1.iso" - image_link =3D "http://mirrors.usc.edu/pub/linux/distributions/centos/= 8.0.1905/isos/aarch64/" + image_name =3D "CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2" + image_link =3D "https://cloud.centos.org/centos/8-stream/aarch64/image= s/" image_link +=3D image_name BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); - sudo chmod a+r /dev/vdb; - tar --checkpoint=3D.10 -xf /dev/vdb; + export SRC_ARCHIVE=3D/dev/vdb; + sudo chmod a+r $SRC_ARCHIVE; + tar -xf $SRC_ARCHIVE; ./configure {configure_opts}; make --output-sync {target} -j{jobs} {verbose}; """ - def set_key_perm(self): - """Set permissions properly on certain files to allow - ssh access.""" - self.console_wait_send(self.prompt, - "/usr/sbin/restorecon -R -v /root/.ssh\n") - self.console_wait_send(self.prompt, - "/usr/sbin/restorecon -R -v "\ - "/home/{}/.ssh\n".format(self._config["guest_user"])) - - def create_kickstart(self): - """Generate the kickstart file used to generate the centos image."= "" - # Start with the template for the kickstart. - ks_file =3D self._source_path + "/tests/vm/centos-8-aarch64.ks" - subprocess.check_call("cp {} ./ks.cfg".format(ks_file), shell=3DTr= ue) - # Append the ssh keys to the kickstart file - # as the post processing phase of installation. - with open("ks.cfg", "a") as f: - # Add in the root pw and guest user. - rootpw =3D "rootpw --plaintext {}\n" - f.write(rootpw.format(self._config["root_pass"])) - add_user =3D "user --groups=3Dwheel --name=3D{} "\ - "--password=3D{} --plaintext\n" - f.write(add_user.format(self._config["guest_user"], - self._config["guest_pass"])) - # Add the ssh keys. - f.write("%post --log=3D/root/ks-post.log\n") - f.write("mkdir -p /root/.ssh\n") - addkey =3D 'echo "{}" >> /root/.ssh/authorized_keys\n' - addkey_cmd =3D addkey.format(self._config["ssh_pub_key"]) - f.write(addkey_cmd) - f.write('mkdir -p /home/{}/.ssh\n'.format(self._config["guest_= user"])) - addkey =3D 'echo "{}" >> /home/{}/.ssh/authorized_keys\n' - addkey_cmd =3D addkey.format(self._config["ssh_pub_key"], - self._config["guest_user"]) - f.write(addkey_cmd) - f.write("%end\n") - # Take our kickstart file and create an .iso from it. - # The .iso will be provided to qemu as we boot - # from the install dvd. - # Anaconda will recognize the label "OEMDRV" and will - # start the automated installation. - gen_iso_img =3D 'genisoimage -output ks.iso -volid "OEMDRV" ks.cfg' - subprocess.check_call(gen_iso_img, shell=3DTrue) - - def wait_for_shutdown(self): - """We wait for qemu to shutdown the VM and exit. - While this happens we display the console view - for easier debugging.""" - # The image creation is essentially done, - # so whether or not the wait is successful we want to - # wait for qemu to exit (the self.wait()) before we return. - try: - self.console_wait("reboot: Power down") - except Exception as e: - sys.stderr.write("Exception hit\n") - if isinstance(e, SystemExit) and e.code =3D=3D 0: - return 0 - traceback.print_exc() - finally: - self.wait() - - def build_base_image(self, dest_img): - """Run through the centos installer to create - a base image with name dest_img.""" - # We create the temp image, and only rename - # to destination when we are done. - img =3D dest_img + ".tmp" - # Create an empty image. - # We will provide this as the install destination. - qemu_img_create =3D "qemu-img create {} 50G".format(img) - subprocess.check_call(qemu_img_create, shell=3DTrue) - - # Create our kickstart file to be fed to the installer. - self.create_kickstart() - # Boot the install dvd with the params as our ks.iso - os_img =3D self._download_with_cache(self.image_link) - dvd_iso =3D "centos-8-dvd.iso" - subprocess.check_call(["cp", "-f", os_img, dvd_iso]) - extra_args =3D "-cdrom ks.iso" - extra_args +=3D " -drive file=3D{},if=3Dnone,id=3Ddrive1,cache=3Dw= riteback" - extra_args +=3D " -device virtio-blk,drive=3Ddrive1,bootindex=3D1" - extra_args =3D extra_args.format(dvd_iso).split(" ") - self.boot(img, extra_args=3Dextra_args) - self.console_wait_send("change the selection", "\n") - # We seem to need to hit esc (chr(27)) twice to abort the - # media check, which takes a long time. - # Waiting a bit seems to be more reliable before hitting esc. - self.console_wait("Checking") - time.sleep(5) - self.console_wait_send("Checking", chr(27)) - time.sleep(5) - self.console_wait_send("Checking", chr(27)) - print("Found Checking") - # Give sufficient time for the installer to create the image. - self.console_init(timeout=3D7200) - self.wait_for_shutdown() - os.rename(img, dest_img) - print("Done with base image build: {}".format(dest_img)) - - def check_create_base_img(self, img_base, img_dest): - """Create a base image using the installer. - We will use the base image if it exists. - This helps cut down on install time in case we - need to restart image creation, - since the base image creation can take a long time.""" - if not os.path.exists(img_base): - print("Generate new base image: {}".format(img_base)) - self.build_base_image(img_base); - else: - print("Use existing base image: {}".format(img_base)) - # Save a copy of the base image and copy it to dest. - # which we will use going forward. - subprocess.check_call(["cp", img_base, img_dest]) =20 def boot(self, img, extra_args=3DNone): aarch64vm.create_flash_images(self._tmpdir, self._efi_aarch64) @@ -185,42 +73,28 @@ class CentosAarch64VM(basevm.BaseVM): super(CentosAarch64VM, self).boot(img, extra_args=3Dextra_args) =20 def build_image(self, img): + cimg =3D self._download_with_cache(self.image_link) img_tmp =3D img + ".tmp" - self.check_create_base_img(img + ".base", img_tmp) - - # Boot the new image for the first time to finish installation. - self.boot(img_tmp) - self.console_init() - self.console_wait_send(self.login_prompt, "root\n") - self.console_wait_send("Password:", - "{}\n".format(self._config["root_pass"])) - - self.set_key_perm() - self.console_wait_send(self.prompt, "rpm -q centos-release\n") - enable_adapter =3D "sed -i 's/ONBOOT=3Dno/ONBOOT=3Dyes/g'" \ - " /etc/sysconfig/network-scripts/ifcfg-enp0s1\n" - self.console_wait_send(self.prompt, enable_adapter) - self.console_wait_send(self.prompt, "ifup enp0s1\n") - self.console_wait_send(self.prompt, - 'echo "qemu ALL=3D(ALL) NOPASSWD:ALL" | '\ - 'sudo tee /etc/sudoers.d/qemu\n') - self.console_wait(self.prompt) - - # Rest of the commands we issue through ssh. + subprocess.run(['cp', '-f', cimg, img_tmp]) + self.exec_qemu_img("resize", img_tmp, "50G") + self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh(wait_root=3DTrue) + self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") =20 # If the user chooses *not* to do the second phase, # then we will jump right to the graceful shutdown if self._config['install_cmds'] !=3D "": install_cmds =3D self._config['install_cmds'].split(',') for cmd in install_cmds: - self.ssh_root(cmd) + self.ssh_root_check(cmd) + self.ssh_root("poweroff") - self.wait_for_shutdown() + self.wait() os.rename(img_tmp, img) print("image creation complete: {}".format(img)) return 0 =20 + if __name__ =3D=3D "__main__": defaults =3D aarch64vm.get_config_defaults(CentosAarch64VM, DEFAULT_CO= NFIG) sys.exit(basevm.main(CentosAarch64VM, defaults)) --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214521; cv=none; d=zohomail.com; s=zohoarc; b=HtzZ9LES71BerM8XMPJqaxbxvMdkl6mchoNFXm725IEHwitna/Q4+UoOEDUBktVLbawQYkxZttTZJssXaI0QpHYfGmN0NxTQtDsKgXtt72j/LWMDdRaWX9yRznaOkEx+qrWtK50VX530uaQkxLFw3i6MTSAAYr+pHUdx3fcsnO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214521; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Om8H4JbQKPJXC/JfPn/zQVuYTh7qW9DwJLKqK2dmGgo=; b=nA2+sMrYvPCCIPPdo5mSXAm3rtvkZjHa5JfGa9dbXts+O6OC42HjdsiAaAuTZxTPNFQy2oX2Cznd8m3o3F3B8ygjR+00kBp4tO/j8Cx8allLSpEGmFq0EdU1U2BpUlIewAzstCKqx7MZyjiQlhfQLB8Y6VZ3X6Pnrqb0wqtYsJs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214521490620.607967594686; Tue, 19 Jul 2022 00:08:41 -0700 (PDT) Received: from localhost ([::1]:57448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhLU-0008F7-Cb for importer@patchew.org; Tue, 19 Jul 2022 03:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHM-00023k-W8 for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:43246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHJ-0002yA-Ja for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:23 -0400 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-421-xAFgZsbeOwaspeiSL2dwyQ-1; Tue, 19 Jul 2022 03:04:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00F4E8037A9; Tue, 19 Jul 2022 07:04:19 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4435240CFD0A; Tue, 19 Jul 2022 07:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Om8H4JbQKPJXC/JfPn/zQVuYTh7qW9DwJLKqK2dmGgo=; b=UIjKJeM+GvYdu6AG9fsff7h8Ep5jDJdkKcnzxF/2YF8X0zzkxKhMukc5IevoSkCfbnH4/k nEdSQintIy3s2tu7c9CWFznSmVVL2L/EPSfwnVsa6nqWAbh9q+wYTuhg2L+qRQSj/p6gnw ORbuwtChrJEGUMc5lCSdHUvSHdSLYwQ= X-MC-Unique: xAFgZsbeOwaspeiSL2dwyQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 05/14] tests/vm: upgrade Ubuntu 18.04 VM to 20.04 Date: Tue, 19 Jul 2022 09:04:03 +0200 Message-Id: <20220719070412.16757-6-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214522720100001 From: John Snow 18.04 has fallen out of our support window, so move ubuntu.aarch64 forward to ubuntu 20.04, which is now our oldest supported Ubuntu release. Notes: This checksum changes periodically; use a fixed point image with a known checksum so that the image isn't re-downloaded on every single invocation. (The checksum for the 18.04 image was already incorrect at the time of writing.) Just like the centos.aarch64 test, this test currently seems very flaky when run as a TCG test. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-6-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/ubuntu.aarch64 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/vm/ubuntu.aarch64 b/tests/vm/ubuntu.aarch64 index b291945a7e..666947393b 100755 --- a/tests/vm/ubuntu.aarch64 +++ b/tests/vm/ubuntu.aarch64 @@ -32,9 +32,13 @@ DEFAULT_CONFIG =3D { class UbuntuAarch64VM(ubuntuvm.UbuntuVM): name =3D "ubuntu.aarch64" arch =3D "aarch64" - image_name =3D "ubuntu-18.04-server-cloudimg-arm64.img" - image_link =3D "https://cloud-images.ubuntu.com/releases/18.04/release= /" + image_name - image_sha256=3D"0fdcba761965735a8a903d8b88df8e47f156f48715c00508e4315c= 506d7d3cb1" + # NOTE: The Ubuntu 20.04 cloud images are periodically updated. The + # fixed image chosen below is the latest release at time of + # writing. Using a rolling latest instead would mean that the SHA + # would be incorrect at an indeterminate point in the future. + image_name =3D "focal-server-cloudimg-arm64.img" + image_link =3D "https://cloud-images.ubuntu.com/focal/20220615/" + ima= ge_name + image_sha256=3D"95a027336e197debe88c92ff2e554598e23c409139e1e750b71b3b= 820b514832" BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658215350; cv=none; d=zohomail.com; s=zohoarc; b=VjCM88ENVA6yFAi6LDh6QMh6Rgw1bgAEAODhlWE7PwHVh0V/FDBAFFfnfLUdewhuQUAYbEBXvALf/1fgJ22/V83vBufU/McaQpgI3LeYObWA43JFzngaoDiToRqdGxt1MpdXCo3VofXKzQfEAdsWD92PzlL21MicYb1Oqj+U/JU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658215350; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AWfRsO6UndV7SgVvUgwWHsCDhVxYFjHdmfkiLAFh6fY=; b=aNDitouT6hCijB43Fo8Sb7TxR64xZGvAAN9wSSjZ4jq1TPvcQjb4TWf8d5GOM+PdeeCyplPtOCVrR6rCaTEM6w3Ksah+iviuV9XA7JWhSaa+XLzOwexpjcPvMAgMOKT0WF9hjkUAOtybAnTnXJI78Otx5FQprCNc0W4QS+oIsZc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658215350600827.2911633566736; Tue, 19 Jul 2022 00:22:30 -0700 (PDT) Received: from localhost ([::1]:60908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhYr-0005Tu-Ho for importer@patchew.org; Tue, 19 Jul 2022 03:22:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHZ-0002li-NS for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHY-00030S-0V for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:37 -0400 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-490-WZ4CqLvSPHygoECma5n5ZQ-1; Tue, 19 Jul 2022 03:04:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1C15185A7BA; Tue, 19 Jul 2022 07:04:19 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 306B9404754B; Tue, 19 Jul 2022 07:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AWfRsO6UndV7SgVvUgwWHsCDhVxYFjHdmfkiLAFh6fY=; b=T00U/8/ekDObnblnYhC0GQAiOPB+Y6ioyuRZM2ToKD6UKq2T7hYG+hWByEOm7QaTH4/gHV OBzADtNvXrJV9IAV6f4UBMRbXG44cg4mxpFMOclg+xVL7ahll9HhmuHhKI3ce17/l3USMf AC419EpXX+KKVWst0YGt8hn28Zewgjs= X-MC-Unique: WZ4CqLvSPHygoECma5n5ZQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 06/14] tests/vm: remove ubuntu.i386 VM test Date: Tue, 19 Jul 2022 09:04:04 +0200 Message-Id: <20220719070412.16757-7-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658215352841100001 From: John Snow Ubuntu 18.04 is out of our support window, and Ubuntu 20.04 does not support i386 anymore. The debian project does, but they do not provide any cloud images for it, a new expect-style script would have to be written. Since we have i386 cross-compiler tests hosted on GitLab CI, we don't need to support this VM test anymore. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-7-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/Makefile.include | 3 +-- tests/vm/ubuntu.i386 | 40 --------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100755 tests/vm/ubuntu.i386 diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 5f5b1fbfe6..a94f0ebf7f 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -17,7 +17,7 @@ EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarc= h64-code.fd) =20 X86_IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) -X86_IMAGES +=3D ubuntu.i386 centos +X86_IMAGES +=3D centos ifneq ($(EFI_AARCH64),) ARM64_IMAGES +=3D ubuntu.aarch64 centos.aarch64 endif @@ -48,7 +48,6 @@ vm-help vm-test: @echo " vm-build-fedora - Build QEMU in Fedora VM" ifneq ($(GENISOIMAGE),) @echo " vm-build-centos - Build QEMU in CentOS VM, with = Docker" - @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" ifneq ($(EFI_AARCH64),) @echo " vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 V= M" @echo " vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 V= M" diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 deleted file mode 100755 index 47681b6f87..0000000000 --- a/tests/vm/ubuntu.i386 +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python3 -# -# Ubuntu i386 image -# -# Copyright 2017 Red Hat Inc. -# -# Authors: -# Fam Zheng -# -# This code is licensed under the GPL version 2 or later. See -# the COPYING file in the top-level directory. -# - -import sys -import basevm -import ubuntuvm - -DEFAULT_CONFIG =3D { - 'install_cmds' : "apt-get update,"\ - "apt-get build-dep -y qemu,"\ - "apt-get install -y libfdt-dev language-pack-en ninja= -build", -} - -class UbuntuX86VM(ubuntuvm.UbuntuVM): - name =3D "ubuntu.i386" - arch =3D "i386" - image_link=3D"https://cloud-images.ubuntu.com/releases/bionic/"\ - "release-20191114/ubuntu-18.04-server-cloudimg-i386.img" - image_sha256=3D"28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37a= c4b4ff04ef" - BUILD_SCRIPT =3D """ - set -e; - cd $(mktemp -d); - sudo chmod a+r /dev/vdb; - tar -xf /dev/vdb; - ./configure {configure_opts}; - make --output-sync {target} -j{jobs} {verbose}; - """ - -if __name__ =3D=3D "__main__": - sys.exit(basevm.main(UbuntuX86VM, DEFAULT_CONFIG)) --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214871; cv=none; d=zohomail.com; s=zohoarc; b=TEywmwotkovgIP+A0FtpRNuuLQvrFb60l3bQwR2FdPo1s+0HVqHmh9iFSkvZB2UvtoNIjW4r2be/F6D2yBaA13GoLHi1wGrFl+owVIgVGNks3uy2nqPHOu5oQG2it3tys60QVR3KmzaID+JI+1ro+yP4XiXZGPQ7SkdJJxbs+Xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214871; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+j9cE30Ixs8bu+fcb3C9B8cDa8DLlSCn1p9RJKsNk6o=; b=Tnj6Ufu4XQDu744akcwWK7Ny2l/K0wRmqKmNbsApFvhex0j3Zc/nHKrorB5HReSQEpV1t4l/4GNzz8awSYXMdP0xrrW8H9XI0YgySbkJV0MjmrXUk6tVEeJyW+iPhLM+uPCEclmH9blqkVJrw+mf7Gb1D0Oi08InPs8dFfugylY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214871880438.57105401597335; Tue, 19 Jul 2022 00:14:31 -0700 (PDT) Received: from localhost ([::1]:45962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhR6-0002wZ-Qn for importer@patchew.org; Tue, 19 Jul 2022 03:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHP-00029f-4a for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29144) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHN-0002z1-Ow for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:26 -0400 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-257-eSy0F7VDMIaS5DIV1BJrAg-1; Tue, 19 Jul 2022 03:04:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CDA1D80A0B7; Tue, 19 Jul 2022 07:04:20 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CE2E40CF8E5; Tue, 19 Jul 2022 07:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+j9cE30Ixs8bu+fcb3C9B8cDa8DLlSCn1p9RJKsNk6o=; b=BI0iUKlPoZBRZIH8z29pe88U28PnYjTNlPFnQAe22SP+URs3HYBnyJp8aELYizcpBu0BPQ PypMwsWi0ztN4CCWF5EMPvRrlldjGGfTp7Pq2FtEA3GSi6R+3dDYgB2/L6jB6FUegHBxJE Aaw1DIAI0fD35Y7u53EfBU/JvWIB54Q= X-MC-Unique: eSy0F7VDMIaS5DIV1BJrAg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 07/14] tests/vm: remove duplicate 'centos' VM test Date: Tue, 19 Jul 2022 09:04:05 +0200 Message-Id: <20220719070412.16757-8-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214873651100001 From: John Snow This is listed twice by accident; we require genisoimage to run the test, so remove the unconditional entry. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-8-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a94f0ebf7f..8d2a164552 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -15,7 +15,7 @@ endif =20 EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) =20 -X86_IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 +X86_IMAGES :=3D freebsd netbsd openbsd fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) X86_IMAGES +=3D centos ifneq ($(EFI_AARCH64),) --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214677; cv=none; d=zohomail.com; s=zohoarc; b=dqruotJYWNGxII57N2qZ6SK2WL4Tvn649cPIy5+58LvWUmt/A47iZmF9QxTjIAcug4U1/GYgmwC7B2q5Crft5ehuwUg4/f8DlczlCrBH5W4wtfXQKRLiyZNXWu9O/8sOYY2/2QMYkC5n38+909D6No9Z01qagfJhVeID7h7uKRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yCe8RnBaqi/5K/5ixqgamPhWm/Um76icno4qSl9vjE0=; b=YhyPqCzT3gOc+kFe6HGL1BdIn08A7I0f6iKkvZkFo7IPvzu4niup+9HmeZ5ZCbxxe/QF4CnH8r1C7oQTbD9JQSvCxXYVr9lOzUHuhPhoHFZ/xrMTGniJ+O0PYhS/DfnLAxwrk6bsZRb9R42zZjZJZw53BXO7WIZNMp37EfPqGl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214677142725.9981004350319; Tue, 19 Jul 2022 00:11:17 -0700 (PDT) Received: from localhost ([::1]:37568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhO0-0005VO-02 for importer@patchew.org; Tue, 19 Jul 2022 03:11:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHN-00026d-J1 for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:26565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHM-0002ye-2p for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:25 -0400 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-297-zKriHjtwOJ69YwTQ-zZkKA-1; Tue, 19 Jul 2022 03:04:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B9ADC811E7A; Tue, 19 Jul 2022 07:04:21 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08F7640CFD0A; Tue, 19 Jul 2022 07:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yCe8RnBaqi/5K/5ixqgamPhWm/Um76icno4qSl9vjE0=; b=g0ooQnTKn34S/6NqZcZS5OpH6KuoBI6epr4O4Rez0emhmVJHWZFBaqqwyqozX9ZFrmUyrO NP9RxY25GPECYlUMcRXUb3/XOX+9LyoKkUpHmRRyW0FMGMbrZDh0wB5Efdb2Gxqfr1LTTj 0kK8L1EJKlo6AW5hK7cCUirW3hdqmUs= X-MC-Unique: zKriHjtwOJ69YwTQ-zZkKA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 08/14] tests/vm: add 1GB extra memory per core Date: Tue, 19 Jul 2022 09:04:06 +0200 Message-Id: <20220719070412.16757-9-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214677534100001 From: John Snow If you try to run a 16 or 32 threaded test, you're going to run out of memory very quickly with qom-test and a few others. Bump the memory limit to try to scale with larger-core machines. Granted, this means that a 16 core processor is going to ask for 16GB, but you *probably* meet that requirement if you have such a machine. 512MB per core didn't seem to be enough to avoid ENOMEM and SIGABRTs in the test cases in practice on a six core machine; so I bumped it up to 1GB which seemed to help. Add this magic in early to the configuration process so that the config file, if provided, can still override it. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Acked-by: Richard Henderson Message-Id: <20220708153503.18864-9-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/basevm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d7d0413df3..4fd9af10b7 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -99,6 +99,11 @@ def __init__(self, args, config=3DNone): self._source_path =3D args.source_path # Allow input config to override defaults. self._config =3D DEFAULT_CONFIG.copy() + + # 1GB per core, minimum of 4. This is only a default. + mem =3D max(4, args.jobs) + self._config['memory'] =3D f"{mem}G" + if config !=3D None: self._config.update(config) self.validate_ssh_keys() --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658215036; cv=none; d=zohomail.com; s=zohoarc; b=BUr4aWDjhSlOkdFkjYUOQa4jiTiyWuOn8loxOEkQ3NbU9OfdKMwUBSBT0WBKxc/wYQt0u3PQpwK9NwdR5Qj0nT2F2sx9ssvEq0JWqCo7NBxbmZPETCyJmwxsedON22HAbmTkWUwXAQIZkkbSQXTdZnMDymqGxJGdFD53DGeGTT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658215036; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6tWijDM9K8IU9bc3MVI7tXseygBp+Hs+39wbY2dCmdc=; b=H4avewl0gORTGKyGEugyyE6rz6hPF6VmdkiL9pp6DwGg9qubl2SSrs7f3i3056EpRJHOSX/hT+SipfE13ui+yyfCWpJCVRP3VXRLVmlw8DGuYJpb6Gq6D5ZyJmmMzJkgepR/AvHM8CrSgssK0cDwWGcXWHA46iIG/6bFsV3EyOA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658215036265140.72275147390326; Tue, 19 Jul 2022 00:17:16 -0700 (PDT) Received: from localhost ([::1]:50334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhTm-00062h-EA for importer@patchew.org; Tue, 19 Jul 2022 03:17:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHQ-0002Ci-CN for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:48901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHO-0002zA-SE for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:28 -0400 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-425-_bVde8hmMgSr6eLwQ9llJQ-1; Tue, 19 Jul 2022 03:04:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A64C6380670D; Tue, 19 Jul 2022 07:04:22 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id E948E40CF8E5; Tue, 19 Jul 2022 07:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6tWijDM9K8IU9bc3MVI7tXseygBp+Hs+39wbY2dCmdc=; b=O6y0tmYQJUqQOY8Lm8JR4zb4TcPF6TGa6ZFD0emOCqpzW7Y8bajkiihM3YqCkei1CckwX/ IF4M8+1paKr1ve4eLEqqn4wNakrA0F72s21Hl36xQqvdfNTFeZDTAPkD9jZEuAPETZMAGl Mh57o5nDeODhyYBqmgikldysLmEue3g= X-MC-Unique: _bVde8hmMgSr6eLwQ9llJQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 09/14] tests/vm: Remove docker cross-compile test from CentOS VM Date: Tue, 19 Jul 2022 09:04:07 +0200 Message-Id: <20220719070412.16757-10-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658215036953100001 From: John Snow The fedora container has since been split apart, so there's no suitable nearby target that would support "test-mingw" as it requires both x32 and x64 support -- so either fedora-cross-win32 nor fedora-cross-win64 would be truly suitable. Just remove this test as superfluous with our current CI infrastructure. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220708153503.18864-10-jsnow@redhat.com> Signed-off-by: Thomas Huth --- tests/vm/centos | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/vm/centos b/tests/vm/centos index 3a527c47b3..097a9ca14d 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -28,7 +28,6 @@ class CentosVM(basevm.BaseVM): tar -xf $SRC_ARCHIVE; make docker-test-block@centos8 {verbose} J=3D{jobs} NETWORK=3D1; make docker-test-quick@centos8 {verbose} J=3D{jobs} NETWORK=3D1; - make docker-test-mingw@fedora {verbose} J=3D{jobs} NETWORK=3D1; """ =20 def build_image(self, img): --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214875; cv=none; d=zohomail.com; s=zohoarc; b=Sq6ZzR+ZsrvavXqiUaPlOwDV87j+H0YEoLn2LRuShIluwD1svMHmXED+PDTBD9SgTh3lEbYoL7SD8dcVK/RCSHeQs17KoxhEk3FUn7PwR83HHtYb7CbuZAJq6wJNW+Ukev7rcnKQjnWoL1uU11q741PnJ8rfCLVW8CmWEtagIKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214875; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2skFCuoZNOni/2rLGH446C6EEkBER13cEUuT3/7jpps=; b=ZLsgcm1Fj5AdOqElo83TfltAB+DDM552TeovYhavhf3I6nSqFlvFP7dt8aPZyV7EjMdRDJYjCoh45pADm8wj8lA2HD2Zop2HgLIAycStpgGrQ4Za3OY3fVZhIls820U2ZsHe4CbgQj4hN5HrLwkogDScJEc3300ahIkb6adT3bY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214875466943.1979305931744; Tue, 19 Jul 2022 00:14:35 -0700 (PDT) Received: from localhost ([::1]:46124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhRB-00033Q-KB for importer@patchew.org; Tue, 19 Jul 2022 03:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHT-0002OA-Lo for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHQ-0002zb-Tl for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:31 -0400 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-550-TW9y30DkOPK_U1no9kapHg-1; Tue, 19 Jul 2022 03:04:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AED281C04B4D; Tue, 19 Jul 2022 07:04:23 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id D595940CFD0A; Tue, 19 Jul 2022 07:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2skFCuoZNOni/2rLGH446C6EEkBER13cEUuT3/7jpps=; b=f74oBP432zMaO4ebzcZ4b1wmPyB+4R4plKaduU+lVt7skVeU6mj/1rps0tH1HbEU0Kmzui SF6jRmCZEMO22C3myEtc18S2BT00GnFp4eWYqxEl/8VLs93PqpjLnm6gkZ69DovCJWTc5C s1MKmoRDut1gkr3hyzPasavsC1l1DW8= X-MC-Unique: TW9y30DkOPK_U1no9kapHg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , Song Gao Subject: [PULL 10/14] qtest/machine-none: Add LoongArch support Date: Tue, 19 Jul 2022 09:04:08 +0200 Message-Id: <20220719070412.16757-11-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214877927100001 Content-Type: text/plain; charset="utf-8" From: Song Gao Update the cpu_maps[] to support the LoongArch target. Signed-off-by: Song Gao Reviewed-by: Richard Henderson Message-Id: <20220713020258.601424-1-gaosong@loongson.cn> Signed-off-by: Thomas Huth --- tests/qtest/machine-none-test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-tes= t.c index d0f8cd9902..f92fab479f 100644 --- a/tests/qtest/machine-none-test.c +++ b/tests/qtest/machine-none-test.c @@ -54,6 +54,7 @@ static struct arch2cpu cpus_map[] =3D { { "riscv64", "rv64" }, { "riscv32", "rv32" }, { "rx", "rx62n" }, + { "loongarch64", "la464"}, }; =20 static const char *get_cpu_model_by_arch(const char *arch) --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214424; cv=none; d=zohomail.com; s=zohoarc; b=beG1yuLJvg25QTCikbo8Qendkc+RrKnUXpC3je81zLl4dqWViCIrxpGqmddnQSaX8Tp+tgt6Y3y8dnpIT6XGrGNcGCJZmyMC1PW/ydeBdk0ld2IuREcF2xcogUBkJ6HxcUAecvBeWTiQJkH9SwPVw93HsaxLGs77piOYZmsfBUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214424; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jZ+J5eTYyql45pUQTI+bb6rTtozajqYSloAA13RFtvA=; b=m5YdL51uudPKvaozQoh38gXVaFTKUzEmb6AOr91vt8+mUuSdFvgYuDFP/nlDasAF1F+IYENsYSi1e7qZzAHqju18j9AFUANYxicJLND3XlsWEuzh9dEroFWM74vwbbBLiDl5qx0o49yciflmZ5/QsSlnXSmcYH/Dun+9jXwoY9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214424252298.3645680307984; Tue, 19 Jul 2022 00:07:04 -0700 (PDT) Received: from localhost ([::1]:53092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhJv-0005FM-8h for importer@patchew.org; Tue, 19 Jul 2022 03:07:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHS-0002Jw-HT for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHQ-0002zQ-Es for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:30 -0400 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-78-tunZLokVO_y5mEOVbJGpIw-1; Tue, 19 Jul 2022 03:04:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82FFD280D217; Tue, 19 Jul 2022 07:04:24 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE254404C6ED; Tue, 19 Jul 2022 07:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jZ+J5eTYyql45pUQTI+bb6rTtozajqYSloAA13RFtvA=; b=Cxrvdb6e7hshPiqrLCr1phb1pPsYRu1w4y5XRutC6RCli+m43CBzMRtBeN/d3DTxiZFdXY 64o6y4SqB/+tZ/QbuWDal3aoRsf8yllyRaxLl3tZ0+UVsnQH/bhFnIje58yhFhl1FAVToW bhIH8xc1fAjLUEKzQr7xF80ppMpcszI= X-MC-Unique: tunZLokVO_y5mEOVbJGpIw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/14] tests/unit: Replace g_memdup() by g_memdup2() Date: Tue, 19 Jul 2022 09:04:09 +0200 Message-Id: <20220719070412.16757-12-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214425876100003 From: Philippe Mathieu-Daud=C3=A9 Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdu= p2-now/5538 The old API took the size of the memory to duplicate as a guint, whereas most memory functions take memory sizes as a gsize. This made it easy to accidentally pass a gsize to g_memdup(). For large values, that would lead to a silent truncation of the size from 64 to 32 bits, and result in a heap area being returned which is significantly smaller than what the caller expects. This can likely be exploited in various modules to cause a heap buffer overflow. Replace g_memdup() by the safer g_memdup2() wrapper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210903174510.751630-24-philmd@redhat.com> Signed-off-by: Thomas Huth --- tests/unit/ptimer-test.c | 22 +++++++++++----------- tests/unit/test-iov.c | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/unit/ptimer-test.c b/tests/unit/ptimer-test.c index a80ef5aff4..04b5f4e3d0 100644 --- a/tests/unit/ptimer-test.c +++ b/tests/unit/ptimer-test.c @@ -798,64 +798,64 @@ static void add_ptimer_tests(uint8_t policy) =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/set_count policy=3D%s", policy_na= me), - g_memdup(&policy, 1), check_set_count, g_free); + g_memdup2(&policy, 1), check_set_count, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/set_limit policy=3D%s", policy_na= me), - g_memdup(&policy, 1), check_set_limit, g_free); + g_memdup2(&policy, 1), check_set_limit, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/oneshot policy=3D%s", policy_name= ), - g_memdup(&policy, 1), check_oneshot, g_free); + g_memdup2(&policy, 1), check_oneshot, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/periodic policy=3D%s", policy_nam= e), - g_memdup(&policy, 1), check_periodic, g_free); + g_memdup2(&policy, 1), check_periodic, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/on_the_fly_mode_change policy=3D%= s", policy_name), - g_memdup(&policy, 1), check_on_the_fly_mode_change, g_free); + g_memdup2(&policy, 1), check_on_the_fly_mode_change, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/on_the_fly_period_change policy= =3D%s", policy_name), - g_memdup(&policy, 1), check_on_the_fly_period_change, g_free); + g_memdup2(&policy, 1), check_on_the_fly_period_change, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/on_the_fly_freq_change policy=3D%= s", policy_name), - g_memdup(&policy, 1), check_on_the_fly_freq_change, g_free); + g_memdup2(&policy, 1), check_on_the_fly_freq_change, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/run_with_period_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_run_with_period_0, g_free); + g_memdup2(&policy, 1), check_run_with_period_0, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/run_with_delta_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_run_with_delta_0, g_free); + g_memdup2(&policy, 1), check_run_with_delta_0, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/periodic_with_load_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_periodic_with_load_0, g_free); + g_memdup2(&policy, 1), check_periodic_with_load_0, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/oneshot_with_load_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_oneshot_with_load_0, g_free); + g_memdup2(&policy, 1), check_oneshot_with_load_0, g_free); g_free(tmp); } =20 diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c index 93bda00f0e..6f7623d310 100644 --- a/tests/unit/test-iov.c +++ b/tests/unit/test-iov.c @@ -172,7 +172,7 @@ static void test_io(void) } iov_from_buf(iov, niov, 0, buf, sz); =20 - siov =3D g_memdup(iov, sizeof(*iov) * niov); + siov =3D g_memdup2(iov, sizeof(*iov) * niov); =20 if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) < 0) { perror("socketpair"); @@ -349,7 +349,7 @@ static void test_discard_front_undo(void) =20 /* Discard zero bytes */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; iov_discard_front_undoable(&iov_tmp, &iov_cnt_tmp, 0, &undo); @@ -360,7 +360,7 @@ static void test_discard_front_undo(void) =20 /* Discard more bytes than vector size */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); @@ -372,7 +372,7 @@ static void test_discard_front_undo(void) =20 /* Discard entire vector */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); @@ -384,7 +384,7 @@ static void test_discard_front_undo(void) =20 /* Discard within first element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D g_test_rand_int_range(1, iov->iov_len); @@ -396,7 +396,7 @@ static void test_discard_front_undo(void) =20 /* Discard entire first element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; iov_discard_front_undoable(&iov_tmp, &iov_cnt_tmp, iov->iov_len, &undo= ); @@ -407,7 +407,7 @@ static void test_discard_front_undo(void) =20 /* Discard within second element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D iov->iov_len + g_test_rand_int_range(1, iov[1].iov_len); @@ -498,7 +498,7 @@ static void test_discard_back_undo(void) =20 /* Discard zero bytes */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; iov_discard_back_undoable(iov, &iov_cnt_tmp, 0, &undo); iov_discard_undo(&undo); @@ -508,7 +508,7 @@ static void test_discard_back_undo(void) =20 /* Discard more bytes than vector size */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); iov_discard_back_undoable(iov, &iov_cnt_tmp, size + 1, &undo); @@ -519,7 +519,7 @@ static void test_discard_back_undo(void) =20 /* Discard entire vector */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); iov_discard_back_undoable(iov, &iov_cnt_tmp, size, &undo); @@ -530,7 +530,7 @@ static void test_discard_back_undo(void) =20 /* Discard within last element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D g_test_rand_int_range(1, iov[iov_cnt - 1].iov_len); iov_discard_back_undoable(iov, &iov_cnt_tmp, size, &undo); @@ -541,7 +541,7 @@ static void test_discard_back_undo(void) =20 /* Discard entire last element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov[iov_cnt - 1].iov_len; iov_discard_back_undoable(iov, &iov_cnt_tmp, size, &undo); @@ -552,7 +552,7 @@ static void test_discard_back_undo(void) =20 /* Discard within second-to-last element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov[iov_cnt - 1].iov_len + g_test_rand_int_range(1, iov[iov_cnt - 2].iov_len); --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658215249; cv=none; d=zohomail.com; s=zohoarc; b=MxAlWIfOnPDYLeGBRDk7C4pRdEDHuGcGHCtTiuD9lg8jXOX2ycm5pkOuE68ilF5mOV1Fy5healWn6Ot1AJ5w+Fu3ri+uekRC7CVEK3u3f4TtStZ8l12zSNUnbquC07UYzk+U9+GSSl/UqPSkGezmX2cAidbTyFQPTYemL8cn1ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658215249; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=68MvqjwHoJV61jkmbC7tQe72+TNoC4BdPoga7TcMYj4=; b=iwxfiodce9uDKN7tljYcvnUSJV+JzE5n/BFWtpSR+ZLHiO0vDR4fMDFadGmOcpqrca/k8L6pnsGgXfD30wl/MUOrhMcR2gypByRXQLdQsHSC4VbM/konnsjstcYddjA4MDGi+Pmi9H2z7VOYGecnpSyZ3aax+c5maY9yP7BwPkw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658215249491348.3686029488822; Tue, 19 Jul 2022 00:20:49 -0700 (PDT) Received: from localhost ([::1]:58468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhXD-0003VC-Gc for importer@patchew.org; Tue, 19 Jul 2022 03:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHW-0002al-Sj for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHV-00030D-AW for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:34 -0400 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-632-mfT56KKcPRe68iWhZypx6w-1; Tue, 19 Jul 2022 03:04:25 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F3738037AC; Tue, 19 Jul 2022 07:04:25 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id B29BA40CFD0A; Tue, 19 Jul 2022 07:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=68MvqjwHoJV61jkmbC7tQe72+TNoC4BdPoga7TcMYj4=; b=Ufj20PEZLGHzE/hEoDCQlBDsyPWr/64E26Fj2GGwOCQ5AA7g1YB69P8ho07nIpURgPnP9W m27p0gd++rdfFdA63T7gpNDKMxlxEip4P/LWrwc0Vo6+hcq/eEblnkoWqRk58QeM232ks9 fupaP8kaBCvjSFJ1tXctZ6+DQ8cEJ+Q= X-MC-Unique: mfT56KKcPRe68iWhZypx6w-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 12/14] Replace 'whitelist' with 'allow' Date: Tue, 19 Jul 2022 09:04:10 +0200 Message-Id: <20220719070412.16757-13-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658215251891100001 Let's use more inclusive language here and avoid terms that are frowned upon nowadays. Message-Id: <20220711095300.60462-1-thuth@redhat.com> Reviewed-by: John Snow Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth --- docs/devel/submitting-a-patch.rst | 2 +- docs/tools/qemu-nbd.rst | 2 +- scripts/vmstate-static-checker.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-pa= tch.rst index 09a8d12c2c..fec33ce148 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -39,7 +39,7 @@ ideas from other posts. If you do subscribe, be prepared = for a high volume of email, often over one thousand messages in a week. The list is moderated; first-time posts from an email address (whether or not you subscribed) may be subject to some delay while waiting for a moderator -to whitelist your address. +to allow your address. =20 The larger your contribution is, or if you plan on becoming a long-term contributor, then the more important the rest of this page becomes. diff --git a/docs/tools/qemu-nbd.rst b/docs/tools/qemu-nbd.rst index 8e08a29e89..faf6349ea5 100644 --- a/docs/tools/qemu-nbd.rst +++ b/docs/tools/qemu-nbd.rst @@ -225,7 +225,7 @@ disconnects: qemu-nbd -f qcow2 file.qcow2 =20 Start a long-running server listening with encryption on port 10810, -and whitelist clients with a specific X.509 certificate to connect to +and allow clients with a specific X.509 certificate to connect to a 1 megabyte subset of a raw file, using the export name 'subset': =20 :: diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-che= cker.py index 539ead62b4..b369388360 100755 --- a/scripts/vmstate-static-checker.py +++ b/scripts/vmstate-static-checker.py @@ -40,7 +40,7 @@ def check_fields_match(name, s_field, d_field): return True =20 # Some fields changed names between qemu versions. This list - # is used to whitelist such changes in each section / description. + # is used to allow such changes in each section / description. changed_names =3D { 'apic': ['timer', 'timer_expiry'], 'e1000': ['dev', 'parent_obj'], --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658215128; cv=none; d=zohomail.com; s=zohoarc; b=NkMDilkEORPN1rfo2iLWAcih68ZYJpkBLDDgr5Hesg6TadTZ+7AzxacOBE0I5dUYfRcoDlwzZJKv+pfHhLdHU4mfgVPe7MqwxaialpB1JAHAzR1GeMkbb3vZUVct+7k94qs5n2vXJL+JiaILvoOM/4KMD4vwtmfNZhhEfCisPt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658215128; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QbOfIaYvUeCxcORd+nTPkzUQYbT1CCjsSqP7XcqQOTY=; b=Mvfnw+bbvnoERoHh9M9MVu4x2yU0N8k6OM7f2XSTac4e1xWhTBP39U0wEAHpEs5jqrpcW9dmSme59emAq0HH+BpbrzGosHO/OsHwL6yGeaIdYeFlYSVrzeepMDsOGUVB0QEhjET0QTglGANMjd5CUaJfdtwzkKqnB0g8TchsjGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658215128231853.5210234552602; Tue, 19 Jul 2022 00:18:48 -0700 (PDT) Received: from localhost ([::1]:54926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhVG-0000mL-D2 for importer@patchew.org; Tue, 19 Jul 2022 03:18:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHT-0002Ou-RP for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHS-0002zm-CU for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:31 -0400 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-128-PIfTBFUBNnK3_wgIV--6eA-1; Tue, 19 Jul 2022 03:04:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4422B3810783; Tue, 19 Jul 2022 07:04:26 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EAAE40CFD0A; Tue, 19 Jul 2022 07:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QbOfIaYvUeCxcORd+nTPkzUQYbT1CCjsSqP7XcqQOTY=; b=EDW6JU8vh07bpQkHs1Yk/ELc2zxZgdaKMsz5eh9G9/ykSxLMMEu+aDEqLLJPw+5hfG0pCc 1edH55+FqjBU7/byzhX4o9pfB7AUltqqEKgwwTgNv9Y8bTwLcKJX6K7+g7N/I/7rm6FthW HenQbzhnRN4PdVHJMRDQqgrA1s1djfI= X-MC-Unique: PIfTBFUBNnK3_wgIV--6eA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 13/14] util: Fix broken build on Haiku Date: Tue, 19 Jul 2022 09:04:11 +0200 Message-Id: <20220719070412.16757-14-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658215129383100001 A recent commit moved some Haiku-specific code parts from oslib-posix.c to cutils.c, but failed to move the corresponding header #include statement, too, so "make vm-build-haiku.x86_64" is currently broken. Fix it by moving the header #include, too. Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils") Message-Id: <20220718172026.139004-1-thuth@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Thomas Huth --- util/cutils.c | 4 ++++ util/oslib-posix.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index 8199dac598..cb43dda213 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -35,6 +35,10 @@ #include #endif =20 +#ifdef __HAIKU__ +#include +#endif + #ifdef G_OS_WIN32 #include #include diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 7a34c1657c..bffec18869 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -62,10 +62,6 @@ #include #endif =20 -#ifdef __HAIKU__ -#include -#endif - #include "qemu/mmap-alloc.h" =20 #ifdef CONFIG_DEBUG_STACK_USAGE --=20 2.31.1 From nobody Sun Feb 8 13:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658214575; cv=none; d=zohomail.com; s=zohoarc; b=IGPVTRt1Hhl2as4LA/3sdLKepeV44zUvD/QcNfY7Xt1r7qijXGA9ug5Ic6C2piKM17UpLXwbuZxv2bn2ZcdxrDiOSLVczVndpjpQxSGD5hOHVmTktJsP+GqI60Aht20jk8iyNBOVUVUfuWr3ITHXM/rk+Utc8VnQJyAnuc1HAuc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658214575; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hM+KUjnNCDrn+8brryG9f3B4r99oqVCjJWAnfAM2dkw=; b=BueKvrSGv9sEqH8pzW3rGGHW3qllnw2PhVDJ1ukFTAnTaCZrHf+Py/CS0nP+pA680HVu+BATRjMDofqBy0v2neHjY1O81ytIswY4zMHxKIk4Qp7oKTZL6hpHTiy0EgQbWL4NqqRR4sg9P3wRdMYru/xbr6TtKTCf7KLH6H/G4zg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658214575148664.4572008631268; Tue, 19 Jul 2022 00:09:35 -0700 (PDT) Received: from localhost ([::1]:60780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDhML-00025J-Ro for importer@patchew.org; Tue, 19 Jul 2022 03:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHY-0002hk-Pm for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDhHX-00030N-9k for qemu-devel@nongnu.org; Tue, 19 Jul 2022 03:04:36 -0400 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-670-IZkKFCYrOvCsFaxYH_hZKQ-1; Tue, 19 Jul 2022 03:04:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18C8F85A588; Tue, 19 Jul 2022 07:04:27 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 755BF404C6ED; Tue, 19 Jul 2022 07:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658214274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hM+KUjnNCDrn+8brryG9f3B4r99oqVCjJWAnfAM2dkw=; b=K8azdpzdNb7hB8LAJ4HHeF0YjUUCqXgcAkpemrEv0Zv0umM/j+Z2ju82mO5Fz91LqDUsk0 iXvvDvWXCRuv7+DUjEQ7ar5bCU1VPT8rslbuBS3R1znI0cyeV6H94SoORhE9Kkoh8TMvxw jJIY90OfOhj7yGCD5Op1b2jE+LHxHzM= X-MC-Unique: IZkKFCYrOvCsFaxYH_hZKQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , John Snow Subject: [PULL 14/14] python/qemu/qmp/legacy: Replace 'returns-whitelist' with the correct type Date: Tue, 19 Jul 2022 09:04:12 +0200 Message-Id: <20220719070412.16757-15-thuth@redhat.com> In-Reply-To: <20220719070412.16757-1-thuth@redhat.com> References: <20220719070412.16757-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658214577072100001 Content-Type: text/plain; charset="utf-8" 'returns-whitelist' has been renamed to 'command-returns-exceptions' in commit b86df3747848 ("qapi: Rename pragma *-whitelist to *-exceptions"). Message-Id: <20220711095721.61280-1-thuth@redhat.com> Reviewed-by: John Snow Signed-off-by: Thomas Huth --- python/qemu/qmp/legacy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index 03b5574618..1951754455 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -50,7 +50,7 @@ =20 # QMPMessage can be outgoing commands or incoming events/returns. # QMPReturnValue is usually a dict/json object, but due to QAPI's -# 'returns-whitelist', it can actually be anything. +# 'command-returns-exceptions', it can actually be anything. # # {'return': {}} is a QMPMessage, # {} is the QMPReturnValue. --=20 2.31.1