From patchwork Tue Apr 23 12:37:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 238901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7CCAC2C0186 for ; Tue, 23 Apr 2013 22:41:10 +1000 (EST) Received: from localhost ([::1]:54827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUcWy-0002IB-N0 for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 08:41:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUcUf-0007qV-Iy for qemu-devel@nongnu.org; Tue, 23 Apr 2013 08:38:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUcUe-0000sf-1d for qemu-devel@nongnu.org; Tue, 23 Apr 2013 08:38:45 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:50498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUcUd-0000sQ-Po for qemu-devel@nongnu.org; Tue, 23 Apr 2013 08:38:43 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Apr 2013 13:37:00 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 23 Apr 2013 13:36:58 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3C39217D8027 for ; Tue, 23 Apr 2013 13:38:28 +0100 (BST) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3NCbKci51052616 for ; Tue, 23 Apr 2013 12:37:20 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r3NCbTxU003743 for ; Tue, 23 Apr 2013 06:37:29 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3NCbNRP003471; Tue, 23 Apr 2013 06:37:28 -0600 From: Cornelia Huck To: Alexander Graf Date: Tue, 23 Apr 2013 14:37:13 +0200 Message-Id: <1366720634-13184-4-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1366720634-13184-1-git-send-email-cornelia.huck@de.ibm.com> References: <1366720634-13184-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13042312-4966-0000-0000-0000058AB738 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.106 Cc: Cornelia Huck , Christian Borntraeger , qemu-devel@nongnu.org, Dominik Dingel Subject: [Qemu-devel] [PATCH 3/4] s390-ccw.img: Rudimentary error checking. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Try to handle at least some of the errors that may happen. Signed-off-by: Cornelia Huck --- pc-bios/s390-ccw/virtio.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 2a132f8..8e37dce 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -90,7 +90,9 @@ static int run_ccw(struct subchannel_id schid, int cmd, void *ptr, int len) * assume that a simple tsch will have finished the CCW processing, * but the architecture allows for asynchronous operation */ - drain_irqs(schid); + if (!r) { + r = drain_irqs(schid); + } return r; } @@ -98,7 +100,9 @@ static void virtio_set_status(struct subchannel_id schid, unsigned long dev_addr) { unsigned char status = dev_addr; - run_ccw(schid, CCW_CMD_WRITE_STATUS, &status, sizeof(status)); + if (run_ccw(schid, CCW_CMD_WRITE_STATUS, &status, sizeof(status))) { + virtio_panic("Could not write status to host!\n"); + } } static void virtio_reset(struct subchannel_id schid) @@ -197,6 +201,7 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num) { struct virtio_blk_outhdr out_hdr; u8 status; + int r; /* Tell the host we want to read */ out_hdr.type = VIRTIO_BLK_T_IN; @@ -217,8 +222,11 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num) /* Now we can tell the host to read */ vring_wait_reply(&block, 0); - drain_irqs(block.schid); - + r = drain_irqs(block.schid); + if (r) { + /* Well, whatever status is supposed to contain... */ + status = 1; + } return status; } @@ -266,8 +274,9 @@ void virtio_setup_block(struct subchannel_id schid) info.num = 128; block.schid = schid; - run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info)); - virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK); + if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) { + virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK); + } } bool virtio_is_blk(struct subchannel_id schid)