From nobody Mon Feb 9 08:10:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632762232; cv=none; d=zohomail.com; s=zohoarc; b=hcQmwFZg00Akvv7lZCMD+dRceMtMIzNQrVr8ddnjZnbYUpeKXAxvGxz64PwgyL+osvVHeh+iuOTN0G9VQpMInN8p3xCnCtxaLe3ROWDPyheelAR2yCCUVPyOcoCplJm20WRyqUJlwgE4eU0+8iqyOS0A5IQRscKEYgAfZbBfZBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632762232; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MpP5Tl9WYK/fILavty5FzAb3Tv6ivEOl60j6QfURE0k=; b=ajXNYbD6w5V5aEyVC/qOBQX0fT/4r6KWdRXLlPtdW/95+3rB6Ww/AlzrGeYPka6JMVLr6MYPMGGlqWKHrVp/YmwnK1OV5kAB/HUFm938iusTx+kR1kGeSAmV1QJe9ShusuvOh1JxEXl+7NlQkOEij566ZQS0PTnhAHR1kJgZkr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632762232324779.2001280469073; Mon, 27 Sep 2021 10:03:52 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-515-8BjmLTH6O0uLeUPOq4MmLg-1; Mon, 27 Sep 2021 13:03:42 -0400 Received: by mail-wr1-f72.google.com with SMTP id z15-20020adfec8f000000b001606a799300so493332wrn.19 for ; Mon, 27 Sep 2021 10:03:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id e5sm17224018wrd.1.2021.09.27.10.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 10:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632762231; 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=MpP5Tl9WYK/fILavty5FzAb3Tv6ivEOl60j6QfURE0k=; b=IgjpfZ5Cncf5n06Yd8ei5H35zSSQqWKpGmAOb09KsVU0WEL08rN33DQjnXXkxMI5PpgrU0 ppJH8X+OUqxH+auEauiu1PPtWMVJGfNuLoWhT3XFlYf2mPXpyqKjMcrxCcOmIZCy31Ur3Z AE40KjcmPxenhxRTKwJDyHtZj0FlpKY= X-MC-Unique: 8BjmLTH6O0uLeUPOq4MmLg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpP5Tl9WYK/fILavty5FzAb3Tv6ivEOl60j6QfURE0k=; b=JERdYsLtYDmIXZd55XNbADI4GE6M9boScBi1Yks1fJtTc+xpFijMqRmViAZwKw3VwF qP+kZfmfB3usxxlJmue8GMTDjM8J0jRl9LtwP9nET7nxw0VpYQJqSufrHVCsHfSNHrT5 eghlyVE4bn/YzlAKXQXt2FZIhbH6LECbupdTKOMt0QyU4hwUax9gM7fIIglQccHhDKZ5 pPm2NVV/8AKiYQa03sotbwwLsxF/jvDOvh2/xGu4CPEe5cGiQ+8XF+assUYIIfaetXSZ WQTlR+M6gEiUxqOHhIZIToNARp7RAwP0QGJRsrfY3xZ2bun/23OjRTSHcL1RyloPEEOL NX1w== X-Gm-Message-State: AOAM532rIsSVF1/45Zvu2j6fI1KMm4l62RTVCXd/JFvT9dnkMf+YAQof f47EB5aLhd+1/sWpc8Yf0LI4F8p1j6gxoARDrTKRs81lqkc9T95NXCE6kMynTf+I1/dozVuCLwy zhfdkRfv5PnPfTQ== X-Received: by 2002:a1c:1c7:: with SMTP id 190mr131325wmb.158.1632762220948; Mon, 27 Sep 2021 10:03:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0vJxZGZvTxGY47QttacHGTYMYUABrc5tJNBpja/T2/x7ZN6Z1W6NSaXv48Q6ltnF+VkRYFA== X-Received: by 2002:a1c:1c7:: with SMTP id 190mr131303wmb.158.1632762220678; Mon, 27 Sep 2021 10:03:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 16/21] qemu: Split machine_ppc.py acceptance tests Date: Mon, 27 Sep 2021 19:02:22 +0200 Message-Id: <20210927170227.2014482-17-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927170227.2014482-1-philmd@redhat.com> References: <20210927170227.2014482-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632762234223100010 From: David Gibson machine_ppc.py contains tests for 3 different ppc based machine types. It is listed in MAINTAINERS along with the PPC TCG cpu code. That's not really accurate though, since it's really more about testing those machines than the CPUs. Therefore, split it up into separate files for the separate machine types, and list those along with their machine types in MAINTAINERS. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210927044808.73391-2-david@gibson.dropbear.id.au> --- MAINTAINERS | 4 +- tests/acceptance/machine_ppc.py | 69 ---------------------------- tests/acceptance/ppc_mpc8544ds.py | 32 +++++++++++++ tests/acceptance/ppc_pseries.py | 35 ++++++++++++++ tests/acceptance/ppc_virtex_ml507.py | 34 ++++++++++++++ 5 files changed, 104 insertions(+), 70 deletions(-) delete mode 100644 tests/acceptance/machine_ppc.py create mode 100644 tests/acceptance/ppc_mpc8544ds.py create mode 100644 tests/acceptance/ppc_pseries.py create mode 100644 tests/acceptance/ppc_virtex_ml507.py diff --git a/MAINTAINERS b/MAINTAINERS index f98523cfe0f..bf1fc5b21e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -274,7 +274,6 @@ F: target/ppc/ F: hw/ppc/ F: include/hw/ppc/ F: disas/ppc.c -F: tests/acceptance/machine_ppc.py =20 RISC-V TCG CPUs M: Palmer Dabbelt @@ -1270,6 +1269,7 @@ L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/mpc8544ds.c F: hw/ppc/mpc8544_guts.c +F: tests/acceptance/ppc_mpc8544ds.py =20 New World (mac99) M: Mark Cave-Ayland @@ -1340,6 +1340,7 @@ F: tests/qtest/spapr* F: tests/qtest/libqos/*spapr* F: tests/qtest/rtas* F: tests/qtest/libqos/rtas* +F: tests/acceptance/ppc_pseries.py =20 PowerNV (Non-Virtualized) M: C=C3=A9dric Le Goater @@ -1361,6 +1362,7 @@ M: Edgar E. Iglesias L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/virtex_ml507.c +F: tests/acceptance/ppc_virtex_ml507.py =20 sam460ex M: BALATON Zoltan diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc= .py deleted file mode 100644 index a836e2496f1..00000000000 --- a/tests/acceptance/machine_ppc.py +++ /dev/null @@ -1,69 +0,0 @@ -# Test that Linux kernel boots on ppc machines and check the console -# -# Copyright (c) 2018, 2020 Red Hat, Inc. -# -# This work is licensed under the terms of the GNU GPL, version 2 or -# later. See the COPYING file in the top-level directory. - -from avocado.utils import archive -from avocado_qemu import Test -from avocado_qemu import wait_for_console_pattern - -class PpcMachine(Test): - - timeout =3D 90 - KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' - panic_message =3D 'Kernel panic - not syncing' - - def test_ppc64_pseries(self): - """ - :avocado: tags=3Darch:ppc64 - :avocado: tags=3Dmachine:pseries - """ - kernel_url =3D ('https://archives.fedoraproject.org/pub/archive' - '/fedora-secondary/releases/29/Everything/ppc64le/os' - '/ppc/ppc64/vmlinuz') - kernel_hash =3D '3fe04abfc852b66653b8c3c897a59a689270bc77' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - - self.vm.set_console() - kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3Dhvc0' - self.vm.add_args('-kernel', kernel_path, - '-append', kernel_command_line) - self.vm.launch() - console_pattern =3D 'Kernel command line: %s' % kernel_command_line - wait_for_console_pattern(self, console_pattern, self.panic_message) - - def test_ppc_mpc8544ds(self): - """ - :avocado: tags=3Darch:ppc - :avocado: tags=3Dmachine:mpc8544ds - """ - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2020/download/day17.tar.gz') - tar_hash =3D '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494' - file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - archive.extract(file_path, self.workdir) - self.vm.set_console() - self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin') - self.vm.launch() - wait_for_console_pattern(self, 'QEMU advent calendar 2020', - self.panic_message) - - def test_ppc_virtex_ml507(self): - """ - :avocado: tags=3Darch:ppc - :avocado: tags=3Dmachine:virtex-ml507 - """ - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2020/download/hippo.tar.gz') - tar_hash =3D '306b95bfe7d147f125aa176a877e266db8ef914a' - file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - archive.extract(file_path, self.workdir) - self.vm.set_console() - self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux', - '-dtb', self.workdir + '/hippo/virtex440-ml507.dt= b', - '-m', '512') - self.vm.launch() - wait_for_console_pattern(self, 'QEMU advent calendar 2020', - self.panic_message) diff --git a/tests/acceptance/ppc_mpc8544ds.py b/tests/acceptance/ppc_mpc85= 44ds.py new file mode 100644 index 00000000000..ce840600c1c --- /dev/null +++ b/tests/acceptance/ppc_mpc8544ds.py @@ -0,0 +1,32 @@ +# Test that Linux kernel boots on ppc machines and check the console +# +# Copyright (c) 2018, 2020 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado.utils import archive +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + +class Mpc8544dsMachine(Test): + + timeout =3D 90 + KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' + panic_message =3D 'Kernel panic - not syncing' + + def test_ppc_mpc8544ds(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:mpc8544ds + """ + tar_url =3D ('https://www.qemu-advent-calendar.org' + '/2020/download/day17.tar.gz') + tar_hash =3D '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494' + file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) + archive.extract(file_path, self.workdir) + self.vm.set_console() + self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin') + self.vm.launch() + wait_for_console_pattern(self, 'QEMU advent calendar 2020', + self.panic_message) diff --git a/tests/acceptance/ppc_pseries.py b/tests/acceptance/ppc_pseries= .py new file mode 100644 index 00000000000..f14a884ee16 --- /dev/null +++ b/tests/acceptance/ppc_pseries.py @@ -0,0 +1,35 @@ +# Test that Linux kernel boots on ppc machines and check the console +# +# Copyright (c) 2018, 2020 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado.utils import archive +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + +class pseriesMachine(Test): + + timeout =3D 90 + KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' + panic_message =3D 'Kernel panic - not syncing' + + def test_ppc64_pseries(self): + """ + :avocado: tags=3Darch:ppc64 + :avocado: tags=3Dmachine:pseries + """ + kernel_url =3D ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/ppc64le/os' + '/ppc/ppc64/vmlinuz') + kernel_hash =3D '3fe04abfc852b66653b8c3c897a59a689270bc77' + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) + + self.vm.set_console() + kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + 'console= =3Dhvc0' + self.vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + wait_for_console_pattern(self, console_pattern, self.panic_message) diff --git a/tests/acceptance/ppc_virtex_ml507.py b/tests/acceptance/ppc_vi= rtex_ml507.py new file mode 100644 index 00000000000..27f7bf2d492 --- /dev/null +++ b/tests/acceptance/ppc_virtex_ml507.py @@ -0,0 +1,34 @@ +# Test that Linux kernel boots on ppc machines and check the console +# +# Copyright (c) 2018, 2020 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado.utils import archive +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + +class VirtexMl507Machine(Test): + + timeout =3D 90 + KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' + panic_message =3D 'Kernel panic - not syncing' + + def test_ppc_virtex_ml507(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:virtex-ml507 + """ + tar_url =3D ('https://www.qemu-advent-calendar.org' + '/2020/download/hippo.tar.gz') + tar_hash =3D '306b95bfe7d147f125aa176a877e266db8ef914a' + file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) + archive.extract(file_path, self.workdir) + self.vm.set_console() + self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux', + '-dtb', self.workdir + '/hippo/virtex440-ml507.dt= b', + '-m', '512') + self.vm.launch() + wait_for_console_pattern(self, 'QEMU advent calendar 2020', + self.panic_message) --=20 2.31.1