From patchwork Mon Oct 21 15:16:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11202497 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 C8FD213B1 for ; Mon, 21 Oct 2019 15:17:49 +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 A3EDB2084B for ; Mon, 21 Oct 2019 15:17:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="LuLW4CdA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3EDB2084B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none 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.89) (envelope-from ) id 1iMZQ0-0003v7-5u; Mon, 21 Oct 2019 15:16:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMZPy-0003v2-Bw for xen-devel@lists.xenproject.org; Mon, 21 Oct 2019 15:16:22 +0000 X-Inumbo-ID: bcc40fa2-f415-11e9-8aca-bc764e2007e4 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bcc40fa2-f415-11e9-8aca-bc764e2007e4; Mon, 21 Oct 2019 15:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1571670981; h=from:to:cc:subject:date:message-id:mime-version; bh=Gsg+KCj0YXAZWAQMqQ+2pg+Jo8qba2gwkJySj+iz+hM=; b=LuLW4CdAYrflCDRNKiZyR3lcbChNdnxnuYr4UWPdtiYfMDelKNp09XKr pyF2U9jVRQsv49IsTPpeUtxqL0Cavt7kHHHDW1eQXi/N0o8wkKBXMyi00 p/j5DcJpmK+vssXQa36P4nCAp4XoztO7K4bsEYy9ogiI1mSACKDwzRl2/ Q=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: DR7DT9+pKKOPfiGGEXLZIaFJoOZ4TjrDxyWVBJ6wwyZ213A0w/lXV0uhUEiuDRb/FjwGs3SXPR I5eHKhJWOPaBtGjZWGfDnLBuPW7rb1CAMJO8R6gv22cMJuHMiSaNHVVGpGb/tIAgFQ9mkVDUCN dQOhe+piEAfDEc3mWsBxhdm1BHiviBS0bbsoDOLjditJw2AmjE85jbbZIe9S3aH4UzJ3+iNYCJ 4GYq8fpyNoYRjGGcihfjqkWd9ZHrx82xUcOZkAL6GEqMmxRBNP6cVFhJcG1tFTu28P53XNq0df gtQ= X-SBRS: 2.7 X-MesageID: 7207329 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,324,1566878400"; d="scan'208";a="7207329" From: Ian Jackson To: Date: Mon, 21 Oct 2019 16:16:13 +0100 Message-ID: <20191021151615.30367-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 1/3] cs-adjust-flight: Provide runvar-set-default X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No change to existing code. Signed-off-by: Ian Jackson --- cs-adjust-flight | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/cs-adjust-flight b/cs-adjust-flight index ae342506..98d40891 100755 --- a/cs-adjust-flight +++ b/cs-adjust-flight @@ -11,6 +11,7 @@ # jobs-list # jobs-del # runvar-set +# runvar-set-default # runvar-del # runvar-change # runvar-perlop @@ -260,6 +261,10 @@ our $runvar_rm_q = db_prepare our $runvar_insert_q = db_prepare ("INSERT INTO runvars (flight, job, name, val, synth)". " VALUES (?, ?, ?, ?, 'f')"); +our $runvar_insert_default_q = db_prepare + ("INSERT INTO runvars (flight, job, name, val, synth)". + " VALUES (?, ?, ?, ?, 'f')". + " ON CONFLICT DO NOTHING"); sub runvar_set ($$$;$) { my ($job, $name, $val, $xwhat) = @_; @@ -270,6 +275,16 @@ sub runvar_set ($$$;$) { verbose "\n"; } +sub runvar_set_default ($$$;$) { + my ($job, $name, $val, $xwhat) = @_; + my $y = $runvar_insert_default_q->execute($dstflight, $job, $name, $val); + if ($y) { + verbose "$dstflight.$job $name := \`$val'"; + verbose $xwhat if defined $xwhat; + verbose "\n"; + } +} + sub for_runvars ($$$$) { my ($jobspec, $varspec, $fn, $ifnone) = @_; # calls $fn->($jobname, $varname, $varrow) @@ -306,6 +321,18 @@ sub change__runvar_set { }, 'ANYWAY'); } +sub change__runvar_set_default { + die unless @changes >= 3; + my $jobs = shift @changes; + my $name = shift @changes; + my $val = shift @changes; + + for_jobs($dstflight, $jobs, sub { + my ($job) = @_; + runvar_set_default($job, $name, $val); + }, 'ANYWAY'); +} + sub change__runvar_del { die unless @changes >= 2; my $jobs = shift @changes; From patchwork Mon Oct 21 15:16:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11202501 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 155271515 for ; Mon, 21 Oct 2019 15:17:57 +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 E56A32084B for ; Mon, 21 Oct 2019 15:17:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="ES6JLHvv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E56A32084B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none 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.89) (envelope-from ) id 1iMZQ9-0003wn-Oe; Mon, 21 Oct 2019 15:16:33 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMZQ8-0003wP-Aa for xen-devel@lists.xenproject.org; Mon, 21 Oct 2019 15:16:32 +0000 X-Inumbo-ID: bd7371ea-f415-11e9-8aca-bc764e2007e4 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bd7371ea-f415-11e9-8aca-bc764e2007e4; Mon, 21 Oct 2019 15:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1571670982; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UrrolaSHHt1KywdjDCS6pbQdWiowZgcACrdggbFVb/4=; b=ES6JLHvvVsn0gYYS09AHsDYBqgN8ej73a7tHVgZbfZFgUZGmXVL5riPs 8DBSP5tEAUMOUXuTaRdeSAEPq1jObI1/qG/VaNfs01gvXvv6agd+h8SJW dFfaVcLLTSiobMNJVNf0REXXMqeXbAUVpXPsTGaJUOK3whlIRDmqnQbX0 Y=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: sRKpOH7lfhIx3oWwvwTpl7V12+E5JRp8VmRiA0g3ssZ8DPrLJGgZ6rq7/xOjV5BKtP8X2FDzlH N9oqj7E5pY7Tum5QqvjYHouVf4+7Jaf3RTjW++Kj2SA28fF1pgihxMuUjXFtnbi+WIjTuqR0do lUcsskI6wuvlC+UXNz4luSU+K/I1Vcnv0w1P7+nSe6W87Zz7tlSxzjbDk1HpowB9Fqh4WD5HE0 DYZPBmHgQ6SlwotsB6bSawNq7GolXGajez0juY+etiFsDooxsnoTpm0Qa6fD4Uht8QRe9zpyLs HZk= X-SBRS: 2.7 X-MesageID: 7207331 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,324,1566878400"; d="scan'208";a="7207331" From: Ian Jackson To: Date: Mon, 21 Oct 2019 16:16:14 +0100 Message-ID: <20191021151615.30367-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191021151615.30367-1-ian.jackson@eu.citrix.com> References: <20191021151615.30367-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 2/3] guest_prepare_disk: Only do the umount if we set an env var X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This call to guest_umount_lv is here for the benefit of ad-hoc reruns of (eg) ts-guest-start tidy up any ad-hoc messing about (eg from earlier runs of ts-debian-fixup or something). It is not needed in production runs. Serendipitously, this osstest code discovered a bug in the Linux blkback: when tearing down, it sets the backend state to 6 before it has closed the underlying block devices. This ultimately means that after "xl destroy" or "xl shutdown -w" there is a period when the guest's open handle onto its storage is still open. This is wrong. This detection depends on us winning a tricky race. So it shows up in osstest as a very low probability heisenbug. The bug is currently in all versions of Linux and causing a bit of a nuisance. It would be best to add a proper check for this bug. However, this is quite fiddly: really, it ought to be done as close to the xl command completion as possible, in the same ssh invocation. That would involve a fair bit of plumbing and ad-hocery. I don't think that would be proportionate for such a low-impact bug. So instead in this patch I just disable this cleanup code in the troublesome case, unless it is explicitly requested by the user setting OSSTEST_GUEST_DISK_MOUNT_CLEANUP to a trueish value. (This would be reasonably convenient for the ad-hoc testing that this call serves.) Thanks to Roger for diagnosing the Linux kernel bug. CC: Jürgen Groß Signed-off-by: Ian Jackson Reviewed-by: Roger Pau Monne --- Osstest/TestSupport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 78f47480..6b0ee7a2 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1938,7 +1938,8 @@ sub guest_create_paused ($) { sub guest_prepare_disk ($) { my ($gho) = @_; - guest_umount_lv($gho->{Host}, $gho); + guest_umount_lv($gho->{Host}, $gho) + if $ENV{'OSSTEST_GUEST_DISK_MOUNT_CLEANUP'}; return if ($gho->{Diskfmt} // 'none') eq "none"; From patchwork Mon Oct 21 15:16:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11202499 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 0509413BD for ; Mon, 21 Oct 2019 15:17:51 +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 D4FD32084B for ; Mon, 21 Oct 2019 15:17:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="S7J+QKzq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4FD32084B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none 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.89) (envelope-from ) id 1iMZQ4-0003vd-EJ; Mon, 21 Oct 2019 15:16:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMZQ3-0003vQ-9x for xen-devel@lists.xenproject.org; Mon, 21 Oct 2019 15:16:27 +0000 X-Inumbo-ID: bcf6403a-f415-11e9-a531-bc764e2007e4 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bcf6403a-f415-11e9-a531-bc764e2007e4; Mon, 21 Oct 2019 15:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1571670982; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=7mqME22IRaVsFXxkFHxb35moB83/z4I+et+xnWwOyaw=; b=S7J+QKzqzAIaEvK/V+2aCfkvaC6SptJLbft9IXWtih3ohn5nr7PY6xRg 2M+FYnEQYMEPhrfAcgsjhPfenIJZh0+iE6cBR/2xWlABWCFk2XN94V5sV Y0ILkrBG0J4VVzRmL+Epx/gpgeM7RQg3W7KeWijG4gmmxYIImKmbmoc8L E=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: ho0HDNtR/wQZ0Hq5YFgByr0fPgLoR/cjnuKBr3Yu4qb2NxTlSGk7bCf90FXDIfWRDPNzSj1/aB ZBt661aDuqKcYXjUUvmiOJ8g8Zj6lagPearJF2xGUrYbAzh6nkQp5ncb/lAhKyOtE9PHYNym9Z VAYvOFqdVZ56SUihIpuYCjfyDLpNLCCMTqP6CDrlPgIhOJMxL3E6Z1smdTibL6aZvGn3nwF+N6 kWR2ve5pgkDyYDOaWjJmCHcQHygujAPQRakb/LX71fjcLuUDfSfGIvunDz5gNEojKAFvdfs3hH 1NI= X-SBRS: 2.7 X-MesageID: 7298347 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,324,1566878400"; d="scan'208";a="7298347" From: Ian Jackson To: Date: Mon, 21 Oct 2019 16:16:15 +0100 Message-ID: <20191021151615.30367-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191021151615.30367-1-ian.jackson@eu.citrix.com> References: <20191021151615.30367-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 3/3] Toolstack/xl: Wrap a long command X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- Osstest/Toolstack/xl.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm index d31af8c0..85972753 100644 --- a/Osstest/Toolstack/xl.pm +++ b/Osstest/Toolstack/xl.pm @@ -78,7 +78,8 @@ sub shutdown_wait ($$$) { my $gn = $gho->{Name}; my $acpi_fallback = guest_var($gho,'acpi_shutdown','false') eq 'true' && $self->{Name} eq 'xl' ? "F" : ""; - target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", $timeout); + target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", + $timeout); } sub _check_for_command($$) {