commit 7ce21016b69b512bf4777965a4292318f2bc7544
author Paolo Bonzini <pbonzini@redhat.com> Fri Nov 22 13:39:47 2013 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Tue Dec 03 15:26:49 2013 +0100
tree 5f79714c6bdb5996906ab6e8ebdbf262621e8d92
parent d5ef94d43da8c57a2d597efbdec3d9a54d97fdf7

block: handle ENOTSUP from discard in generic code

Similar to write_zeroes, let the generic code receive a ENOTSUP for
discard operations.  Since bdrv_discard has advisory semantics,
we can just swallow the error.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

block.c

diff --git a/block.c b/block.c
index c491edf..9818052 100644
--- a/block.c
+++ b/block.c
@@ -4376,7 +4376,7 @@
                 ret = co.ret;
             }
         }
-        if (ret) {
+        if (ret && ret != -ENOTSUP) {
             return ret;
         }