From patchwork Fri May 29 11:19:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11578409 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 7C4E01391 for ; Fri, 29 May 2020 11:34:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 62B8D2074D for ; Fri, 29 May 2020 11:34:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62B8D2074D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedGv-0001iK-Fb; Fri, 29 May 2020 11:33:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedGu-0001hk-Pg for xen-devel@lists.xenproject.org; Fri, 29 May 2020 11:33:56 +0000 X-Inumbo-ID: 351ec9dc-a1a0-11ea-9dbe-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 351ec9dc-a1a0-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 11:33:25 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jed3Q-0003xZ-VG; Fri, 29 May 2020 12:20:01 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 14/49] Honour 'LinuxSerialConsole ' host property Date: Fri, 29 May 2020 12:19:10 +0100 Message-Id: <20200529111945.21394-15-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200529111945.21394-1-ian.jackson@eu.citrix.com> References: <20200529111945.21394-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This works like LinuxSerialConsole. I originally wrote this to try to work around #940028, where multiple d-i autoinstalls run in parallel leading to hard-to-debug lossage! Explicitly specing the console causes it to run only on that one. However, it turns out that explicitly specifying the console does not always work and a better fix is needed. Nevertheless, having added this feature it seems foolish to throw it away. Currently there are no hosts with this property so no functiaonal change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ff8103f2..7eeac49f 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1447,7 +1447,10 @@ sub get_target_property ($$;$) { sub get_host_native_linux_console ($) { my ($ho) = @_; - my $console = get_host_property($ho, "LinuxSerialConsole", "ttyS0"); + my $console; + $console //= get_host_property($ho, "LinuxSerialConsole $ho->{Suite}") + if $ho->{Suite}; + $console //= get_host_property($ho, "LinuxSerialConsole", "ttyS0"); return $console if $console eq 'NONE'; return "$console,$c{Baud}n8";