From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942361; cv=none; d=zoho.com; s=zohoarc; b=A8wkGK1B0GiGgJpdCCWkS35Zhzvrh6a7v99x7i6irW/cganiDuTy5zhWiz43NTKXBR6+vEEaQXgllzPuekH1AQ6jdYUuGu87eovghAJKhXKJY5BK7FBHvKonqUhlgagaT+LV1rkva2mDN2q8T1krUhHJ0ySIeuqwzpCmNsDf1Cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942361; 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:ARC-Authentication-Results; bh=7UPLd+oFeoyCk56H4KBwTy49cxkwUjAXZ5Bfbi+1t9k=; b=YHoIUdb5O55W8W9oRUUrXAPlp7MvuShcD+0i9+viGgYr6vJeMoYGdYUdpQJ/MVjtXIKpVjJAu/k4pf6hkAdgddhu983K7wSs0dvW0BzFEAII0wRZkt3xP0HTKWneCFT5TZYvwQyJUD2kJOBicbxLkVrNj0Uy0KKAKWLQ+js9f9I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559942361546499.48002178634476; Fri, 7 Jun 2019 14:19:21 -0700 (PDT) Received: from localhost ([::1]:53318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMGd-0000W1-Gb for importer@patchew.org; Fri, 07 Jun 2019 17:19:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37779) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDU-0006zf-Tp for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDT-0002VE-R6 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDT-0002Tu-KG for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A1CA30C318A; Fri, 7 Jun 2019 21:15:51 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4389119C59; Fri, 7 Jun 2019 21:15:48 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:37 -0300 Message-Id: <20190607211544.7964-2-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 07 Jun 2019 21:15:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/8] tests/boot_linux_console: Let extract_from_deb handle various compressions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Debian binary package format supports various compressions. Per man deb(5): NAME deb - Debian binary package format FORMAT ... The third, last required member is named data.tar. It contains the filesystem as a tar archive, either not compressed (supported since dpkg 1.10.24), or compressed with gzip (with .gz extension), xz (with .xz extension, supported since dpkg 1.15.6), bzip2 (with .bz2 extension, supported since dpkg 1.10.24) or lzma (with .lzma extension, supported since dpkg 1.13.25). List the archive files to have the 3rd name with the correct extension. The function avocado.utils.archive.extract() will handle the different compression format for us. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190312234541.2887-2-philmd@redhat.com> Reviewed-by: Cleber Rosa Signed-off-by: Eduardo Habkost --- tests/acceptance/boot_linux_console.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index d5c500ea30..6aa084e049 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -55,8 +55,9 @@ class BootLinuxConsole(Test): """ cwd =3D os.getcwd() os.chdir(self.workdir) - process.run("ar x %s data.tar.gz" % deb) - archive.extract("data.tar.gz", self.workdir) + file_path =3D process.run("ar t %s" % deb).stdout_text.split()[2] + process.run("ar x %s %s" % (deb, file_path)) + archive.extract(file_path, self.workdir) os.chdir(cwd) return self.workdir + path =20 --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942518; cv=none; d=zoho.com; s=zohoarc; b=H285InUTnjHvxg00Kbfk3XYTlRB9rAKbbzw8PcEnLpk+RoMtSjoan33kC1eljEqQJZ8Pw+W93v6eGy9Hna8TtEQnQmyoiB6Jv8xzlyAxmrCviD5Yg9INN/K4ApbUu1CPb7QZglToaRrgU8Ktb/eAHa6WbjX4OoQqLECg1rnMOtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942518; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=5OTR3YcJEeobLnLZCweysnhQMEqwBzjFDRz7fn3PXQA=; b=T105wPFaCd/IGZkrHQS3XIeoE3+FfqL5MAslsd6jEx/07iJKGJpaT6R4pDTTeex/UlM4EpOlYRGnMha2qYFtyLXH4Xe9hiqsoClUURhuB3fs3fLZTag6CPO4jTqACuOkK2LOXpf/pcQAeQ/TZDI+7fteBUAO0vWMwY4iJ75MNUk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559942518431279.53343273333223; Fri, 7 Jun 2019 14:21:58 -0700 (PDT) Received: from localhost ([::1]:53336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMJ1-0002qk-Bc for importer@patchew.org; Fri, 07 Jun 2019 17:21:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37820) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDX-00073S-Se for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDW-0002ZJ-St for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDW-0002Yc-Nb for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:06 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EEC0C30C5844; Fri, 7 Jun 2019 21:15:52 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E244608AB; Fri, 7 Jun 2019 21:15:52 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:38 -0300 Message-Id: <20190607211544.7964-3-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 07 Jun 2019 21:16:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/8] Deprecate Python 2 support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Python 2 will reach end of life in January 1 2020. Declare it as deprecated. Signed-off-by: Eduardo Habkost Message-Id: <20190503193721.18459-1-ehabkost@redhat.com> Reviewed-by: Thomas Huth Reviewed-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 [ehabkost: print "warning:" in lowercase] Signed-off-by: Eduardo Habkost --- configure | 8 ++++++++ qemu-deprecated.texi | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/configure b/configure index b091b82cb3..dcc732ff1e 100755 --- a/configure +++ b/configure @@ -6506,6 +6506,14 @@ if test "$supported_os" =3D "no"; then echo "us upstream at qemu-devel@nongnu.org." fi =20 +# Note that if the Python conditional here evaluates True we will exit +# with status 1 which is a shell 'false' value. +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,0))'; then + echo + echo "warning: Python 2 support is deprecated" >&2 + echo "warning: Python 3 will be required for building future versions of= QEMU" >&2 +fi + config_host_mak=3D"config-host.mak" =20 echo "# Automatically generated by configure - do not modify" >config-all-= disas.mak diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 50292d820b..65411c130e 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -237,3 +237,11 @@ Note that if you are exposing the export via /dev/nbd0= , it is easier to just export the entire image and then mount only /dev/nbd0p1 than it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a subset of the image. + +@section Build system + +@subsection Python 2 support (since 4.1.0) + +In the future, QEMU will require Python 3 to be available at +build time. Support for Python 2 in scripts shipped with QEMU +is deprecated. --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942362; cv=none; d=zoho.com; s=zohoarc; b=Ah9ElrB19ry9dk9SvnWanC/8hdP1kZ/SdCwoRqU04/EYpvr/HrktOvTjU+v++gqXEFepPyVmY2C0yMiMpdJw+QJFMeMfg3gjd5vqhVQPPNXnA2bjuHZoUPGeWgq1oIMNoPedCD9uSAQbY/okJfqglZ1Hkk5X5ZAd70Y8PMtJGgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942362; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=QHNM3T11j3E8uF1Sj5h0kHWMVRmIsmH8saElM9bCQ5Q=; b=C+KTeaqIVaoPQBKdn+XP2h0NTIjJrxKkPzaHw1v2QsvuJDVH19aw+X6Bbb1INz6prpVCyeg6iy+vrRrblnp3F7hrmGk/JFKh6Hj0O22LZjrLgqRZ+v7ecZehoJOSC7vC1wHPNOkBzLms22wQu5lPcaGaLFkHB6rKUzFOJIljAfM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15599423625451021.602841455531; Fri, 7 Jun 2019 14:19:22 -0700 (PDT) Received: from localhost ([::1]:53320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMGd-0000WG-Iy for importer@patchew.org; Fri, 07 Jun 2019 17:19:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37795) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDV-00070R-IS for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDU-0002WO-Jv for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50204) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDU-0002VN-EB for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F09C83003A4A; Fri, 7 Jun 2019 21:15:56 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D938600C0; Fri, 7 Jun 2019 21:15:54 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:39 -0300 Message-Id: <20190607211544.7964-4-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 07 Jun 2019 21:16:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/8] configure: Require python3 >= 3.5 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The oldest python3 version in distros that will be supported by QEMU 4.1 is 3.5.3 (the one in Debian Stretch). Error out if running python3 < 3.5. We have a .travis.yml job configured to use Python 3.4. Change it to use Python 3.5. Signed-off-by: Eduardo Habkost Message-Id: <20190508182339.22447-1-ehabkost@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Eduardo Habkost --- configure | 5 +++-- .travis.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index dcc732ff1e..9dc960824f 100755 --- a/configure +++ b/configure @@ -1852,8 +1852,9 @@ fi =20 # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then - error_exit "Cannot use '$python', Python 2 >=3D 2.7 or Python 3 is requi= red." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7) or \ + (3,0) <=3D sys.version_info < (3,5))= '; then + error_exit "Cannot use '$python', Python 2 >=3D 2.7 or Python 3 >=3D 3.5= is required." \ "Use --python=3D/path/to/python to specify a supported Python." fi =20 diff --git a/.travis.yml b/.travis.yml index b053a836a3..75e017a5cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -212,7 +212,7 @@ matrix: - CONFIG=3D"--target-list=3Dx86_64-softmmu" language: python python: - - "3.4" + - "3.5" =20 =20 - env: --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942552; cv=none; d=zoho.com; s=zohoarc; b=ntRtvOqaBn6mOBSXJOiy3hFq1QA9iFK6KxJQ8i2zSaIo0MWA0myuNVahzOkFF0gzfMWCWBXhrOP/QrMFHlbRgyw1sV5qjRvT0ocp7/OtL/x/wRjKWU6nvKKsqueu3dfU+heo3TRCV+nF/yJL0nlRiXU0MmhiCz0R2JE5d3qG97w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942552; 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:ARC-Authentication-Results; bh=84f9gYZMjl7nZPgDaAaE6y+ZMyxvRO3q+trnV17dqAM=; b=UBdbwB7YFmaaSM662VHRYAOISMmoZKgJleJi7WQ/FKb09fs6cPcz6xdhkjxA3Vskq1lokYEOEAPdo+D043W5LE88bhtc0EFInwKCL/37NyApR6rkryr1xmAz96F6NlQk3qXMQ1dgC/sZunVh+wGgZWceQmj4W9xhVUpjMyrHPd8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559942552773634.0218575592563; Fri, 7 Jun 2019 14:22:32 -0700 (PDT) Received: from localhost ([::1]:53340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMJj-0003EM-Lz for importer@patchew.org; Fri, 07 Jun 2019 17:22:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37781) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDU-0006zg-UB for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDT-0002VS-T3 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36959) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDT-0002U0-Mj for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D865F30820EA; Fri, 7 Jun 2019 21:16:02 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B25F5D70D; Fri, 7 Jun 2019 21:15:58 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:40 -0300 Message-Id: <20190607211544.7964-5-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 07 Jun 2019 21:16:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/8] BootLinuxConsoleTest: Do not log empty lines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Avoid to log empty lines in console debug logs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520220635.10961-2-f4bug@amsat.org> Reviewed-by: Alistair Francis Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Acked-by: Aleksandar Markovic Signed-off-by: Eduardo Habkost --- tests/acceptance/boot_linux_console.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 6aa084e049..e86e66900a 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): console =3D self.vm.console_socket.makefile() console_logger =3D logging.getLogger('console') while True: - msg =3D console.readline() - console_logger.debug(msg.strip()) + msg =3D console.readline().strip() + if not msg: + continue + console_logger.debug(msg) if success_message in msg: break if failure_message in msg: --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942552; cv=none; d=zoho.com; s=zohoarc; b=dRKKik3cd9gur/b8D6dNI4F1q3vXMOJeC+qevMS69Tyuy+VcyGLg0azQ2EWzQ3OLCZtCwxFK1AdCux4myZluMEpRP2BTirEcJmUF1aJczwsYAULj2aC23yS3/oPRvCGOS2REmO6y2VNeLz6EBkwcZP2B5ZvAv+7Ch83VgQjd8Sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942552; 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:ARC-Authentication-Results; bh=PQaROSMOKK+GGg5t5loe/FI6nRV3R+hMaZ7aJFSORAg=; b=j2+JFLnk+LTYZwhnt36j6Mr4q1BXq5R6oPhMoncCtfJBMKlDtQd7TgJtGwxXWx0fm8nwLYaflTC4rz9stRXUZlqOhIP3YqVag1BVQHes1seIUOm9P1pDXrKVi00EJqUvMMFOlhu6id3aPgFjiQD0hzU7HlsE2OPMdYBHCouIzH8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559942552020784.9473824803008; Fri, 7 Jun 2019 14:22:32 -0700 (PDT) Received: from localhost ([::1]:53338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMJf-0003EB-Ke for importer@patchew.org; Fri, 07 Jun 2019 17:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37811) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDX-00072D-4M for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDV-0002YJ-TD for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58814) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDV-0002XF-Le for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC14480F91; Fri, 7 Jun 2019 21:16:04 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E0A25D707; Fri, 7 Jun 2019 21:16:04 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:41 -0300 Message-Id: <20190607211544.7964-6-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 07 Jun 2019 21:16:04 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/8] BootLinuxConsoleTest: Test the SmartFusion2 board X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Similar to the x86_64/pc test, it boots a Linux kernel on an Emcraft board and verify the serial is working. If ARM is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:arm" tags. Alternatively, this test can be run using: $ avocado run -t arch:arm tests/acceptance $ avocado run -t machine:emcraft_sf2 tests/acceptance Based on the recommended test setup from Subbaraya Sundeep: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03810.html Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520220635.10961-3-f4bug@amsat.org> Reviewed-by: Alistair Francis Signed-off-by: Eduardo Habkost --- tests/acceptance/boot_linux_console.py | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index e86e66900a..e6b5ed5dda 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -179,6 +179,33 @@ class BootLinuxConsole(Test): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 + def test_arm_emcraft_sf2(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:emcraft_sf2 + :avocado: tags=3Dendian:little + """ + uboot_url =3D ('https://raw.githubusercontent.com/' + 'Subbaraya-Sundeep/qemu-test-binaries/' + 'fa030bd77a014a0b8e360d3b7011df89283a2f0b/u-boot') + uboot_hash =3D 'abba5d9c24cdd2d49cdc2a8aa92976cf20737eff' + uboot_path =3D self.fetch_asset(uboot_url, asset_hash=3Duboot_hash) + spi_url =3D ('https://raw.githubusercontent.com/' + 'Subbaraya-Sundeep/qemu-test-binaries/' + 'fa030bd77a014a0b8e360d3b7011df89283a2f0b/spi.bin') + spi_hash =3D '85f698329d38de63aea6e884a86fbde70890a78a' + spi_path =3D self.fetch_asset(spi_url, asset_hash=3Dspi_hash) + + self.vm.set_machine('emcraft-sf2') + self.vm.set_console() + kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + self.vm.add_args('-kernel', uboot_path, + '-append', kernel_command_line, + '-drive', 'file=3D' + spi_path + ',if=3Dmtd,forma= t=3Draw', + '-no-reboot') + self.vm.launch() + self.wait_for_console_pattern('init started: BusyBox') + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942741; cv=none; d=zoho.com; s=zohoarc; b=Bgcnb0XisW/NxMlpE7DTuP9y9IU6UGJK52ousfNmFsJcvITs3F0TJ7hmvptM0LirtuZvHQOgcq8joEoGbLBVqlOcfFBj0GXY1tpK9efQ90HKOv7/p5fThmxLUpfxCp3qGDdhlwR8QAMoAwx/ZMua/N0iv1vlFlcB1H8ASzBVYj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942741; 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:ARC-Authentication-Results; bh=RDn68DE7aCHQkUCmYF+Z1yaXf+KzepCYtMGLTCuDC1I=; b=EYkYWBX9XOp+R34bxu+Xodi3JsGmLixwD8SC9THi7gzDrD7gyOE8mpt3VX0pmkpICYStmsxU+euzwqdEbRZx9M1SViemiZnzqjkogUCvowZKPko5matVJW5+B81s4oUfOJRMrV0xSWxWxWR7I1RBwm6Jc1Cl1fbXmQILW8lUqkk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559942741456351.1960722232394; Fri, 7 Jun 2019 14:25:41 -0700 (PDT) Received: from localhost ([::1]:53360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMMm-0005wi-Eh for importer@patchew.org; Fri, 07 Jun 2019 17:25:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37843) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDd-0007K5-J9 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDc-0002hF-2N for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33842) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDb-0002g9-PS for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18C9618DF44; Fri, 7 Jun 2019 21:16:10 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 644805C225; Fri, 7 Jun 2019 21:16:06 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:42 -0300 Message-Id: <20190607211544.7964-7-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Jun 2019 21:16:10 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/8] BootLinuxConsoleTest: Test nanoMIPS kernels on the I7200 CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Similar to the x86_64/pc test, it boots a Linux kernel on a Malta machine and verify the serial is working. Use the documentation added in commit f7d257cb4a17 to test nanoMIPS kernels and the I7200 CPU. This test can be run using: $ avocado --show=3Dconsole run -t arch:mipsel tests/acceptance/boot_linux= _console.py console: [ 0.000000] Linux version 4.15.18-00432-gb2eb9a8b (emubuild@m= ipscs563) (gcc version 6.3.0 (Codescape GNU Tools 2018.04-02 for nanoMIPS L= inux)) #1 SMP Wed Jun 27 11:10:08 PDT 2018 console: [ 0.000000] GCRs appear to have been moved (expected them at = 0x1fbf8000)! console: [ 0.000000] GCRs appear to have been moved (expected them at = 0x1fbf8000)! console: [ 0.000000] CPU0 revision is: 00010000 (MIPS GENERIC QEMU) console: [ 0.000000] MIPS: machine is mti,malta console: [ 0.000000] Determined physical RAM map: console: [ 0.000000] memory: 08000000 @ 00000000 (usable) console: [ 0.000000] earlycon: ns16550a0 at I/O port 0x3f8 (options '3= 8400n8') console: [ 0.000000] bootconsole [ns16550a0] enabled console: [ 0.000000] User-defined physical RAM map: console: [ 0.000000] memory: 10000000 @ 00000000 (usable) console: [ 0.000000] Initrd not found or empty - disabling initrd console: [ 0.000000] MIPS CPS SMP unable to proceed without a CM console: [ 0.000000] Primary instruction cache 32kB, VIPT, 4-way, line= size 32 bytes. console: [ 0.000000] Primary data cache 32kB, 4-way, VIPT, cache alias= es, linesize 32 bytes console: [ 0.000000] This processor doesn't support highmem. -262144k = highmem ignored console: [ 0.000000] Zone ranges: console: [ 0.000000] Normal [mem 0x0000000000000000-0x000000000fff= ffff] console: [ 0.000000] HighMem empty console: [ 0.000000] Movable zone start for each node console: [ 0.000000] Early memory node ranges console: [ 0.000000] node 0: [mem 0x0000000000000000-0x000000000ff= fffff] console: [ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x00= 0000000fffffff] console: [ 0.000000] random: get_random_bytes called from start_kernel= +0x60/0x2f0 with crng_init=3D0 console: [ 0.000000] percpu: Embedded 16 pages/cpu @(ptrval) s36620 r8= 192 d20724 u65536 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total p= ages: 64960 console: [ 0.000000] Kernel command line: printk.time=3D0 mem=3D256m@@= 0x0 console=3DttyS0 earlycon Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520231910.12184-3-f4bug@amsat.org> Acked-by: Aleksandar Markovic Signed-off-by: Eduardo Habkost --- tests/acceptance/boot_linux_console.py | 58 ++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index e6b5ed5dda..5d8380a23b 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -10,6 +10,8 @@ =20 import os import logging +import lzma +import shutil =20 from avocado_qemu import Test from avocado.utils import process @@ -138,6 +140,62 @@ class BootLinuxConsole(Test): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 + def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): + kernel_path_xz =3D self.fetch_asset(kernel_url, asset_hash=3Dkerne= l_hash) + kernel_path =3D self.workdir + "kernel" + with lzma.open(kernel_path_xz, 'rb') as f_in: + with open(kernel_path, 'wb') as f_out: + shutil.copyfileobj(f_in, f_out) + + self.vm.set_machine('malta') + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'mem=3D256m@@0x0 ' + + 'console=3DttyS0') + self.vm.add_args('-no-reboot', + '-cpu', 'I7200', + '-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + self.wait_for_console_pattern(console_pattern) + + def test_mips_malta32el_nanomips_4k(self): + """ + :avocado: tags=3Darch:mipsel + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dendian:little + """ + kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' + 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' + 'generic_nano32r6el_page4k.xz') + kernel_hash =3D '477456aafd2a0f1ddc9482727f20fe9575565dd6' + self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) + + def test_mips_malta32el_nanomips_16k_up(self): + """ + :avocado: tags=3Darch:mipsel + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dendian:little + """ + kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' + 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' + 'generic_nano32r6el_page16k_up.xz') + kernel_hash =3D 'e882868f944c71c816e832e2303b7874d044a7bc' + self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) + + def test_mips_malta32el_nanomips_64k_dbg(self): + """ + :avocado: tags=3Darch:mipsel + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dendian:little + """ + kernel_url =3D ('https://mipsdistros.mips.com/LinuxDistro/nanomips= /' + 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' + 'generic_nano32r6el_page64k_dbg.xz') + kernel_hash =3D '18d1c68f2e23429e266ca39ba5349ccd0aeb7180' + self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) + def test_aarch64_virt(self): """ :avocado: tags=3Darch:aarch64 --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942692; cv=none; d=zoho.com; s=zohoarc; b=mTdm0H+BBHb3qq/DuqdNPCvA96V715JnIslGTp0Z/0bFiGvuQ/Lv1My9OJ2tmo5YcD3LLQE6JoOtTyL6EQmx03VgpCoDudsWNnzyQtm6WtQfiZzqEBcGy8b/lGATnT/HQtLVF0Eyy6rL3BlKyXvodqUI8fFIEe4rR6cUNt1Z1xw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942692; 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:ARC-Authentication-Results; bh=pT6eO4i/FJLzBocP0hh5nP+RkIjC4J7Ny2z05mBk+x0=; b=cIn/4Jx0SOkjWEzuThwr5HT1MVsWPf23GvfuNVas1zoVfHDBp5zpV+UuRgeGYgk7S7Mx83EE/F2pqBqtSzJSQU7+RCz6vfKS44AVVWWurzUtU9p7yS2G2YBM0pkOMYPX2vSgo5+VDLPu+WNMi3fVkEfXgnGrBrRgyZK3ya4IZAE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155994269245266.99771365247307; Fri, 7 Jun 2019 14:24:52 -0700 (PDT) Received: from localhost ([::1]:53356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMLp-0005XZ-1a for importer@patchew.org; Fri, 07 Jun 2019 17:24:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37862) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDf-0007Od-MR for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDe-0002kn-8c for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDe-0002jI-0A for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 080B8308427E; Fri, 7 Jun 2019 21:16:12 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E21C60BF3; Fri, 7 Jun 2019 21:16:11 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:43 -0300 Message-Id: <20190607211544.7964-8-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 07 Jun 2019 21:16:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 7/8] BootLinuxConsoleTest: Run kerneltests BusyBox on Malta X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 This tests boots a Linux kernel on a Malta machine up to a busybox shell on the serial console. Few commands are executed before halting the machine (via reboot). We use the initrd cpio image from the kerneltests project: https://kerneltests.org/ If MIPS is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:mips" tags. Alternatively, this test can be run using: $ avocado --show=3Dconsole run -t arch:mips tests/acceptance/boot_linux_c= onsole.py [...] console: Boot successful. [...] console: / # uname -a console: Linux buildroot 4.5.0-2-4kc-malta #1 Debian 4.5.5-1 (2016-05-29)= mips GNU/Linux console: / # reboot console: / # reboot: Restarting system Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520231910.12184-4-f4bug@amsat.org> Acked-by: Aleksandar Markovic Signed-off-by: Eduardo Habkost --- tests/acceptance/boot_linux_console.py | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 5d8380a23b..32159503e9 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -11,6 +11,7 @@ import os import logging import lzma +import gzip import shutil =20 from avocado_qemu import Test @@ -49,6 +50,11 @@ class BootLinuxConsole(Test): fail =3D 'Failure message found in console: %s' % failure_= message self.fail(fail) =20 + def exec_command_and_wait_for_pattern(self, command, success_message): + command +=3D '\n' + self.vm.console_socket.sendall(command.encode()) + self.wait_for_console_pattern(success_message) + def extract_from_deb(self, deb, path): """ Extracts a file from a deb package into the test workdir @@ -140,6 +146,49 @@ class BootLinuxConsole(Test): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 + def test_mips_malta_cpio(self): + """ + :avocado: tags=3Darch:mips + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dendian:big + """ + deb_url =3D ('http://snapshot.debian.org/archive/debian/' + '20160601T041800Z/pool/main/l/linux/' + 'linux-image-4.5.0-2-4kc-malta_4.5.5-1_mips.deb') + deb_hash =3D 'a3c84f3e88b54e06107d65a410d1d1e8e0f340f8' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinux-4.5.0-2-4kc-mal= ta') + initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' + '8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/' + 'mips/rootfs.cpio.gz') + initrd_hash =3D 'bf806e17009360a866bf537f6de66590de349a99' + initrd_path_gz =3D self.fetch_asset(initrd_url, asset_hash=3Dinitr= d_hash) + initrd_path =3D self.workdir + "rootfs.cpio" + + with gzip.open(initrd_path_gz, 'rb') as f_in: + with open(initrd_path, 'wb') as f_out: + shutil.copyfileobj(f_in, f_out) + + self.vm.set_machine('malta') + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0 console=3Dtty ' + + 'rdinit=3D/sbin/init noreboot') + self.vm.add_args('-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + self.wait_for_console_pattern('Boot successful.') + + self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo', + 'BogoMIPS') + self.exec_command_and_wait_for_pattern('uname -a', + 'Debian') + self.exec_command_and_wait_for_pattern('reboot', + 'reboot: Restarting system') + def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): kernel_path_xz =3D self.fetch_asset(kernel_url, asset_hash=3Dkerne= l_hash) kernel_path =3D self.workdir + "kernel" --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Mon May 20 21:02:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559942740; cv=none; d=zoho.com; s=zohoarc; b=X1goxWpxeXi2hoCXl6m6CBk2CmFMyTX5z76t+pJmOwoKd31NRzixXAVHETt+lXM/FrFBX3aMNZoQrkta7AWhdB6KL5NyUmdDocO9ed/S5ulppl0ZXzMqTTl7yu3TMF/hrTlva5x4oU4qy+SOUXtYYCn+zYHAfExiNYvNf7Slo0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559942740; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=w3f6abi0oUPE3RgE/4ouv/HDqaX/odCSvvtaTB/pQDw=; b=NesxZr9MLbpz9mfw41wLmfVppNsNz1tEPW4a37tJ5SHFo8z6SBT0NAHXss+SilJwjK+OnEAIssPPc4fgNDY9MBlzcJaRfzVLTEDbS3iPFwDNjMW6j9Fh4twJBUEj9RKVWEW/ots6GDiwPeWSB/kl5YjJg+BvTMaW7pOCrOAsk5I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155994274062318.55931422618778; Fri, 7 Jun 2019 14:25:40 -0700 (PDT) Received: from localhost ([::1]:53358 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMMl-0005uY-Ly for importer@patchew.org; Fri, 07 Jun 2019 17:25:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37864) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDf-0007P2-SO for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDe-0002lT-UB for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDe-0002kf-OX for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DA72C18B2C9; Fri, 7 Jun 2019 21:16:14 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 940EA600C0; Fri, 7 Jun 2019 21:16:13 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:44 -0300 Message-Id: <20190607211544.7964-9-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 07 Jun 2019 21:16:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 8/8] travis: Make check-acceptance job more verbose X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It will help us debug issues when tests fail. Signed-off-by: Eduardo Habkost --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75e017a5cf..82c74673e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -225,7 +225,7 @@ matrix: # Acceptance (Functional) tests - env: - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64-sof= tmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmm= u,alpha-softmmu" - - TEST_CMD=3D"make check-acceptance" + - TEST_CMD=3D"make AVOCADO_SHOW=3Dtest check-acceptance" addons: apt: packages: --=20 2.18.0.rc1.1.g3f1ff2140