From patchwork Mon Jan 27 16:36:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 11352889 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A647C1398 for ; Mon, 27 Jan 2020 16:41:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CA91206D3 for ; Mon, 27 Jan 2020 16:41:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="SaP53HSq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CA91206D3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7Rh-0005Lx-MW for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 11:41:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33813) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7OV-0000QP-Pj for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw7OU-0001uZ-Aj for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:47 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:46794) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw7OU-0001q0-38 for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:46 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGISo9067149; Mon, 27 Jan 2020 16:37:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=gdZaYh1SNHe8SMPKsDFnUoMtOLAg1VhoRLUHE85nPvQ=; b=SaP53HSqEjFFxYsauZP7Wv94dwjibaGb9rFqSEQ6Is01hLHwZ5WW4KNne2ciqDnSrbkE t0BkvO3CwhxxOYn+mPqjg388q+TPFNfzqDxwyxUa8MISM7vwbx29OX4ttW4nTZi7IV2z 2ko/QF8VC84YaQiKgL2clPUDPGMBR2/IS2rIS2hG5+JYHL6yfERRTHBEbNZdI5/DjVpr CJVduHIOF0wiV6e0tMdWA2QMFZjKD2ia1z4k7tAD290MQmZXFnMIhmPNXVAhWUtLMGh1 lWMmtfV3xRufjEh8F3SeKw/ufiuWcOESM7rJy85CPp9TovVMTcbMdOALPMFQoAalYIVX 2w== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2xrd3u0j9x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:33 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGNVQZ142087; Mon, 27 Jan 2020 16:37:33 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2xrytqcav0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:32 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 00RGbWve024543; Mon, 27 Jan 2020 16:37:32 GMT Received: from ol7.uk.oracle.com (/10.175.203.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Jan 2020 08:37:31 -0800 From: Liam Merwick To: alex.bennee@linaro.org, fam@euphon.net, philmd@redhat.com Subject: [PATCH 1/6] tests/boot_linux_console: add microvm acceptance test Date: Mon, 27 Jan 2020 16:36:29 +0000 Message-Id: <1580142994-1836-2-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> References: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=812 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=872 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 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: slp@redhat.com, qemu-devel@nongnu.org, wainersm@redhat.com, pbonzini@redhat.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Refactor test_x86_64_pc() to test_x86_64_machine() so that separate functions which specify the Avocado tag of ':avocado: tags=machine:' as being either 'pc' or 'microvm' can be used to test booting a compressed kernel using either machine class. Signed-off-by: Liam Merwick Reviewed-by: Stefano Garzarella --- tests/acceptance/boot_linux_console.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index e40b84651b0b..aa5b07b1c609 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -51,10 +51,9 @@ class BootLinuxConsole(Test): os.chdir(cwd) return self.workdir + path - def test_x86_64_pc(self): + def do_test_x86_64_machine(self): """ :avocado: tags=arch:x86_64 - :avocado: tags=machine:pc """ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' '/linux/releases/29/Everything/x86_64/os/images/pxeboot' @@ -70,6 +69,18 @@ class BootLinuxConsole(Test): console_pattern = 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) + def test_x86_64_pc(self): + """ + :avocado: tags=machine:pc + """ + self.do_test_x86_64_machine() + + def test_x86_64_microvm(self): + """ + :avocado: tags=machine:microvm + """ + self.do_test_x86_64_machine() + def test_mips_malta(self): """ :avocado: tags=arch:mips From patchwork Mon Jan 27 16:36:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 11352881 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72F391398 for ; Mon, 27 Jan 2020 16:38:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04B99206D4 for ; Mon, 27 Jan 2020 16:38:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="jNvZJCwh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04B99206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7PB-0001fL-0Q for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 11:38:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33801) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7OV-0000QM-Cz for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw7OU-0001tu-7e for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:47 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:46796) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw7OT-0001pz-Va for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:46 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGITNd067167; Mon, 27 Jan 2020 16:37:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=PjhiDSyO/HVWNPa7nnBzDILOpcKofQ/G35VK5ax9QgI=; b=jNvZJCwhe0w4yZB5JlwlDV+nuOJz/wZvJV/tLj96cyjQ+j5UQ+YYzGt0Sipib3Gi5WM8 KIRvxVk6TkYjlbpy4kv27Yp2EXNcwFkHniCbAED5IChAB6rZuAR7V4LCp41TZgzju7/t 5B5CmhC1bYFwdkHWVNsu976hhEXy+Aia0i7nTGOGmq7PLS4TmgA8a7MtmIh2/+rKJ38L Iax5x6j1kJgK9zI9Lvd3Z549UNsfsS/tqiquom0SbwMBnKlnBCRRqT6ITJiuCbd7HnvM fur2H+YBr0iPoZbzin/0BwqSMKjuGDOPkrwlsa0CpuCX5XidE6/tx13ONLiAlp0lqEEb KQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2xrd3u0jac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:36 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGNUv3141852; Mon, 27 Jan 2020 16:37:36 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2xrytqcax9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:35 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 00RGbZmv024561; Mon, 27 Jan 2020 16:37:35 GMT Received: from ol7.uk.oracle.com (/10.175.203.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Jan 2020 08:37:34 -0800 From: Liam Merwick To: alex.bennee@linaro.org, fam@euphon.net, philmd@redhat.com Subject: [PATCH 2/6] tests/boot_linux_console: add BIOS acceptance test Date: Mon, 27 Jan 2020 16:36:30 +0000 Message-Id: <1580142994-1836-3-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> References: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=716 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=775 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 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: slp@redhat.com, qemu-devel@nongnu.org, wainersm@redhat.com, pbonzini@redhat.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add tests to use qboot with the 'pc' and 'microvm' machine classes by adding the '-bios' option via self.vm.add_args() before calling do_test_x86_64_machine(). Signed-off-by: Liam Merwick --- tests/acceptance/boot_linux_console.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index aa5b07b1c609..8daf6461ffac 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -60,7 +60,6 @@ class BootLinuxConsole(Test): '/vmlinuz') kernel_hash = '23bebd2680757891cf7adedb033532163a792495' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) - self.vm.set_console() kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0' self.vm.add_args('-kernel', kernel_path, @@ -75,12 +74,26 @@ class BootLinuxConsole(Test): """ self.do_test_x86_64_machine() + def test_x86_64_pc_qboot(self): + """ + :avocado: tags=machine:pc + """ + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') + self.do_test_x86_64_machine() + def test_x86_64_microvm(self): """ :avocado: tags=machine:microvm """ self.do_test_x86_64_machine() + def test_x86_64_microvm_qboot(self): + """ + :avocado: tags=machine:microvm + """ + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') + self.do_test_x86_64_machine() + def test_mips_malta(self): """ :avocado: tags=arch:mips From patchwork Mon Jan 27 16:36:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 11352887 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58D4B138C for ; Mon, 27 Jan 2020 16:39:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EA30206D4 for ; Mon, 27 Jan 2020 16:39:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="eZdTf48G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EA30206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7QP-0003rY-BO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 11:39:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33804) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7OV-0000QN-B3 for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw7OU-0001uT-AU for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:47 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:41088) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw7OU-0001qh-2m for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:46 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGIXU0043107; Mon, 27 Jan 2020 16:37:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=vXb8vHwQ2x7gPuXBsk3QR9nb12JrCNXibJsAaHmEMHU=; b=eZdTf48G0c8VKIDMvniFA9oRSMzvtZ522ZjBo7SSZqI4QmWO/i/C4Gok9gudgAqL1iYD te+iTN0XgXM+xzoXS2JR6igixZcsvsJURLVVXhh/o7xPkviFpIib/6AMd9TMixpca9M/ 4tHo9bK3kXTOZ2D8BIefZxJun3YeA2fW0Pc/QcmnKLxey3+r/IB+dMP6854ibXL/vHi5 AKdIPAQJa/kSqGJMdE+JW01+ylnZoDt7VkAN6SlNnWfCT76IxNI424IZ1LslRJCaLvzl GV+4tr9hm7d+JMk8f7XY04Kk0VSk7OmjfoyMaA9Ux1iEL80Yr+YKJGhJ5nRrAXLPlp6t BQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2xrear0dj4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:39 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGNUce141833; Mon, 27 Jan 2020 16:37:38 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2xrytqcb0q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:38 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 00RGbbcP024609; Mon, 27 Jan 2020 16:37:38 GMT Received: from ol7.uk.oracle.com (/10.175.203.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Jan 2020 08:37:37 -0800 From: Liam Merwick To: alex.bennee@linaro.org, fam@euphon.net, philmd@redhat.com Subject: [PATCH 3/6] tests/boot_linux_console: fix extract_from_deb() comment Date: Mon, 27 Jan 2020 16:36:31 +0000 Message-Id: <1580142994-1836-4-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> References: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 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: slp@redhat.com, qemu-devel@nongnu.org, wainersm@redhat.com, pbonzini@redhat.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The second param in extract_from_deb() is 'path' not 'file' Signed-off-by: Liam Merwick Reviewed-by: Stefano Garzarella Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 8daf6461ffac..43bc928b03a2 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -40,7 +40,7 @@ class BootLinuxConsole(Test): Extracts a file from a deb package into the test workdir :param deb: path to the deb archive - :param file: path within the deb archive of the file to be extracted + :param path: path within the deb archive of the file to be extracted :returns: path of the extracted file """ cwd = os.getcwd() From patchwork Mon Jan 27 16:36:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 11352885 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71E56138C for ; Mon, 27 Jan 2020 16:38:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48F36206D4 for ; Mon, 27 Jan 2020 16:38:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="AXPRP1Qe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48F36206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7PC-0001ig-CR for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 11:38:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33844) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7OX-0000Qg-9k for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw7OW-0001xH-Aj for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:49 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:41150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw7OW-0001wB-1c for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:48 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGIXHP043110; Mon, 27 Jan 2020 16:37:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=amLpTtdNvTVRM7qM7wEfwnzjBPhQE97ba6mhP7Dce4I=; b=AXPRP1QezXNsLWHaNo52syce9/pquQa28AqkmC8IgyAVGxAbXdLnr4+utuLUR6yFSJjj UbdJCJed482UKGS42Qg/BJZqyDNWwtwRIlS145ifq9PioQgCBd3NzZ7g5LJ2BOL/XUL+ q2klnEzV6eROLqw9hHNbXj4UBhKnSsqRj5NWoFFRdu7axC9jHTuA2pKdLcL7CMS+JoIK 2YLgAAa97KDDh/UIqyv6pxZeu+8/b85P21+Z688uv2eyZlWLuLoCwA73zpoOODL9OSgV N95ROJgLrjFUkAQqI8p03hqn7A6JMCw4l5oVDNAX5f+obHKYHtC4CN+GQGljUHqpFj1i rw== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2xrear0djt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:42 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGNVAg141915; Mon, 27 Jan 2020 16:37:41 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 2xrytqcb3d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:41 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 00RGbeMk032494; Mon, 27 Jan 2020 16:37:40 GMT Received: from ol7.uk.oracle.com (/10.175.203.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Jan 2020 08:37:40 -0800 From: Liam Merwick To: alex.bennee@linaro.org, fam@euphon.net, philmd@redhat.com Subject: [PATCH 4/6] travis.yml: install rpm2cpio for acceptance tests Date: Mon, 27 Jan 2020 16:36:32 +0000 Message-Id: <1580142994-1836-5-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> References: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=737 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=816 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 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: slp@redhat.com, qemu-devel@nongnu.org, wainersm@redhat.com, pbonzini@redhat.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The extract_from_rpm() method added for the PVH acceptance tests needs rpm2cpio to extract a vmlinux binary from an RPM. Signed-off-by: Liam Merwick Reviewed-by: Stefano Garzarella --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1ae645e9fcec..3d8c2a38e679 100644 --- a/.travis.yml +++ b/.travis.yml @@ -278,6 +278,7 @@ matrix: - python3-pil - python3-pip - python3.5-venv + - rpm2cpio - tesseract-ocr - tesseract-ocr-eng From patchwork Mon Jan 27 16:36:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 11352891 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27EDF1395 for ; Mon, 27 Jan 2020 16:42:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F26E5206D4 for ; Mon, 27 Jan 2020 16:42:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="XS6odEsW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F26E5206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7Sr-0006Ww-8C for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 11:42:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33872) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7Ob-0000XC-Lt for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw7Oa-00023A-Iv for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:53 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:41220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw7Oa-00021f-A9 for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:52 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGITJ1043003; Mon, 27 Jan 2020 16:37:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=Pu3hQmBMKM3nLKzsAuJQPA0ccNQERKQHXN77eVCKWjY=; b=XS6odEsWDbyK24vowXplSEuioZ/xHqe7N5c0Vn4ZuETDhnyWjHJvILUtCS/SvRzf3Mz2 oCiSOeVNW0F50bOtO4ZRx4hEpSWRwuvckFT3yNZZBaD2C3zLSX9k7qsPy14FQnZsOxw/ UIrpgEB9+8AD6F03AbylB6aj8Wbbbp4PI6o38VLJNR8SJ0+gGMk0wIGksoWh8Blcgxhz 5IwBYvksZCVY6tcE8Vz0iqxDqMcHTFUxIcxNnlKOAQbX14Xvm6cfSX0Zc8JhJxbeSKdG IqTwdW/BznOmU3qdCb3ks4jKBhUO52F+1UJ9ph3Di7XV/le3gvFSjSpIV10/ZtfrAaH7 YQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2xrear0dkm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:45 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGNUiQ141851; Mon, 27 Jan 2020 16:37:45 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 2xrytqcb61-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:45 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 00RGbhMG027276; Mon, 27 Jan 2020 16:37:43 GMT Received: from ol7.uk.oracle.com (/10.175.203.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Jan 2020 08:37:43 -0800 From: Liam Merwick To: alex.bennee@linaro.org, fam@euphon.net, philmd@redhat.com Subject: [PATCH 5/6] tests/boot_linux_console: add extract_from_rpm method Date: Mon, 27 Jan 2020 16:36:33 +0000 Message-Id: <1580142994-1836-6-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> References: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=789 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=858 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 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: slp@redhat.com, qemu-devel@nongnu.org, wainersm@redhat.com, pbonzini@redhat.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add a method to extract a specified file from an RPM to the test's working directory and return the path to the extracted file. Signed-off-by: Liam Merwick Reviewed-by: Stefano Garzarella Reviewed-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux_console.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 43bc928b03a2..6af19ae3b14a 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -51,6 +51,20 @@ class BootLinuxConsole(Test): os.chdir(cwd) return self.workdir + path + def extract_from_rpm(self, rpm, path): + """ + Extracts a file from a rpm package into the test workdir + + :param rpm: path to the rpm archive + :param path: path within the rpm archive of the file to be extracted + :returns: path of the extracted file + """ + cwd = os.getcwd() + os.chdir(self.workdir) + process.run("rpm2cpio %s | cpio -id %s" % (rpm, path), shell=True) + os.chdir(cwd) + return self.workdir + '/' + path + def do_test_x86_64_machine(self): """ :avocado: tags=arch:x86_64 From patchwork Mon Jan 27 16:36:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 11352893 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8552C1398 for ; Mon, 27 Jan 2020 16:43:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5AAE2206D4 for ; Mon, 27 Jan 2020 16:43:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="F4dE5o9I" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5AAE2206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7Tk-0007QH-J3 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 11:43:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33890) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw7Of-0000g9-B2 for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw7Oe-000279-2I for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:57 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:44248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iw7Od-00026G-Rc for qemu-devel@nongnu.org; Mon, 27 Jan 2020 11:37:56 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGITMH029602; Mon, 27 Jan 2020 16:37:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=76PyguuYYMo6qSZp/ndM0S3i88TB7MQ5KuBWKBCwxv4=; b=F4dE5o9In5O/LtmfPf84Ya16BTEusCDbpiM9gDBtk66cfml6BnZcSpe332IlVA139NlQ EndfRfQd1t1iL+4XwFnoBeL1Q2FfF/ckA423GImMrc8eXnoThP42Ukc64b9K/J0TyI+g fqN2uzRHs5bn0ThYxRdqFfe0YV2BbO9g6aetNaEyxbSEgSPXlJeOJ+Nl5UD9GShfwx5M 1VQbMy/WhvhfyK1MIISG+EtSjLDSZSpMjnsK1TM8CNnEALSx6TlnuZn03pQKo0PrTzHT BNH3atcAyPgdOtMY7sL8phSSblqoqRvKVyEXstB/3L0fHy+hGOQycZsbbF0WPH54xRrU kQ== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 2xrdmq8hmr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:47 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id 00RGNSEa144964; Mon, 27 Jan 2020 16:37:47 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 2xryu9r9tk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2020 16:37:47 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 00RGbkU3027332; Mon, 27 Jan 2020 16:37:46 GMT Received: from ol7.uk.oracle.com (/10.175.203.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Jan 2020 08:37:46 -0800 From: Liam Merwick To: alex.bennee@linaro.org, fam@euphon.net, philmd@redhat.com Subject: [PATCH 6/6] tests/boot_linux_console: add PVH acceptance tests Date: Mon, 27 Jan 2020 16:36:34 +0000 Message-Id: <1580142994-1836-7-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> References: <1580142994-1836-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=927 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9513 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=985 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-2001270138 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.78 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: slp@redhat.com, qemu-devel@nongnu.org, wainersm@redhat.com, pbonzini@redhat.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add tests to boot an uncompressed kernel using the x86/HVM direct boot ABI. The vmlinux binary is obtained from a small RPM for Kata containers and extracted using the new extract_from_rpm() method. Signed-off-by: Liam Merwick --- tests/acceptance/boot_linux_console.py | 49 +++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 6af19ae3b14a..ab2200aa0e47 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -65,15 +65,26 @@ class BootLinuxConsole(Test): os.chdir(cwd) return self.workdir + '/' + path - def do_test_x86_64_machine(self): + def do_test_x86_64_machine(self, pvh=False): """ :avocado: tags=arch:x86_64 """ - kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' - '/linux/releases/29/Everything/x86_64/os/images/pxeboot' - '/vmlinuz') - kernel_hash = '23bebd2680757891cf7adedb033532163a792495' - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + if pvh: + rpm_url = ('https://yum.oracle.com/repo/OracleLinux/' + 'OL7/olcne/x86_64/getPackage/' + 'kernel-uek-container-4.14.35-1902.6.6.1.el7.x86_64.rpm') + rpm_hash = '4c781711a9d32dcb8e81da2b397cb98926744e23' + rpm_path = self.fetch_asset(rpm_url, asset_hash=rpm_hash) + kernel_path = self.extract_from_rpm(rpm_path, + './usr/share/kata-containers/' + 'vmlinux-4.14.35-1902.6.6.1.el7.container') + else: + kernel_url = ('https://archives.fedoraproject.org/pub/archive/' + 'fedora/linux/releases/29/Everything/x86_64/os/' + 'images/pxeboot/vmlinuz') + kernel_hash = '23bebd2680757891cf7adedb033532163a792495' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.vm.set_console() kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0' self.vm.add_args('-kernel', kernel_path, @@ -95,6 +106,19 @@ class BootLinuxConsole(Test): self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') self.do_test_x86_64_machine() + def test_x86_64_pc_pvh(self): + """ + :avocado: tags=machine:pc + """ + self.do_test_x86_64_machine(pvh=True) + + def test_x86_64_pc_qboot_pvh(self): + """ + :avocado: tags=machine:pc + """ + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') + self.do_test_x86_64_machine(pvh=True) + def test_x86_64_microvm(self): """ :avocado: tags=machine:microvm @@ -108,6 +132,19 @@ class BootLinuxConsole(Test): self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') self.do_test_x86_64_machine() + def test_x86_64_microvm_pvh(self): + """ + :avocado: tags=machine:microvm + """ + self.do_test_x86_64_machine(pvh=True) + + def test_x86_64_microvm_qboot_pvh(self): + """ + :avocado: tags=machine:microvm + """ + self.vm.add_args('-bios', 'pc-bios/bios-microvm.bin') + self.do_test_x86_64_machine(pvh=True) + def test_mips_malta(self): """ :avocado: tags=arch:mips