From nobody Wed Feb 11 07:26:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529628613983839.1520933152935; Thu, 21 Jun 2018 17:50:13 -0700 (PDT) Received: from localhost ([::1]:58184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWAHF-0007Lg-8R for importer@patchew.org; Thu, 21 Jun 2018 20:50:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWACB-0003tC-TH for qemu-devel@nongnu.org; Thu, 21 Jun 2018 20:45:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWAC9-0000GD-GM for qemu-devel@nongnu.org; Thu, 21 Jun 2018 20:44:59 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fWAC9-0000G5-C0 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 20:44:57 -0400 Received: by mail-qk0-x243.google.com with SMTP id c131-v6so2863609qkb.0 for ; Thu, 21 Jun 2018 17:44:57 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id b14-v6sm3891653qtp.26.2018.06.21.17.44.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 17:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a9a0tFgRdnfyxDjEIRmXxf2vSHRTw/mM5Fhho5eGCLk=; b=n4I5k7K+xr4vxnkWQ4CuAWz6woXH0raDmYBwuP8YWKEB/kH+6x07N3ACalpyLNkSXQ UkUcReadxFIL0E0IMJsQIvY0YT3/yW7yO75NmzQaGiMO3CjBfL10wMfZmgJfOgUUnsUw A4XR65Oe7E6xyyLgerTqkA1HXfUcQDTmHX+fOs8ay3beHfGY27i7dsY+atvFDtwggLmU PJ4nIVvwiYVwAekzxg13iPf2W8tPNqn0Ahy6uCLLhmTFdezpSsZlCUb5k9xe1HmyN+dO lDcmJlpbcc20dFYisFxMnmxuNuTbL6tktDp8ThPHA81RNCtsuZaNbaxP4LYy94w6zTXP qqMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=a9a0tFgRdnfyxDjEIRmXxf2vSHRTw/mM5Fhho5eGCLk=; b=BheX6tRfoGAxyTrrQ9YTeANceyDbwvvm1deEYSLUtwIX6pB3o9U9aq+SDJtghX8i+X EGfhWqkYCLJzjJ7SPdllHFmarZobda9Q17SZJMxYO087xfG1W6uZzh/vPQA2P8Sm2vbK kYPYI8e992q6Jr748NjIHWNK9RyJFJ4K6R/edrrmbUtL9y2lEW6reFfo91RqYxHWbdk3 +mo+SAay4URTxAAPh2fT3tu1VIxeNIDktbHgIAPHfb9/71rUueGhDQwDSwJvigSmWjRp j8OMg+qmtCnufbqRiL/O3xPKHKk2nmWfgO01vPMqF39LLpdL7moxayIWVVkUIcOJDew7 nDmQ== X-Gm-Message-State: APt69E0Hzst8PJPaPh7RgzmwCEpuCYyc3ghO5MyNCZmRPhHReMQBOMC/ AAnva/vSkE7VOk7y3Vdu8W0= X-Google-Smtp-Source: ADUXVKK0QXBIVmq9QMzH4KkEmPdjiTP+1e4citXeNBZlSEigLuRA/Ij7gEJL2yDCPURRzftbV8BY2w== X-Received: by 2002:a37:646:: with SMTP id 67-v6mr22748280qkg.35.1529628296883; Thu, 21 Jun 2018 17:44:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Eduardo Habkost Date: Thu, 21 Jun 2018 21:44:34 -0300 Message-Id: <20180622004435.10291-6-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0.rc2 In-Reply-To: <20180622004435.10291-1-f4bug@amsat.org> References: <20180622004435.10291-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [RFC PATCH v2 5/6] tests/acceptance: Add a kludge to not use the default console 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The board already instantiate the proper devices, we don't want to add extra devices but connect the chardev to one of the serial already available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qemu.py | 6 ++++-- tests/acceptance/boot_linux_console.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index f099ce7278..7a975f4538 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -211,8 +211,10 @@ class QEMUMachine(object): 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 len(self._console_device_type): + device =3D '%s,chardev=3Dconsole' % self._console_device_t= ype + args.extend(['-device', device]) return args =20 def _pre_launch(self): diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 72cf5e943c..510742c4c7 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -69,9 +69,10 @@ class BootLinuxConsoleMips(Test): kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) =20 self.vm.set_machine('malta') - self.vm.set_console() + self.vm.set_console("") # FIXME this disable isa-serial to use -se= rial kernel_command_line =3D 'console=3DttyS0 printk.time=3D0' self.vm.add_args('-m', "64", + '-serial', "chardev:console", # FIXME ... here. '-kernel', kernel_path, '-append', kernel_command_line) self.vm.launch() --=20 2.18.0.rc2