Andrea Bolognani <abologna@redhat.com> [2017-11-15, 12:50PM +0100]:
> From: Pino Toscano <ptoscano@redhat.com>
>
> Now that <serial> and <console> on s390/s390x behave a bit more like the
> other architectures, remove this extra differentation, and use sclp
> console by default for new guests. New virtio consoles can still be
> added, and it is actually needed because of the limited number of
> instances for sclp and sclplm.
>
> This reverts commit b1c88c14764e0b043a269d454a83a6ac7af34eac, whose
> reasons are not totally clear.
>
> Signed-off-by: Pino Toscano <ptoscano@redhat.com>
> ---
> src/qemu/qemu_domain.c | 7 -------
> tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args | 5 +----
> tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml | 6 ++++--
> tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml | 6 ------
> 4 files changed, 5 insertions(+), 19 deletions(-)
>
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index a6467ba4b..08467dc7e 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -4068,13 +4068,6 @@ static int
> qemuDomainChrDefPostParse(virDomainChrDefPtr chr,
> const virDomainDef *def)
> {
> - /* set the default console type for S390 arches */
> - if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
> - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE &&
> - ARCH_IS_S390(def->os.arch)) {
> - chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO;
> - }
> -
> /* Historically, isa-serial and the default matched, so in order to
> * maintain backwards compatibility we map them here. The actual default
> * will be picked below based on the architecture and machine type */
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
> index c405fb59e..20968f794 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.args
> @@ -18,8 +18,5 @@ QEMU_AUDIO_DRV=none \
> server,nowait \
> -mon chardev=charmonitor,id=monitor,mode=readline \
> -boot c \
> --device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
> -chardev pty,id=charserial0 \
> --device sclpconsole,chardev=charserial0,id=serial0 \
> --chardev pty,id=charconsole1 \
> --device virtconsole,chardev=charconsole1,id=console1
> +-device sclpconsole,chardev=charserial0,id=serial0
> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml
> index 7eb1a765a..931e255c5 100644
> --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml
> +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml
> @@ -14,9 +14,11 @@
> <on_crash>destroy</on_crash>
> <devices>
> <emulator>/usr/bin/qemu-system-s390x</emulator>
> - <controller type='virtio-serial' index='0'/>
> + <serial type='pty'>
> + <target type='sclpconsole' port='0'/>
> + </serial>
> <console type='pty'>
> - <target type='virtio' port='0'/>
> + <target type='serial' port='0'/>
> </console>
> <memballoon model='none'/>
> <panic model='s390'/>
> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
> index f3364fa23..201156445 100644
> --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
> +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
> @@ -14,18 +14,12 @@
> <on_crash>destroy</on_crash>
> <devices>
> <emulator>/usr/bin/qemu-system-s390x</emulator>
> - <controller type='virtio-serial' index='0'>
> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> - </controller>
> <serial type='pty'>
> <target type='sclpconsole' port='0'/>
> </serial>
> <console type='pty'>
> <target type='serial' port='0'/>
> </console>
> - <console type='pty'>
> - <target type='virtio' port='0'/>
> - </console>
> <memballoon model='none'/>
> <panic model='s390'/>
> </devices>
> --
> 2.13.6
>
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>
Looks good to me.
Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
--
IBM Systems
Linux on z Systems & Virtualization Development
------------------------------------------------------------------------
IBM Deutschland
Schönaicher Str. 220
71032 Böblingen
Phone: +49 7031 16 1819
E-Mail: bwalk@de.ibm.com
------------------------------------------------------------------------
IBM Deutschland Research & Development GmbH
Vorsitzende des Aufsichtsrats: Martina Koederitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list