From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: [kvm-unit-tests PATCH v1 5/6] s390x: wire up sclp console output Date: Fri, 12 May 2017 12:58:29 +0200 Message-ID: <20170512105830.10604-6-david@redhat.com> References: <20170512105830.10604-1-david@redhat.com> Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Thomas Huth , david@redhat.com, Christian Borntraeger , Cornelia Huck To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:49724 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932304AbdELK67 (ORCPT ); Fri, 12 May 2017 06:58:59 -0400 In-Reply-To: <20170512105830.10604-1-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Now the basics should be working and therefore the self test should pass. Signed-off-by: David Hildenbrand --- lib/s390x/io.c | 5 +++-- lib/s390x/sclp.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/s390x/io.c b/lib/s390x/io.c index a652124..067ecf7 100644 --- a/lib/s390x/io.c +++ b/lib/s390x/io.c @@ -12,6 +12,7 @@ */ #include #include +#include "sclp.h" extern void setup_args_progname(const char *args); extern char ipl_args[]; @@ -21,8 +22,7 @@ static struct spinlock lock; void puts(const char *s) { spin_lock(&lock); - /* FIXME */ - (void)s; + sclp_print(s); spin_unlock(&lock); } @@ -39,6 +39,7 @@ static void sigp_stop() void setup() { setup_args_progname(ipl_args); + sclp_setup(); } void exit(int code) diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h index c48cc21..3f4c138 100644 --- a/lib/s390x/sclp.h +++ b/lib/s390x/sclp.h @@ -102,4 +102,7 @@ typedef struct ReadEventData { uint32_t mask; } __attribute__((packed)) ReadEventData; +void sclp_setup(void); +void sclp_print(const char *str); + #endif /* SCLP_H */ -- 2.9.3