qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: aurelien@aurel32.net
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [STABLE][PATCH 09/10] qcow2: Don't ignore immediate read/write failures
Date: Fri,  9 Apr 2010 11:46:27 +0200	[thread overview]
Message-ID: <1270806388-28138-10-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1270806388-28138-1-git-send-email-kwolf@redhat.com>

Returning -EIO is far from optimal, but at least it's an error code.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index 4ae8f19..f6f8980 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -467,8 +467,10 @@ static void qcow_aio_read_cb(void *opaque, int ret)
         acb->hd_aiocb = bdrv_aio_readv(s->hd,
                             (acb->cluster_offset >> 9) + index_in_cluster,
                             &acb->hd_qiov, acb->n, qcow_aio_read_cb, acb);
-        if (acb->hd_aiocb == NULL)
+        if (acb->hd_aiocb == NULL) {
+            ret = -EIO;
             goto done;
+        }
     }
 
     return;
@@ -620,8 +622,10 @@ static void qcow_aio_write_cb(void *opaque, int ret)
                                     (acb->cluster_offset >> 9) + index_in_cluster,
                                     &acb->hd_qiov, acb->n,
                                     qcow_aio_write_cb, acb);
-    if (acb->hd_aiocb == NULL)
+    if (acb->hd_aiocb == NULL) {
+        ret = -EIO;
         goto done;
+    }
 
     return;
 
-- 
1.6.6.1

  parent reply	other threads:[~2010-04-09  9:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-09  9:46 [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4 Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 01/10] json-parser: Fix segfault on malformed input Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 02/10] block: avoid creating too large iovecs in multiwrite_merge Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 03/10] qcow2: Factor next_refcount_table_size out Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 04/10] qcow2: Rewrite alloc_refcount_block/grow_refcount_table Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 05/10] scsi-disk: fix buffer overflow Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 06/10] block: Fix multiwrite error handling Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 07/10] block: Fix error code in multiwrite for immediate failures Kevin Wolf
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 08/10] block: Fix multiwrite memory leak in error case Kevin Wolf
2010-04-09  9:46 ` Kevin Wolf [this message]
2010-04-09  9:46 ` [Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight list after error Kevin Wolf
2010-04-09 16:47 ` [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4 Aurelien Jarno

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270806388-28138-10-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=aurelien@aurel32.net \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).