30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
commit 2e17fe7f13225b879358183c509dda5f490dee95
|
|
Author: Pino Toscano <ptoscano@redhat.com>
|
|
Date: Thu Nov 16 15:40:44 2017 +0100
|
|
|
|
Use sclplmconsole for the second serial on s390x
|
|
|
|
The default type of serial console is sclp, whose device (sclpconsole)
|
|
can be used at most once. Hence, use the second type of sclp, sclplm,
|
|
for the second serial console.
|
|
|
|
Signed-off-by: Pino Toscano <ptoscano@redhat.com>
|
|
|
|
diff --git oz/Guest.py oz/Guest.py
|
|
index 85580d4..e86a39c 100644
|
|
--- oz/Guest.py
|
|
+++ oz/Guest.py
|
|
@@ -419,7 +419,11 @@ class Guest(object):
|
|
oz.ozutil.lxml_subelement(serial, "source", None,
|
|
{'mode':'bind', 'host':'127.0.0.1', 'service':str(self.listen_port)})
|
|
oz.ozutil.lxml_subelement(serial, "protocol", None, {'type':'raw'})
|
|
- oz.ozutil.lxml_subelement(serial, "target", None, {'port':'1'})
|
|
+ target = oz.ozutil.lxml_subelement(serial, "target", None, {'port':'1'})
|
|
+ if self.tdl.arch == 's390x':
|
|
+ # use a different console, as sclp can be used as most once
|
|
+ target.set('type', 'sclp-serial')
|
|
+ oz.ozutil.lxml_subelement(target, "model", None, {'name':'sclplmconsole'})
|
|
|
|
def _generate_virtio_channel(self, devices, name):
|
|
virtio = oz.ozutil.lxml_subelement(devices, "channel", None, {'type': 'tcp'})
|