From nobody Sat May 11 12:59:17 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=1561739025; cv=none; d=zoho.com; s=zohoarc; b=al0t9JA4qn+TWqkkuGzy++H4ssWyT1uSGEsrKxjDdO1enIbVgQinaPbx4rBLY01a6IzwP/RVZSk6T8Ux5pfOwE5UQ2SaZVqbbaNtNQmV4USmyYfFgPnarbs7QEvfrwvxI785Ha4MgVeCYFLhSXrM+pt2l066B5kmUW2DKr4j+d0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561739025; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=EM8JnT+o2v/rnR/sTOE/UPTrJQQHaxPHKygVgQlGg9E=; b=VwnxhonQW932/nLdAKo7TMWnohU30T1rzxQJmFIXHUs7uElUkdwIk1KfvxOUaNisgUtpuAMY/3xEUalfYYOqXM/yu+bsOeRIBk4I67APTmlRRfQAQ97w1yK6NI/tPP3Fs8+APp0HgYqilqw9MvFAVxMfgdsAtkWKV3zw2gDyBb8= 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 1561739025834731.914776305385; Fri, 28 Jun 2019 09:23:45 -0700 (PDT) Received: from localhost ([::1]:34022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgtey-00067d-8V for importer@patchew.org; Fri, 28 Jun 2019 12:23:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49787) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgsOp-0002I0-V0 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgsOg-0004mX-JB for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgsOX-0004i1-5g for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:36 -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 7099E811A9 for ; Fri, 28 Jun 2019 15:02:32 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 959995D704; Fri, 28 Jun 2019 15:02:25 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 11:02:15 -0400 Message-Id: <20190628150217.32659-2-wainersm@redhat.com> In-Reply-To: <20190628150217.32659-1-wainersm@redhat.com> References: <20190628150217.32659-1-wainersm@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, 28 Jun 2019 15:02:32 +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] [PATCH 1/3] python/qemu: Allow to launch the VM without qmp 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: philmd@redhat.com, jsnow@redhat.com, ehabkost@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" QEMUMachine launches the VM with a monitor enabled, afterwards a qmp connection is attempted on _post_launch(). In case the QEMU process exits with an error, qmp.accept() reaches timeout and raises an exception. But sometimes you don't need that monitor. As an example, when a test launches the VM expecting its immediate crash, and only intend to check the process's return code. In this case the fact that launch() tries to establish the qmp connection (ending up in an exception) is troublesome. So this patch adds the set_qmp_monitor() that allow to launch the VM without creating the monitor machinery. Signed-off-by: Wainer dos Santos Moschetta --- python/qemu/__init__.py | 72 +++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index dbaf8a5311..dd577e9446 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -113,6 +113,7 @@ class QEMUMachine(object): self._events =3D [] self._iolog =3D None self._socket_scm_helper =3D socket_scm_helper + self._qmp_set =3D True # Enable QMP monitor by default. self._qmp =3D None self._qemu_full_args =3D None self._test_dir =3D test_dir @@ -227,15 +228,7 @@ class QEMUMachine(object): self._iolog =3D iolog.read() =20 def _base_args(self): - if isinstance(self._monitor_address, tuple): - moncdev =3D "socket,id=3Dmon,host=3D%s,port=3D%s" % ( - self._monitor_address[0], - self._monitor_address[1]) - else: - moncdev =3D 'socket,id=3Dmon,path=3D%s' % self._vm_monitor - args =3D ['-chardev', moncdev, - '-mon', 'chardev=3Dmon,mode=3Dcontrol', - '-display', 'none', '-vga', 'none'] + args =3D ['-display', 'none', '-vga', 'none'] if self._machine is not None: args.extend(['-machine', self._machine]) if self._console_set: @@ -249,23 +242,33 @@ class QEMUMachine(object): else: device =3D '%s,chardev=3Dconsole' % self._console_device_t= ype args.extend(['-device', device]) + if self._qmp_set: + if isinstance(self._monitor_address, tuple): + moncdev =3D "socket,id=3Dmon,host=3D%s,port=3D%s" % ( + self._monitor_address[0], + self._monitor_address[1]) + else: + moncdev =3D 'socket,id=3Dmon,path=3D%s' % self._vm_monitor + args.extend(['-chardev', moncdev, '-mon', 'chardev=3Dmon,mode= =3Dcontrol']) + return args =20 def _pre_launch(self): self._temp_dir =3D tempfile.mkdtemp(dir=3Dself._test_dir) - if self._monitor_address is not None: - self._vm_monitor =3D self._monitor_address - else: - self._vm_monitor =3D os.path.join(self._temp_dir, - self._name + "-monitor.sock") self._qemu_log_path =3D os.path.join(self._temp_dir, self._name + = ".log") self._qemu_log_file =3D open(self._qemu_log_path, 'wb') =20 - self._qmp =3D qmp.QEMUMonitorProtocol(self._vm_monitor, - server=3DTrue) - + if self._qmp_set: + if self._monitor_address is not None: + self._vm_monitor =3D self._monitor_address + else: + self._vm_monitor =3D os.path.join(self._temp_dir, + self._name + "-monitor.sock") + self._qmp =3D qmp.QEMUMonitorProtocol(self._vm_monitor, + server=3DTrue) def _post_launch(self): - self._qmp.accept() + if self._qmp: + self._qmp.accept() =20 def _post_shutdown(self): if self._qemu_log_file is not None: @@ -328,7 +331,8 @@ class QEMUMachine(object): Wait for the VM to power off """ self._popen.wait() - self._qmp.close() + if self._qmp: + self._qmp.close() self._load_io_log() self._post_shutdown() =20 @@ -337,11 +341,14 @@ class QEMUMachine(object): Terminate the VM and clean up """ if self.is_running(): - try: - self._qmp.cmd('quit') - self._qmp.close() - except: - self._popen.kill() + if self._qmp: + try: + self._qmp.cmd('quit') + self._qmp.close() + except: + self._popen.kill() + else: + self._popen.terminate() self._popen.wait() =20 self._load_io_log() @@ -358,6 +365,23 @@ class QEMUMachine(object): =20 self._launched =3D False =20 + def set_qmp_monitor(self, disabled=3DFalse, monitor_address=3DNone): + """ + Set the QMP monitor. + + @param disabled: if True, qmp monitor options will be removed from= the + base arguments of the resulting QEMU command line. + @param monitor_address: address for the QMP monitor. + @note: call this function before launch(). + """ + if disabled: + self._qmp_set =3D False + self._qmp =3D None + else: + self._qmp_set =3D True + if monitor_address: + self._monitor_address =3D monitor_address + def qmp(self, cmd, conv_keys=3DTrue, **args): """ Invoke a QMP command and return the response dict --=20 2.21.0 From nobody Sat May 11 12:59:17 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=1561735294; cv=none; d=zoho.com; s=zohoarc; b=nugkJ2ZQK+/ERoi9Mw21dhcgfSXMFrw1W6EEWjuXa48SQUcMQrWmgMldHx6+Rjtl2DWEv8Af+zTN8nt6M6ClbaRyCQC1fJRT6jLEhDjXFMUqPvcyozXxlyTTkozqJZNrYxNEc+hMM+6alVFFFc9H4T78ujmyLsnZsDfJYG/niZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561735294; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XtQAO5yeJUK7a5RalRjbm7EhcDFBh7Sosk2D0ATjpj4=; b=mL4uxS/mFvEwsfJ8qdvSKVClc/Y9+bZhrN00YyBOrZtRevudr7Naj8s2ddhbqTiJvlEZg5dXq+CH4ilfPzC4MxRCmIVECOktbwF1vDorRDzDkdoxU5HtzZjYBnH8cb18bGAYFgeWk5TjnuRxiKrzWfTCeTThl/isCj8Nidg9pEY= 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 156173529468724.052349700113496; Fri, 28 Jun 2019 08:21:34 -0700 (PDT) Received: from localhost ([::1]:33160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgsgj-0005lG-Kw for importer@patchew.org; Fri, 28 Jun 2019 11:21:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49829) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgsOt-0002Oh-Qw for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgsOq-0004v3-W6 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgsOq-0004iX-Kw for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:52 -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 34026D56F1 for ; Fri, 28 Jun 2019 15:02:33 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 902E15D704; Fri, 28 Jun 2019 15:02:32 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 11:02:16 -0400 Message-Id: <20190628150217.32659-3-wainersm@redhat.com> In-Reply-To: <20190628150217.32659-1-wainersm@redhat.com> References: <20190628150217.32659-1-wainersm@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.38]); Fri, 28 Jun 2019 15:02:33 +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] [PATCH 2/3] tests/acceptance: Introduce the "accel" tag 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: philmd@redhat.com, jsnow@redhat.com, ehabkost@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some test cases may boot a VM with accelerator that isn't actually enabled on the QEMU binary or present in the host. In this case the test case is gonna fail miserably, unless it can be skipped. This change introduces the "accel" tag, used to mark the test case requires a given accelerator(s). It was implemented a mechanism to check the given accelerator is available, and if not then the test case is skipped. Signed-off-by: Wainer dos Santos Moschetta --- tests/acceptance/avocado_qemu/__init__.py | 5 ++ tests/acceptance/avocado_qemu/accel.py | 60 +++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 tests/acceptance/avocado_qemu/accel.py diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 2b236a1cf0..f823f7525b 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -18,6 +18,7 @@ SRC_ROOT_DIR =3D os.path.join(os.path.dirname(__file__), = '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) =20 from qemu import QEMUMachine +from .accel import is_accel_available =20 def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) @@ -65,6 +66,10 @@ class Test(avocado.Test): if self.qemu_bin is None: self.cancel("No QEMU binary defined or found in the source tre= e") =20 + for accel in self.tags.get('accel', []): + if not is_accel_available(accel, self.qemu_bin): + self.cancel("Accelerator %s not available" % accel) + def _new_vm(self, *args): vm =3D QEMUMachine(self.qemu_bin) if args: diff --git a/tests/acceptance/avocado_qemu/accel.py b/tests/acceptance/avoc= ado_qemu/accel.py new file mode 100644 index 0000000000..21f7240d56 --- /dev/null +++ b/tests/acceptance/avocado_qemu/accel.py @@ -0,0 +1,60 @@ +# Utilities for using QEMU accelerators on tests. +# +# Copyright (c) 2019 Red Hat, Inc. +# +# Author: +# Wainer dos Santos Moschetta +# +# 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 qemu import QEMUMachine +from qemu import kvm_available + +def list_accel(qemu_bin): + """ + List accelerators enabled in the binary. + + :param qemu_bin: path to the QEMU binary. + :type qemu_bin: str + :returns: list of accelerator names. + :rtype: list + """ + vm =3D QEMUMachine(qemu_bin) + vm.set_qmp_monitor(disabled=3DTrue) + vm.add_args('-accel', 'help') + vm.launch() + vm.wait() + if vm.exitcode() !=3D 0: + raise Exception("Failed to get the accelerators in %s" % qemu_bin) + lines =3D vm.get_log().splitlines() + # skip first line which is the output header. + return [l for l in lines[1:] if l] + +def _tcg_avail_checker(qemu_bin): + # checks TCG is enabled in the binary only. + return 'tcg' in list_accel(qemu_bin) + +def _kvm_avail_checker(qemu_bin): + # checks KVM is present in the host as well as enabled in the binary. + return kvm_available() and "kvm" in list_accel(qemu_bin) + +_CHECKERS =3D {"tcg": _tcg_avail_checker, "kvm": _kvm_avail_checker} + +def is_accel_available(accel, qemu_bin): + """ + Check the accelerator is available (enabled in the binary as well as + present on host). + + :param accel: accelerator's name. + :type accel: str + :param qemu_bin: path to the QEMU binary. + :type qemu_bin: str + :returns: True if accelerator is available, False otherwise. + :rtype: boolean + """ + checker =3D _CHECKERS.get(accel, None) + if checker: + return checker(qemu_bin) + raise Exception("Availability checker not implemented for %s accelerat= or." % + accel) --=20 2.21.0 From nobody Sat May 11 12:59:17 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=1561734844; cv=none; d=zoho.com; s=zohoarc; b=MPi23L6NfYVhhyi/Iu/FfyziD6vwB08DPCY2bMceblm9bCF0gf+LUV9WidjiSwQBdl4FHnUuPAsO7IMK3wjxHR0o2I8dc/G68dzZJxxzdbCXkCahEvxmP/sfbJRaMyxxUE3f49vs3stB0uvfFg1n9m/XFJXLVaNE75/2Dj+kTN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561734844; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8MVf2RtWoQveBLwsaImqHNvcUFOGT+dY3veKmt5FsAM=; b=lZ+s5kEKN12AyZrZzrUk/HpRLbhGuPFy+FlBNp0TUQBXRfLKWmcq0iftli9SrJC29FpWTTF9KHQlYhkmq3IiuvDlscYi6MQk++ZqtaPndusZ24lPAgI8u/Hk05v69dqG/uWyVSSMBA/nvMNCWeHywpSTBHto8ZPX1RmbnHBZe+U= 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 1561734844043377.6420127437656; Fri, 28 Jun 2019 08:14:04 -0700 (PDT) Received: from localhost ([::1]:33078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgsZc-0001IA-3J for importer@patchew.org; Fri, 28 Jun 2019 11:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49830) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgsOt-0002Oi-R6 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgsOq-0004uw-UY for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgsOq-0004iv-Lu for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:52 -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 EBE1A8F915 for ; Fri, 28 Jun 2019 15:02:33 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52A1854529; Fri, 28 Jun 2019 15:02:33 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 11:02:17 -0400 Message-Id: <20190628150217.32659-4-wainersm@redhat.com> In-Reply-To: <20190628150217.32659-1-wainersm@redhat.com> References: <20190628150217.32659-1-wainersm@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.26]); Fri, 28 Jun 2019 15:02:33 +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] [PATCH 3/3] tests/acceptance: Add boot linux with kvm test 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: philmd@redhat.com, jsnow@redhat.com, ehabkost@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Until now the suite of acceptance tests doesn't exercise QEMU with kvm enabled. So this introduces a simple test that boots the Linux kernel and checks it boots on the accelerator correctly. Signed-off-by: Wainer dos Santos Moschetta --- tests/acceptance/kvm.py | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 tests/acceptance/kvm.py diff --git a/tests/acceptance/kvm.py b/tests/acceptance/kvm.py new file mode 100644 index 0000000000..aafb865cdb --- /dev/null +++ b/tests/acceptance/kvm.py @@ -0,0 +1,58 @@ +# KVM acceptance tests. +# +# Copyright (c) 2019 Red Hat, Inc. +# +# Author: +# Wainer dos Santos Moschetta +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import logging + +from avocado_qemu import Test + + +class Kvm(Test): + """ + Suite of acceptance tests to check QEMU and KVM integration. + """ + + def test_boot_linux(self): + """ + Simple Linux boot test with kvm enabled. + + :avocado: tags=3Darch:x86_64 + :avocado: tags=3Daccel:kvm + """ + self.vm.add_args('-enable-kvm') + kernel_url =3D ('https://download.fedoraproject.org/pub/fedora/lin= ux/' + 'releases/29/Everything/x86_64/os/images/pxeboot/vml= inuz') + kernel_hash =3D '23bebd2680757891cf7adedb033532163a792495' + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) + + self.vm.set_machine('pc') + self.vm.set_console() + self.vm.add_args('-kernel', kernel_path, + '-append', 'printk.time=3D0 console=3DttyS0') + self.vm.launch() + + query =3D self.vm.command('query-kvm') + self.assertTrue(query['enabled']) + self.assertTrue(query['present']) + + console =3D self.vm.console_socket.makefile() + console_logger =3D logging.getLogger('console') + failure_message =3D 'Kernel panic - not syncing' + success_message =3D 'Booting paravirtualized kernel on KVM' + + while True: + msg =3D console.readline().strip() + if not msg: + continue + console_logger.debug(msg) + if success_message in msg: + break + if failure_message in msg: + fail =3D 'Failure message found in console: %s' % failure_= message + self.fail(fail) --=20 2.21.0