|
 |
c1c534 |
From f93cc7753900a7ff80a32dae2fd3337939909b86 Mon Sep 17 00:00:00 2001
|
|
|
c1c534 |
Message-Id: <f93cc7753900a7ff80a32dae2fd3337939909b86@dist-git>
|
|
|
c1c534 |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
c1c534 |
Date: Wed, 29 Nov 2017 16:23:15 +0100
|
|
|
c1c534 |
Subject: [PATCH] conf: add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP
|
|
|
c1c534 |
|
|
|
c1c534 |
Introduce specific a target types with two models for the console
|
|
|
c1c534 |
devices (sclp and sclplm) used in s390 and s390x guests, so isa-serial
|
|
|
c1c534 |
is no more used for them.
|
|
|
c1c534 |
|
|
|
c1c534 |
This makes <serial> usable on s390 and s390x guests, with at most only
|
|
|
c1c534 |
a single sclpconsole and one sclplmconsole devices usable in a single
|
|
|
c1c534 |
guest (due to limitations in QEMU, which will enforce already at
|
|
|
c1c534 |
runtime).
|
|
|
c1c534 |
|
|
|
c1c534 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1449265
|
|
|
c1c534 |
|
|
|
c1c534 |
Signed-off-by: Pino Toscano <ptoscano@redhat.com>
|
|
|
c1c534 |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
c1c534 |
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c1c534 |
(cherry picked from commit 21332bf6587c23409fecb06ab81dbc14dd52c10b)
|
|
|
c1c534 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c1c534 |
---
|
|
|
c1c534 |
docs/formatdomain.html.in | 19 ++++++++----
|
|
|
c1c534 |
docs/schemas/domaincommon.rng | 3 ++
|
|
|
c1c534 |
src/conf/domain_conf.c | 4 +++
|
|
|
c1c534 |
src/conf/domain_conf.h | 3 ++
|
|
|
c1c534 |
src/qemu/qemu_command.c | 6 ++++
|
|
|
c1c534 |
src/qemu/qemu_domain.c | 20 +++++++++++++
|
|
|
c1c534 |
src/qemu/qemu_domain_address.c | 1 +
|
|
|
c1c534 |
.../qemuxml2argv-s390-serial-2.args | 24 +++++++++++++++
|
|
|
c1c534 |
.../qemuxml2argv-s390-serial-2.xml | 19 ++++++++++++
|
|
|
c1c534 |
.../qemuxml2argv-s390-serial-console.args | 25 ++++++++++++++++
|
|
|
c1c534 |
.../qemuxml2argv-s390-serial-console.xml | 15 ++++++++++
|
|
|
c1c534 |
.../qemuxml2argvdata/qemuxml2argv-s390-serial.args | 22 ++++++++++++++
|
|
|
c1c534 |
.../qemuxml2argvdata/qemuxml2argv-s390-serial.xml | 14 +++++++++
|
|
|
c1c534 |
tests/qemuxml2argvtest.c | 16 ++++++++++
|
|
|
c1c534 |
.../qemuxml2xmlout-s390-serial-2.xml | 33 +++++++++++++++++++++
|
|
|
c1c534 |
.../qemuxml2xmlout-s390-serial-console.xml | 34 ++++++++++++++++++++++
|
|
|
c1c534 |
.../qemuxml2xmlout-s390-serial.xml | 28 ++++++++++++++++++
|
|
|
c1c534 |
tests/qemuxml2xmltest.c | 6 ++++
|
|
|
c1c534 |
18 files changed, 286 insertions(+), 6 deletions(-)
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.args
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial.args
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
|
|
|
c1c534 |
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
|
|
c1c534 |
index 87389f4e73..62dd6e1ec4 100644
|
|
|
c1c534 |
--- a/docs/formatdomain.html.in
|
|
|
c1c534 |
+++ b/docs/formatdomain.html.in
|
|
|
c1c534 |
@@ -6463,8 +6463,9 @@ qemu-kvm -net nic,model=? /dev/null
|
|
|
c1c534 |
with x86 guests), usb-serial (usable whenever USB support
|
|
|
c1c534 |
is available) and pci-serial (usable whenever PCI support
|
|
|
c1c534 |
is available); since 3.10.0,
|
|
|
c1c534 |
- spapr-vio-serial (usable with ppc64/pseries guests) and
|
|
|
c1c534 |
- system-serial (usable with aarch64/virt guests) are
|
|
|
c1c534 |
+ spapr-vio-serial (usable with ppc64/pseries guests),
|
|
|
c1c534 |
+ system-serial (usable with aarch64/virt guests) and
|
|
|
c1c534 |
+ sclp-serial (usable with s390 and s390x guests) are
|
|
|
c1c534 |
available as well.
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
@@ -6478,7 +6479,9 @@ qemu-kvm -net nic,model=? /dev/null
|
|
|
c1c534 |
(usable with the pci-serial target type);
|
|
|
c1c534 |
spapr-vty (usable with the spapr-vio-serial
|
|
|
c1c534 |
target type); pl011 (usable with the
|
|
|
c1c534 |
- system-serial target type).
|
|
|
c1c534 |
+ system-serial target type); sclpconsole and
|
|
|
c1c534 |
+ sclplmconsole (usable with the sclp-serial
|
|
|
c1c534 |
+ target type).
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
@@ -6493,7 +6496,8 @@ qemu-kvm -net nic,model=? /dev/null
|
|
|
c1c534 |
isa-serial), usb (for usb-serial),
|
|
|
c1c534 |
pci (for pci-serial) and spapr-vio
|
|
|
c1c534 |
(for spapr-vio-serial). The system-serial
|
|
|
c1c534 |
- target type doesn't support specifying an address.
|
|
|
c1c534 |
+ and sclp-serial target types don't support specifying an
|
|
|
c1c534 |
+ address.
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
@@ -6541,8 +6545,11 @@ qemu-kvm -net nic,model=? /dev/null
|
|
|
c1c534 |
virtio (usable whenever VirtIO support is available);
|
|
|
c1c534 |
xen, lxc, uml and
|
|
|
c1c534 |
openvz (available when the corresponding hypervisor is in
|
|
|
c1c534 |
- use); sclp and sclplm (usable for s390 and
|
|
|
c1c534 |
- s390x QEMU guests).
|
|
|
c1c534 |
+ use). sclp and sclplm (usable for s390 and
|
|
|
c1c534 |
+ s390x QEMU guests) are supported for compatibility reasons but should
|
|
|
c1c534 |
+ not be used for new guests: use the sclpconsole and
|
|
|
c1c534 |
+ sclplmconsole target models, respectively, with the
|
|
|
c1c534 |
+ serial element instead.
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
|
|
|
c1c534 |
index 957eae2832..5576128db5 100644
|
|
|
c1c534 |
--- a/docs/schemas/domaincommon.rng
|
|
|
c1c534 |
+++ b/docs/schemas/domaincommon.rng
|
|
|
c1c534 |
@@ -3573,6 +3573,7 @@
|
|
|
c1c534 |
<value>pci-serial</value>
|
|
|
c1c534 |
<value>spapr-vio-serial</value>
|
|
|
c1c534 |
<value>system-serial</value>
|
|
|
c1c534 |
+ <value>sclp-serial</value>
|
|
|
c1c534 |
</choice>
|
|
|
c1c534 |
</attribute>
|
|
|
c1c534 |
</define>
|
|
|
c1c534 |
@@ -3586,6 +3587,8 @@
|
|
|
c1c534 |
<value>pci-serial</value>
|
|
|
c1c534 |
<value>spapr-vty</value>
|
|
|
c1c534 |
<value>pl011</value>
|
|
|
c1c534 |
+ <value>sclpconsole</value>
|
|
|
c1c534 |
+ <value>sclplmconsole</value>
|
|
|
c1c534 |
</choice>
|
|
|
c1c534 |
</attribute>
|
|
|
c1c534 |
</element>
|
|
|
c1c534 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
c1c534 |
index 32089df3c2..c58dae197c 100644
|
|
|
c1c534 |
--- a/src/conf/domain_conf.c
|
|
|
c1c534 |
+++ b/src/conf/domain_conf.c
|
|
|
c1c534 |
@@ -447,6 +447,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTarget,
|
|
|
c1c534 |
"pci-serial",
|
|
|
c1c534 |
"spapr-vio-serial",
|
|
|
c1c534 |
"system-serial",
|
|
|
c1c534 |
+ "sclp-serial",
|
|
|
c1c534 |
);
|
|
|
c1c534 |
|
|
|
c1c534 |
VIR_ENUM_IMPL(virDomainChrChannelTarget,
|
|
|
c1c534 |
@@ -476,6 +477,8 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel,
|
|
|
c1c534 |
"pci-serial",
|
|
|
c1c534 |
"spapr-vty",
|
|
|
c1c534 |
"pl011",
|
|
|
c1c534 |
+ "sclpconsole",
|
|
|
c1c534 |
+ "sclplmconsole",
|
|
|
c1c534 |
);
|
|
|
c1c534 |
|
|
|
c1c534 |
VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
|
|
|
c1c534 |
@@ -4066,6 +4069,7 @@ virDomainDefAddConsoleCompat(virDomainDefPtr def)
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: {
|
|
|
c1c534 |
|
|
|
c1c534 |
/* Create a stub console to match the serial port.
|
|
|
c1c534 |
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
|
c1c534 |
index d6febf3059..0e97f0437e 100644
|
|
|
c1c534 |
--- a/src/conf/domain_conf.h
|
|
|
c1c534 |
+++ b/src/conf/domain_conf.h
|
|
|
c1c534 |
@@ -1079,6 +1079,7 @@ typedef enum {
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI,
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO,
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM,
|
|
|
c1c534 |
+ VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP,
|
|
|
c1c534 |
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST
|
|
|
c1c534 |
} virDomainChrSerialTargetType;
|
|
|
c1c534 |
@@ -1113,6 +1114,8 @@ typedef enum {
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL,
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY,
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011,
|
|
|
c1c534 |
+ VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE,
|
|
|
c1c534 |
+ VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE,
|
|
|
c1c534 |
|
|
|
c1c534 |
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST
|
|
|
c1c534 |
} virDomainChrSerialTargetModel;
|
|
|
c1c534 |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
c1c534 |
index 483eee6056..a2cfb3d4a3 100644
|
|
|
c1c534 |
--- a/src/qemu/qemu_command.c
|
|
|
c1c534 |
+++ b/src/qemu/qemu_command.c
|
|
|
c1c534 |
@@ -9229,6 +9229,10 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel)
|
|
|
c1c534 |
return QEMU_CAPS_DEVICE_PCI_SERIAL;
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:
|
|
|
c1c534 |
return QEMU_CAPS_DEVICE_SPAPR_VTY;
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
|
|
|
c1c534 |
+ return QEMU_CAPS_DEVICE_SCLPCONSOLE;
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
|
|
|
c1c534 |
+ return QEMU_CAPS_DEVICE_SCLPLMCONSOLE;
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
|
|
|
c1c534 |
@@ -10355,6 +10359,8 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
|
|
|
c1c534 |
|
|
|
c1c534 |
caps = qemuChrSerialTargetModelToCaps(serial->targetModel);
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
c1c534 |
index 2fc173fa45..91c0e163e1 100644
|
|
|
c1c534 |
--- a/src/qemu/qemu_domain.c
|
|
|
c1c534 |
+++ b/src/qemu/qemu_domain.c
|
|
|
c1c534 |
@@ -3469,6 +3469,7 @@ qemuDomainChrSerialTargetTypeToAddressType(int targetType)
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
|
|
|
c1c534 |
return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
|
|
|
c1c534 |
break;
|
|
|
c1c534 |
@@ -3492,6 +3493,9 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel)
|
|
|
c1c534 |
return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO;
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
|
|
|
c1c534 |
return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM;
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
|
|
|
c1c534 |
+ return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP;
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
|
|
|
c1c534 |
break;
|
|
|
c1c534 |
@@ -3529,6 +3533,7 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr)
|
|
|
c1c534 |
break;
|
|
|
c1c534 |
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
|
|
|
c1c534 |
if (chr->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
|
|
|
c1c534 |
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
c1c534 |
_("Target type '%s' cannot have an "
|
|
|
c1c534 |
@@ -3550,6 +3555,8 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr)
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
|
|
|
c1c534 |
|
|
|
c1c534 |
expected = qemuDomainChrSerialTargetModelToTargetType(chr->targetModel);
|
|
|
c1c534 |
|
|
|
c1c534 |
@@ -3612,6 +3619,13 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev,
|
|
|
c1c534 |
isCompatible = false;
|
|
|
c1c534 |
}
|
|
|
c1c534 |
|
|
|
c1c534 |
+ if (!ARCH_IS_S390(def->os.arch) &&
|
|
|
c1c534 |
+ (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP ||
|
|
|
c1c534 |
+ dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE ||
|
|
|
c1c534 |
+ dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE)) {
|
|
|
c1c534 |
+ isCompatible = false;
|
|
|
c1c534 |
+ }
|
|
|
c1c534 |
+
|
|
|
c1c534 |
if (!isCompatible) {
|
|
|
c1c534 |
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
c1c534 |
_("Serial device with target type '%s' and "
|
|
|
c1c534 |
@@ -4265,6 +4279,8 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,
|
|
|
c1c534 |
chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO;
|
|
|
c1c534 |
} else if (qemuDomainIsVirt(def)) {
|
|
|
c1c534 |
chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM;
|
|
|
c1c534 |
+ } else if (ARCH_IS_S390(def->os.arch)) {
|
|
|
c1c534 |
+ chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP;
|
|
|
c1c534 |
}
|
|
|
c1c534 |
}
|
|
|
c1c534 |
|
|
|
c1c534 |
@@ -4287,6 +4303,9 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
|
|
|
c1c534 |
chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011;
|
|
|
c1c534 |
break;
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
|
|
|
c1c534 |
+ chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE;
|
|
|
c1c534 |
+ break;
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
|
|
|
c1c534 |
/* Nothing to do */
|
|
|
c1c534 |
@@ -5210,6 +5229,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
|
|
|
c1c534 |
/* Nothing to do */
|
|
|
c1c534 |
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
|
|
|
c1c534 |
index db9656a3a5..a40cdb3993 100644
|
|
|
c1c534 |
--- a/src/qemu/qemu_domain_address.c
|
|
|
c1c534 |
+++ b/src/qemu/qemu_domain_address.c
|
|
|
c1c534 |
@@ -785,6 +785,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
|
|
|
c1c534 |
+ case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE:
|
|
|
c1c534 |
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST:
|
|
|
c1c534 |
return 0;
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.args
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..346dcd16bb
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.args
|
|
|
c1c534 |
@@ -0,0 +1,24 @@
|
|
|
c1c534 |
+LC_ALL=C \
|
|
|
c1c534 |
+PATH=/bin \
|
|
|
c1c534 |
+HOME=/home/test \
|
|
|
c1c534 |
+USER=test \
|
|
|
c1c534 |
+LOGNAME=test \
|
|
|
c1c534 |
+QEMU_AUDIO_DRV=none \
|
|
|
c1c534 |
+/usr/bin/qemu-system-s390x \
|
|
|
c1c534 |
+-name QEMUGuest1 \
|
|
|
c1c534 |
+-S \
|
|
|
c1c534 |
+-M s390-ccw-virtio \
|
|
|
c1c534 |
+-m 214 \
|
|
|
c1c534 |
+-smp 1,sockets=1,cores=1,threads=1 \
|
|
|
c1c534 |
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
|
c1c534 |
+-nographic \
|
|
|
c1c534 |
+-nodefconfig \
|
|
|
c1c534 |
+-nodefaults \
|
|
|
c1c534 |
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
|
|
c1c534 |
+server,nowait \
|
|
|
c1c534 |
+-mon chardev=charmonitor,id=monitor,mode=readline \
|
|
|
c1c534 |
+-boot c \
|
|
|
c1c534 |
+-chardev pty,id=charserial0 \
|
|
|
c1c534 |
+-device sclpconsole,chardev=charserial0,id=serial0 \
|
|
|
c1c534 |
+-chardev pty,id=charserial1 \
|
|
|
c1c534 |
+-device sclplmconsole,chardev=charserial1,id=serial1
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..b6eb377c98
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml
|
|
|
c1c534 |
@@ -0,0 +1,19 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219100</memory>
|
|
|
c1c534 |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch="s390x" machine="s390-ccw-virtio">hvm</type>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c1c534 |
+ <serial type='pty'/>
|
|
|
c1c534 |
+ <serial type='pty'>
|
|
|
c1c534 |
+ <target type='sclp-serial'>
|
|
|
c1c534 |
+ <model name='sclplmconsole'/>
|
|
|
c1c534 |
+ </target>
|
|
|
c1c534 |
+ </serial>
|
|
|
c1c534 |
+ <memballoon model='none'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..c405fb59ee
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
|
|
|
c1c534 |
@@ -0,0 +1,25 @@
|
|
|
c1c534 |
+LC_ALL=C \
|
|
|
c1c534 |
+PATH=/bin \
|
|
|
c1c534 |
+HOME=/home/test \
|
|
|
c1c534 |
+USER=test \
|
|
|
c1c534 |
+LOGNAME=test \
|
|
|
c1c534 |
+QEMU_AUDIO_DRV=none \
|
|
|
c1c534 |
+/usr/bin/qemu-system-s390x \
|
|
|
c1c534 |
+-name QEMUGuest1 \
|
|
|
c1c534 |
+-S \
|
|
|
c1c534 |
+-M s390-ccw-virtio \
|
|
|
c1c534 |
+-m 214 \
|
|
|
c1c534 |
+-smp 1,sockets=1,cores=1,threads=1 \
|
|
|
c1c534 |
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
|
c1c534 |
+-nographic \
|
|
|
c1c534 |
+-nodefconfig \
|
|
|
c1c534 |
+-nodefaults \
|
|
|
c1c534 |
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
|
|
c1c534 |
+server,nowait \
|
|
|
c1c534 |
+-mon chardev=charmonitor,id=monitor,mode=readline \
|
|
|
c1c534 |
+-boot c \
|
|
|
c1c534 |
+-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
|
|
|
c1c534 |
+-chardev pty,id=charserial0 \
|
|
|
c1c534 |
+-device sclpconsole,chardev=charserial0,id=serial0 \
|
|
|
c1c534 |
+-chardev pty,id=charconsole1 \
|
|
|
c1c534 |
+-device virtconsole,chardev=charconsole1,id=console1
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..c841f1f245
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml
|
|
|
c1c534 |
@@ -0,0 +1,15 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219100</memory>
|
|
|
c1c534 |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch="s390x" machine="s390-ccw-virtio">hvm</type>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c1c534 |
+ <serial type='pty'/>
|
|
|
c1c534 |
+ <console type='pty'/>
|
|
|
c1c534 |
+ <memballoon model='none'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.args
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..20968f7945
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.args
|
|
|
c1c534 |
@@ -0,0 +1,22 @@
|
|
|
c1c534 |
+LC_ALL=C \
|
|
|
c1c534 |
+PATH=/bin \
|
|
|
c1c534 |
+HOME=/home/test \
|
|
|
c1c534 |
+USER=test \
|
|
|
c1c534 |
+LOGNAME=test \
|
|
|
c1c534 |
+QEMU_AUDIO_DRV=none \
|
|
|
c1c534 |
+/usr/bin/qemu-system-s390x \
|
|
|
c1c534 |
+-name QEMUGuest1 \
|
|
|
c1c534 |
+-S \
|
|
|
c1c534 |
+-M s390-ccw-virtio \
|
|
|
c1c534 |
+-m 214 \
|
|
|
c1c534 |
+-smp 1,sockets=1,cores=1,threads=1 \
|
|
|
c1c534 |
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
|
c1c534 |
+-nographic \
|
|
|
c1c534 |
+-nodefconfig \
|
|
|
c1c534 |
+-nodefaults \
|
|
|
c1c534 |
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
|
|
c1c534 |
+server,nowait \
|
|
|
c1c534 |
+-mon chardev=charmonitor,id=monitor,mode=readline \
|
|
|
c1c534 |
+-boot c \
|
|
|
c1c534 |
+-chardev pty,id=charserial0 \
|
|
|
c1c534 |
+-device sclpconsole,chardev=charserial0,id=serial0
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..55b45bac00
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml
|
|
|
c1c534 |
@@ -0,0 +1,14 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219100</memory>
|
|
|
c1c534 |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch="s390x" machine="s390-ccw-virtio">hvm</type>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c1c534 |
+ <serial type='pty'/>
|
|
|
c1c534 |
+ <memballoon model='none'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
c1c534 |
index 656b8c0995..852525e7b4 100644
|
|
|
c1c534 |
--- a/tests/qemuxml2argvtest.c
|
|
|
c1c534 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
c1c534 |
@@ -2049,6 +2049,22 @@ mymain(void)
|
|
|
c1c534 |
QEMU_CAPS_NODEFCONFIG,
|
|
|
c1c534 |
QEMU_CAPS_VIRTIO_CCW,
|
|
|
c1c534 |
QEMU_CAPS_VIRTIO_S390);
|
|
|
c1c534 |
+ DO_TEST("s390-serial",
|
|
|
c1c534 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
c1c534 |
+ QEMU_CAPS_DEVICE_SCLPCONSOLE);
|
|
|
c1c534 |
+ DO_TEST("s390-serial-2",
|
|
|
c1c534 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
c1c534 |
+ QEMU_CAPS_DEVICE_SCLPCONSOLE,
|
|
|
c1c534 |
+ QEMU_CAPS_DEVICE_SCLPLMCONSOLE);
|
|
|
c1c534 |
+ DO_TEST("s390-serial-console",
|
|
|
c1c534 |
+ QEMU_CAPS_NODEFCONFIG,
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_CCW,
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_S390,
|
|
|
c1c534 |
+ QEMU_CAPS_DEVICE_SCLPCONSOLE);
|
|
|
c1c534 |
|
|
|
c1c534 |
DO_TEST("ppc-dtb",
|
|
|
c1c534 |
QEMU_CAPS_KVM,
|
|
|
c1c534 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..bb9ca30f1d
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml
|
|
|
c1c534 |
@@ -0,0 +1,33 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219100</memory>
|
|
|
c1c534 |
+ <currentMemory unit='KiB'>219100</currentMemory>
|
|
|
c1c534 |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
|
c1c534 |
+ <boot dev='hd'/>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <clock offset='utc'/>
|
|
|
c1c534 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c1c534 |
+ <on_reboot>restart</on_reboot>
|
|
|
c1c534 |
+ <on_crash>destroy</on_crash>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c1c534 |
+ <serial type='pty'>
|
|
|
c1c534 |
+ <target type='sclp-serial' port='0'>
|
|
|
c1c534 |
+ <model name='sclpconsole'/>
|
|
|
c1c534 |
+ </target>
|
|
|
c1c534 |
+ </serial>
|
|
|
c1c534 |
+ <serial type='pty'>
|
|
|
c1c534 |
+ <target type='sclp-serial' port='1'>
|
|
|
c1c534 |
+ <model name='sclplmconsole'/>
|
|
|
c1c534 |
+ </target>
|
|
|
c1c534 |
+ </serial>
|
|
|
c1c534 |
+ <console type='pty'>
|
|
|
c1c534 |
+ <target type='serial' port='0'/>
|
|
|
c1c534 |
+ </console>
|
|
|
c1c534 |
+ <memballoon model='none'/>
|
|
|
c1c534 |
+ <panic model='s390'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..db3023b7a6
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
|
|
|
c1c534 |
@@ -0,0 +1,34 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219100</memory>
|
|
|
c1c534 |
+ <currentMemory unit='KiB'>219100</currentMemory>
|
|
|
c1c534 |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
|
c1c534 |
+ <boot dev='hd'/>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <clock offset='utc'/>
|
|
|
c1c534 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c1c534 |
+ <on_reboot>restart</on_reboot>
|
|
|
c1c534 |
+ <on_crash>destroy</on_crash>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c1c534 |
+ <controller type='virtio-serial' index='0'>
|
|
|
c1c534 |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
|
|
|
c1c534 |
+ </controller>
|
|
|
c1c534 |
+ <serial type='pty'>
|
|
|
c1c534 |
+ <target type='sclp-serial' port='0'>
|
|
|
c1c534 |
+ <model name='sclpconsole'/>
|
|
|
c1c534 |
+ </target>
|
|
|
c1c534 |
+ </serial>
|
|
|
c1c534 |
+ <console type='pty'>
|
|
|
c1c534 |
+ <target type='serial' port='0'/>
|
|
|
c1c534 |
+ </console>
|
|
|
c1c534 |
+ <console type='pty'>
|
|
|
c1c534 |
+ <target type='virtio' port='0'/>
|
|
|
c1c534 |
+ </console>
|
|
|
c1c534 |
+ <memballoon model='none'/>
|
|
|
c1c534 |
+ <panic model='s390'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..9c9b4dd27a
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml
|
|
|
c1c534 |
@@ -0,0 +1,28 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219100</memory>
|
|
|
c1c534 |
+ <currentMemory unit='KiB'>219100</currentMemory>
|
|
|
c1c534 |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
|
c1c534 |
+ <boot dev='hd'/>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <clock offset='utc'/>
|
|
|
c1c534 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c1c534 |
+ <on_reboot>restart</on_reboot>
|
|
|
c1c534 |
+ <on_crash>destroy</on_crash>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c1c534 |
+ <serial type='pty'>
|
|
|
c1c534 |
+ <target type='sclp-serial' port='0'>
|
|
|
c1c534 |
+ <model name='sclpconsole'/>
|
|
|
c1c534 |
+ </target>
|
|
|
c1c534 |
+ </serial>
|
|
|
c1c534 |
+ <console type='pty'>
|
|
|
c1c534 |
+ <target type='serial' port='0'/>
|
|
|
c1c534 |
+ </console>
|
|
|
c1c534 |
+ <memballoon model='none'/>
|
|
|
c1c534 |
+ <panic model='s390'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
c1c534 |
index bd18507bb6..8766646738 100644
|
|
|
c1c534 |
--- a/tests/qemuxml2xmltest.c
|
|
|
c1c534 |
+++ b/tests/qemuxml2xmltest.c
|
|
|
c1c534 |
@@ -1155,6 +1155,12 @@ mymain(void)
|
|
|
c1c534 |
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
c1c534 |
DO_TEST("s390-panic-no-address",
|
|
|
c1c534 |
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
c1c534 |
+ DO_TEST("s390-serial",
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
c1c534 |
+ DO_TEST("s390-serial-2",
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
c1c534 |
+ DO_TEST("s390-serial-console",
|
|
|
c1c534 |
+ QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
c1c534 |
|
|
|
c1c534 |
DO_TEST("pcihole64", NONE);
|
|
|
c1c534 |
DO_TEST("pcihole64-gib", NONE);
|
|
|
c1c534 |
--
|
|
|
c1c534 |
2.15.1
|
|
|
c1c534 |
|