* Re: [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines
2017-10-27 16:14 [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines Collin L. Walling
@ 2017-10-27 17:40 ` Halil Pasic
2017-10-27 20:25 ` Farhan Ali
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Halil Pasic @ 2017-10-27 17:40 UTC (permalink / raw)
To: Collin L. Walling, cohuck, borntraeger
Cc: thuth, bwalk, david, pmorel, qemu-devel, agraf, jjherne, rth
On 10/27/2017 06:14 PM, Collin L. Walling wrote:
> The sclp console in the s390 bios writes raw data,
> leading console emulators (such as virsh console) to
> treat a new line ('\n') as just a new line instead
> of as a Unix line feed. Because of this, output
> appears in a "stair case" pattern.
>
> Let's print \r\n on every occurrence of a new line
> in the string passed to write to amend this issue.
>
> This is in sync with the guest Linux code in
> drivers/s390/char/sclp_vt220.c which also does a line feed
> conversion in the console part of the driver.
>
> This fixes the s390-ccw and s390-netboot output like
> $ virsh start test --console
> Domain test started
> Connected to domain test
> Escape character is ^]
> Network boot starting...
> Using MAC address: 02:01:02:03:04:05
> Requesting information via DHCP: 010
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
> ---
> pc-bios/s390-ccw/sclp.c | 24 +++++++++++++++++++++---
> 1 file changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> index 486fce1..e6a0898 100644
> --- a/pc-bios/s390-ccw/sclp.c
> +++ b/pc-bios/s390-ccw/sclp.c
> @@ -68,17 +68,35 @@ void sclp_setup(void)
> long write(int fd, const void *str, size_t len)
> {
> WriteEventData *sccb = (void *)_sccb;
> + const char *p = str;
> + size_t data_len = 0;
> + size_t i;
>
> if (fd != 1 && fd != 2) {
> return -EIO;
> }
>
> - sccb->h.length = sizeof(WriteEventData) + len;
> + for (i = 0; i < len; i++) {
> + if ((data_len + 1) >= SCCB_DATA_LEN) {
> + /* We would overflow the sccb buffer, abort early */
> + len = i;
> + break;
> + }
> +
> + if (*p == '\n') {
> + /* Terminal emulators might need \r\n, so generate it */
> + sccb->data[data_len++] = '\r';
> + }
> +
> + sccb->data[data_len++] = *p;
> + p++;
> + }
> +
> + sccb->h.length = sizeof(WriteEventData) + data_len;
> sccb->h.function_code = SCLP_FC_NORMAL_WRITE;
> - sccb->ebh.length = sizeof(EventBufferHeader) + len;
> + sccb->ebh.length = sizeof(EventBufferHeader) + data_len;
> sccb->ebh.type = SCLP_EVENT_ASCII_CONSOLE_DATA;
> sccb->ebh.flags = 0;
> - memcpy(sccb->data, str, len);
>
> sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines
2017-10-27 16:14 [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines Collin L. Walling
2017-10-27 17:40 ` Halil Pasic
@ 2017-10-27 20:25 ` Farhan Ali
2017-10-28 6:58 ` Cornelia Huck
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Farhan Ali @ 2017-10-27 20:25 UTC (permalink / raw)
To: qemu-devel
On 10/27/2017 12:14 PM, Collin L. Walling wrote:
> The sclp console in the s390 bios writes raw data,
> leading console emulators (such as virsh console) to
> treat a new line ('\n') as just a new line instead
> of as a Unix line feed. Because of this, output
> appears in a "stair case" pattern.
>
> Let's print \r\n on every occurrence of a new line
> in the string passed to write to amend this issue.
>
> This is in sync with the guest Linux code in
> drivers/s390/char/sclp_vt220.c which also does a line feed
> conversion in the console part of the driver.
>
> This fixes the s390-ccw and s390-netboot output like
> $ virsh start test --console
> Domain test started
> Connected to domain test
> Escape character is ^]
> Network boot starting...
> Using MAC address: 02:01:02:03:04:05
> Requesting information via DHCP: 010
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
> ---
> pc-bios/s390-ccw/sclp.c | 24 +++++++++++++++++++++---
> 1 file changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> index 486fce1..e6a0898 100644
> --- a/pc-bios/s390-ccw/sclp.c
> +++ b/pc-bios/s390-ccw/sclp.c
> @@ -68,17 +68,35 @@ void sclp_setup(void)
> long write(int fd, const void *str, size_t len)
> {
> WriteEventData *sccb = (void *)_sccb;
> + const char *p = str;
> + size_t data_len = 0;
> + size_t i;
>
> if (fd != 1 && fd != 2) {
> return -EIO;
> }
>
> - sccb->h.length = sizeof(WriteEventData) + len;
> + for (i = 0; i < len; i++) {
> + if ((data_len + 1) >= SCCB_DATA_LEN) {
> + /* We would overflow the sccb buffer, abort early */
> + len = i;
> + break;
> + }
> +
> + if (*p == '\n') {
> + /* Terminal emulators might need \r\n, so generate it */
> + sccb->data[data_len++] = '\r';
> + }
> +
> + sccb->data[data_len++] = *p;
> + p++;
> + }
> +
> + sccb->h.length = sizeof(WriteEventData) + data_len;
> sccb->h.function_code = SCLP_FC_NORMAL_WRITE;
> - sccb->ebh.length = sizeof(EventBufferHeader) + len;
> + sccb->ebh.length = sizeof(EventBufferHeader) + data_len;
> sccb->ebh.type = SCLP_EVENT_ASCII_CONSOLE_DATA;
> sccb->ebh.flags = 0;
> - memcpy(sccb->data, str, len);
>
> sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
>
Reviewed-by: Farhan Ali <alifm@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines
2017-10-27 16:14 [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines Collin L. Walling
2017-10-27 17:40 ` Halil Pasic
2017-10-27 20:25 ` Farhan Ali
@ 2017-10-28 6:58 ` Cornelia Huck
2017-10-29 1:58 ` Alexander Graf
2017-10-30 8:08 ` Christian Borntraeger
4 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2017-10-28 6:58 UTC (permalink / raw)
To: Collin L. Walling
Cc: borntraeger, thuth, bwalk, david, pmorel, qemu-devel, agraf,
pasic, jjherne, rth
On Fri, 27 Oct 2017 12:14:53 -0400
"Collin L. Walling" <walling@linux.vnet.ibm.com> wrote:
> The sclp console in the s390 bios writes raw data,
> leading console emulators (such as virsh console) to
> treat a new line ('\n') as just a new line instead
> of as a Unix line feed. Because of this, output
> appears in a "stair case" pattern.
>
> Let's print \r\n on every occurrence of a new line
> in the string passed to write to amend this issue.
>
> This is in sync with the guest Linux code in
> drivers/s390/char/sclp_vt220.c which also does a line feed
> conversion in the console part of the driver.
>
> This fixes the s390-ccw and s390-netboot output like
> $ virsh start test --console
> Domain test started
> Connected to domain test
> Escape character is ^]
> Network boot starting...
> Using MAC address: 02:01:02:03:04:05
> Requesting information via DHCP: 010
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
> ---
> pc-bios/s390-ccw/sclp.c | 24 +++++++++++++++++++++---
> 1 file changed, 21 insertions(+), 3 deletions(-)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines
2017-10-27 16:14 [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines Collin L. Walling
` (2 preceding siblings ...)
2017-10-28 6:58 ` Cornelia Huck
@ 2017-10-29 1:58 ` Alexander Graf
2017-10-30 8:08 ` Christian Borntraeger
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Graf @ 2017-10-29 1:58 UTC (permalink / raw)
To: Collin L. Walling, cohuck, borntraeger
Cc: thuth, bwalk, david, pmorel, qemu-devel, pasic, jjherne, rth
On 27.10.17 18:14, Collin L. Walling wrote:
> The sclp console in the s390 bios writes raw data,
> leading console emulators (such as virsh console) to
> treat a new line ('\n') as just a new line instead
> of as a Unix line feed. Because of this, output
> appears in a "stair case" pattern.
>
> Let's print \r\n on every occurrence of a new line
> in the string passed to write to amend this issue.
>
> This is in sync with the guest Linux code in
> drivers/s390/char/sclp_vt220.c which also does a line feed
> conversion in the console part of the driver.
>
> This fixes the s390-ccw and s390-netboot output like
> $ virsh start test --console
> Domain test started
> Connected to domain test
> Escape character is ^]
> Network boot starting...
> Using MAC address: 02:01:02:03:04:05
> Requesting information via DHCP: 010
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
> ---
> pc-bios/s390-ccw/sclp.c | 24 +++++++++++++++++++++---
> 1 file changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> index 486fce1..e6a0898 100644
> --- a/pc-bios/s390-ccw/sclp.c
> +++ b/pc-bios/s390-ccw/sclp.c
> @@ -68,17 +68,35 @@ void sclp_setup(void)
> long write(int fd, const void *str, size_t len)
> {
> WriteEventData *sccb = (void *)_sccb;
> + const char *p = str;
> + size_t data_len = 0;
> + size_t i;
>
> if (fd != 1 && fd != 2) {
> return -EIO;
> }
>
> - sccb->h.length = sizeof(WriteEventData) + len;
> + for (i = 0; i < len; i++) {
> + if ((data_len + 1) >= SCCB_DATA_LEN) {
> + /* We would overflow the sccb buffer, abort early */
> + len = i;
> + break;
> + }
> +
> + if (*p == '\n') {
> + /* Terminal emulators might need \r\n, so generate it */
> + sccb->data[data_len++] = '\r';
> + }
> +
> + sccb->data[data_len++] = *p;
> + p++;
I would probably replace this with str[i] to make it slightly more
readable, but that's just personal preference I think. The resulting
assembly should be identical with any recent compiler.
Reviewed-by: Alexander Graf <agraf@suse.de>
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines
2017-10-27 16:14 [Qemu-devel] [PATCH v4] s390-ccw: print carriage return with new lines Collin L. Walling
` (3 preceding siblings ...)
2017-10-29 1:58 ` Alexander Graf
@ 2017-10-30 8:08 ` Christian Borntraeger
4 siblings, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2017-10-30 8:08 UTC (permalink / raw)
To: Collin L. Walling, cohuck
Cc: thuth, bwalk, david, pmorel, qemu-devel, agraf, pasic, jjherne,
rth
On 10/27/2017 06:14 PM, Collin L. Walling wrote:
> The sclp console in the s390 bios writes raw data,
> leading console emulators (such as virsh console) to
> treat a new line ('\n') as just a new line instead
> of as a Unix line feed. Because of this, output
> appears in a "stair case" pattern.
>
> Let's print \r\n on every occurrence of a new line
> in the string passed to write to amend this issue.
>
> This is in sync with the guest Linux code in
> drivers/s390/char/sclp_vt220.c which also does a line feed
> conversion in the console part of the driver.
>
> This fixes the s390-ccw and s390-netboot output like
> $ virsh start test --console
> Domain test started
> Connected to domain test
> Escape character is ^]
> Network boot starting...
> Using MAC address: 02:01:02:03:04:05
> Requesting information via DHCP: 010
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
Thanks, applied.
^ permalink raw reply [flat|nested] 6+ messages in thread