From ade2652bdac16656ba4ed821d74528a6de188fa0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 17 May 2017 12:16:07 +0200
Subject: [PATCH] s390x: launch: direct: Use sclp as serial console on this
 architecture.

The same change to the direct backend as made to the libvirt backend
in the previous commit.
---
 lib/launch-direct.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/launch-direct.c b/lib/launch-direct.c
index 4d5d6b996..53ffd1d6f 100644
--- a/lib/launch-direct.c
+++ b/lib/launch-direct.c
@@ -595,7 +595,18 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
   arg ("-device", VIRTIO_SERIAL);
 
   /* Create the serial console. */
+#ifndef __s390x__
   arg ("-serial", "stdio");
+#else
+  start_list ("-chardev") {
+    append_list ("stdio");
+    append_list ("id=charconsole0");
+  } end_list ();
+  start_list ("-device") {
+    append_list ("sclpconsole");
+    append_list ("chardev=charconsole0");
+  } end_list ();
+#endif
 
   if (g->verbose &&
       guestfs_int_qemu_supports_device (g, data->qemu_data,