From nobody Mon Feb 9 19:53:18 2026 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 1552393441852207.02511135927682; Tue, 12 Mar 2019 05:24:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:51215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3gRo-0007eo-Nj for importer@patchew.org; Tue, 12 Mar 2019 08:23:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3gJj-0000t0-AV for qemu-devel@nongnu.org; Tue, 12 Mar 2019 08:15:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3gGg-0005cB-4S for qemu-devel@nongnu.org; Tue, 12 Mar 2019 08:12:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3gGf-0005Yp-RC; Tue, 12 Mar 2019 08:12:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 10C4F81F31; Tue, 12 Mar 2019 12:12:25 +0000 (UTC) Received: from unused.bos.redhat.com (unknown [10.16.197.78]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9C481001E6A; Tue, 12 Mar 2019 12:12:23 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 08:11:43 -0400 Message-Id: <20190312121150.8638-13-crosa@redhat.com> In-Reply-To: <20190312121150.8638-1-crosa@redhat.com> References: <20190312121150.8638-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 12 Mar 2019 12:12:25 +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 v4 12/19] 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 , Eduardo Habkost , Stefan Markovic , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cornelia Huck , Wainer dos Santos Moschetta , Aleksandar Rikalo , qemu-s390x@nongnu.org, Aleksandar Markovic , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 either adds a device based on the explicitly given device type, or adds a known good type of device based on the machine type. But, for a number of machine types, it may be impossible or inconvenient to add the devices by 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 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 not necessary anymore, so it's being removed, as it is the logic to use it. Signed-off-by: Cleber Rosa Reviewed-by: Cornelia Huck --- python/qemu/__init__.py | 48 ++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index fd144c0006..81d9657ec0 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -41,17 +41,6 @@ def kvm_available(target_arch=3DNone): return os.access("/dev/kvm", os.R_OK | os.W_OK) =20 =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', - } - - class QEMUMachineError(Exception): """ Exception called when an error in QEMUMachine happens. @@ -130,6 +119,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 +238,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 +474,20 @@ 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, or default to a "-serial chardev:console" command + line argument. =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" - @raises: QEMUMachineAddDeviceError if the device type is not given - and can not be determined. + @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 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") - 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_set =3D True self._console_device_type =3D device_type =20 @property --=20 2.20.1