From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48516)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fl7Us-0000LX-S6
	for guix-patches@gnu.org; Thu, 02 Aug 2018 02:54:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fl7Up-0005eU-RB
	for guix-patches@gnu.org; Thu, 02 Aug 2018 02:54:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:33169)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fl7Up-0005eM-Mj
	for guix-patches@gnu.org; Thu, 02 Aug 2018 02:54:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fl7Up-0005BM-FR
	for guix-patches@gnu.org; Thu, 02 Aug 2018 02:54:03 -0400
Subject: [bug#32346] [PATCH 3/6] marionette: Add support for QEMU's "quit"
	command.
Resent-Message-ID: <handler.32346.B32346.153319278519801@debbugs.gnu.org>
From: Chris Marusich <cmmarusich@gmail.com>
Date: Wed,  1 Aug 2018 23:51:56 -0700
Message-Id: <20180802065159.20413-3-cmmarusich@gmail.com>
In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com>
References: <20180802064520.20273-1-cmmarusich@gmail.com>
	<20180802065159.20413-1-cmmarusich@gmail.com>
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 32346@debbugs.gnu.org
Cc: Chris Marusich <cmmarusich@gmail.com>

* gnu/build/marionette.scm (marionette-control): Don't wait for the
monitor prompt when the command was "quit".
---
 gnu/build/marionette.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index bb018fc9c..61284b898 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -222,7 +222,8 @@ pcsys_monitor\")."
     (($ <marionette> _ _ monitor)
      (display command monitor)
      (newline monitor)
-     (wait-for-monitor-prompt monitor))))
+     ;; The "quit" command terminates QEMU immediately, with no output.
+     (unless (string=? command "quit") (wait-for-monitor-prompt monitor)))))
 
 (define* (marionette-screen-text marionette
                                  #:key
-- 
2.18.0