From patchwork Thu May 18 11:34:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 9733789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 466C8601C8 for ; Thu, 18 May 2017 11:35:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34EDC2874A for ; Thu, 18 May 2017 11:35:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27F662874F; Thu, 18 May 2017 11:35:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC1F72874A for ; Thu, 18 May 2017 11:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933665AbdERLfB (ORCPT ); Thu, 18 May 2017 07:35:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53678 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933860AbdERLen (ORCPT ); Thu, 18 May 2017 07:34:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EE1A5804F8; Thu, 18 May 2017 11:34:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EE1A5804F8 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=david@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EE1A5804F8 Received: from t460s.redhat.com (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49ED519CA0; Thu, 18 May 2017 11:34:41 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Thomas Huth , david@redhat.com, Christian Borntraeger , Cornelia Huck Subject: [kvm-unit-tests PATCH v2 5/6] s390x: wire up sclp console output Date: Thu, 18 May 2017 13:34:26 +0200 Message-Id: <20170518113427.18387-6-david@redhat.com> In-Reply-To: <20170518113427.18387-1-david@redhat.com> References: <20170518113427.18387-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 18 May 2017 11:34:43 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now the basics should be working and therefore the self test should pass. Signed-off-by: David Hildenbrand Reviewed-by: Thomas Huth --- 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 */