From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TENL0-0006TC-Pn for qemu-devel@nongnu.org; Wed, 19 Sep 2012 12:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TENKu-0005Qk-Rh for qemu-devel@nongnu.org; Wed, 19 Sep 2012 12:41:22 -0400 From: Stefan Weil Date: Wed, 19 Sep 2012 18:41:14 +0200 Message-Id: <1348072874-2096-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] pflash: Avoid warnings from coverity List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Stefan Weil hw/pflash_cfi01.c:209: check_return: Calling function "bdrv_write" without checking return value (as is done elsewhere 35 out of 37 times). hw/pflash_cfi02.c:144: unterminated_default: The default case is not terminated by a 'break' statement. hw/pflash_cfi02.c:238: check_return: Calling function "bdrv_write" without checking return value (as is done elsewhere 35 out of 37 times). Signed-off-by: Stefan Weil --- hw/pflash_cfi01.c | 6 ++++-- hw/pflash_cfi02.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 56ed33f..27ae4aa 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -205,8 +205,10 @@ static void pflash_update(pflash_t *pfl, int offset, /* round to sectors */ offset = offset >> 9; offset_end = (offset_end + 511) >> 9; - bdrv_write(pfl->bs, offset, pfl->storage + (offset << 9), - offset_end - offset); + if (bdrv_write(pfl->bs, offset, pfl->storage + (offset << 9), + offset_end - offset) == -1) { + fprintf(stderr, "pflash: Error writing to flash storage\n"); + } } } diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index 3e2002e..bca7d1b 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -147,6 +147,7 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset, DPRINTF("%s: unknown command state: %x\n", __func__, pfl->cmd); pfl->wcycle = 0; pfl->cmd = 0; + /* Fall through */ case 0x80: /* We accept reads during second unlock sequence... */ case 0x00: @@ -236,8 +237,10 @@ static void pflash_update(pflash_t *pfl, int offset, /* round to sectors */ offset = offset >> 9; offset_end = (offset_end + 511) >> 9; - bdrv_write(pfl->bs, offset, pfl->storage + (offset << 9), - offset_end - offset); + if (bdrv_write(pfl->bs, offset, pfl->storage + (offset << 9), + offset_end - offset) == -1) { + fprintf(stderr, "pflash: Error writing to flash storage\n"); + } } } -- 1.7.10