Blame SOURCES/0037-s390x-launch-direct-Use-sclp-as-serial-console-on-th.patch
|
 |
151578 |
From f774a2efed860774ba3a8e47e8ac81eeed2508fa Mon Sep 17 00:00:00 2001
|
|
|
151578 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
151578 |
Date: Wed, 17 May 2017 12:16:07 +0200
|
|
|
151578 |
Subject: [PATCH] s390x: launch: direct: Use sclp as serial console on this
|
|
|
151578 |
architecture.
|
|
|
151578 |
|
|
|
151578 |
The same change to the direct backend as made to the libvirt backend
|
|
|
151578 |
in the previous commit.
|
|
|
151578 |
|
|
|
151578 |
(cherry picked from commit ade2652bdac16656ba4ed821d74528a6de188fa0)
|
|
|
151578 |
---
|
|
|
151578 |
lib/launch-direct.c | 7 +++++++
|
|
|
151578 |
1 file changed, 7 insertions(+)
|
|
|
151578 |
|
|
|
151578 |
diff --git a/lib/launch-direct.c b/lib/launch-direct.c
|
|
|
151578 |
index 9cc153b21..147e158de 100644
|
|
|
151578 |
--- a/lib/launch-direct.c
|
|
|
151578 |
+++ b/lib/launch-direct.c
|
|
|
151578 |
@@ -592,8 +592,15 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
|
|
|
151578 |
ADD_CMDLINE (VIRTIO_SERIAL);
|
|
|
151578 |
|
|
|
151578 |
/* Create the serial console. */
|
|
|
151578 |
+#ifndef __s390x__
|
|
|
151578 |
ADD_CMDLINE ("-serial");
|
|
|
151578 |
ADD_CMDLINE ("stdio");
|
|
|
151578 |
+#else
|
|
|
151578 |
+ ADD_CMDLINE ("-chardev");
|
|
|
151578 |
+ ADD_CMDLINE ("stdio,id=charconsole0");
|
|
|
151578 |
+ ADD_CMDLINE ("-device");
|
|
|
151578 |
+ ADD_CMDLINE ("sclpconsole,chardev=charconsole0");
|
|
|
151578 |
+#endif
|
|
|
151578 |
|
|
|
151578 |
if (g->verbose &&
|
|
|
151578 |
guestfs_int_qemu_supports_device (g, data->qemu_data,
|
|
|
151578 |
--
|
|
|
151578 |
2.14.3
|
|
|
151578 |
|