From nobody Sun Nov 9 12:59:01 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550711376571563.7684332488225; Wed, 20 Feb 2019 17:09:36 -0800 (PST) Received: from localhost ([127.0.0.1]:51589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwcrj-0006Xz-Au for importer@patchew.org; Wed, 20 Feb 2019 20:09:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwchd-0006Sc-K9 for qemu-devel@nongnu.org; Wed, 20 Feb 2019 19:59:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwchb-0001A8-Fz for qemu-devel@nongnu.org; Wed, 20 Feb 2019 19:59:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41056) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwcha-00016s-Ng; Wed, 20 Feb 2019 19:59:03 -0500 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 80B0A3086275; Thu, 21 Feb 2019 00:58:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-8.rdu2.redhat.com [10.10.120.8]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F9A15D6AA; Thu, 21 Feb 2019 00:58:46 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 19:57:46 -0500 Message-Id: <20190221005753.27955-14-crosa@redhat.com> In-Reply-To: <20190221005753.27955-1-crosa@redhat.com> References: <20190221005753.27955-1-crosa@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.49]); Thu, 21 Feb 2019 00:58:48 +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 v3 13/20] scripts/qemu.py: support adding a console with the default serial device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Cornelia Huck , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , Stefan Markovic , qemu-s390x@nongnu.org, Aleksandar Markovic , Caio Carrara , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The set_console() utility function traditionally adds a device either based on the explicitly given device type, or based on the machine type, a known good type of device. But, for a number of machine types, it may be impossible or inconvenient to add the devices my means of "-device" command line options, and then it may better to just use the "-serial" option and let QEMU itself, based on the machine type, set the device accordingly. To achieve that, the behavior of set_console() now flags the intention to add a console device on launch(), and if no explicit device type is given, and there's no definition on CONSOLE_DEV_TYPES, the "-serial" is going to be added to the QEMU command line, instead of raising exceptions. Based on testing with different machine types, the CONSOLE_DEV_TYPES is now being set to the bare essential entries (one entry to be honest), for machine types that can not easily give us a working console with "-serial". Signed-off-by: Cleber Rosa --- scripts/qemu.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index ee85309923..bd1d2e2b9a 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -42,11 +42,6 @@ def kvm_available(target_arch=3DNone): =20 #: Maps machine types to the preferred console device types CONSOLE_DEV_TYPES =3D { - r'^clipper$': 'isa-serial', - r'^malta': 'isa-serial', - r'^(pc.*|q35.*|isapc)$': 'isa-serial', - r'^(40p|powernv|prep)$': 'isa-serial', - r'^pseries.*': 'spapr-vty', r'^s390-ccw-virtio.*': 'sclpconsole', } =20 @@ -129,6 +124,7 @@ class QEMUMachine(object): self._temp_dir =3D None self._launched =3D False self._machine =3D None + self._console_set =3D False self._console_device_type =3D None self._console_address =3D None self._console_socket =3D None @@ -248,13 +244,17 @@ class QEMUMachine(object): '-display', 'none', '-vga', 'none'] if self._machine is not None: args.extend(['-machine', self._machine]) - if self._console_device_type is not None: + if self._console_set: self._console_address =3D os.path.join(self._temp_dir, self._name + "-console.so= ck") chardev =3D ('socket,id=3Dconsole,path=3D%s,server,nowait' % self._console_address) - device =3D '%s,chardev=3Dconsole' % self._console_device_type - args.extend(['-chardev', chardev, '-device', device]) + args.extend(['-chardev', chardev]) + if self._console_device_type is None: + args.extend(['-serial', 'chardev:console']) + else: + device =3D '%s,chardev=3Dconsole' % self._console_device_t= ype + args.extend(['-device', device]) return args =20 def _pre_launch(self): @@ -480,30 +480,29 @@ class QEMUMachine(object): line. =20 This is a convenience method that will either use the provided - device type, of if not given, it will used the device type set - on CONSOLE_DEV_TYPES. + device type, of if not given, it will use the device type set + on CONSOLE_DEV_TYPES if a machine type is set, and a matching + entry exists on CONSOLE_DEV_TYPES. =20 The actual setting of command line arguments will be be done at machine launch time, as it depends on the temporary directory to be created. =20 - @param device_type: the device type, such as "isa-serial" + @param device_type: the device type, such as "isa-serial". If + None is given (the default value) a "-serial + chardev:console" command line argument will + be used instead, resorting to the machine's + default device type, if a machine type is set, + and a matching entry exists on CONSOLE_DEV_TYP= ES. @raises: QEMUMachineAddDeviceError if the device type is not given and can not be determined. """ - if device_type is None: - if self._machine is None: - raise QEMUMachineAddDeviceError("Can not add a console dev= ice:" - " QEMU instance without a " - "defined machine type") + self._console_set =3D True + if device_type is None and self._machine is not None: for regex, device in CONSOLE_DEV_TYPES.items(): if re.match(regex, self._machine): device_type =3D device break - if device_type is None: - raise QEMUMachineAddDeviceError("Can not add a console dev= ice:" - " no matching console devi= ce " - "type definition") self._console_device_type =3D device_type =20 @property --=20 2.20.1