[Qemu-devel] [FOR 0.12][PATCH] Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)

[Qemu-devel] [FOR 0.12][PATCH] Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)

[Kevin Wolf]

Part of the first patch of the -drive rerror series has been merged once more
on top of the rest of the series. This effectively disables the rerror option
and always goes with the default value. Reverting the commit re-enables the
option.

This reverts commit fc072ec4df0996682dfbff6c735e2bbc0d93132f.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 vl.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/vl.c b/vl.c
index 96ab020..d6f196c 100644
--- a/vl.c
+++ b/vl.c
@@ -1964,10 +1964,6 @@ BlockInterfaceErrorAction drive_get_on_error(
 {
     DriveInfo *dinfo;
 
-    if (is_read) {
-        return BLOCK_ERR_REPORT;
-    }
-
     QTAILQ_FOREACH(dinfo, &drives, next) {
         if (dinfo->bdrv == bdrv)
             return is_read ? dinfo->on_read_error : dinfo->on_write_error;
-- 
1.6.2.5

Re: [Qemu-devel] [FOR 0.12][PATCH] Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)

[Anthony Liguori]

Kevin Wolf wrote:
> Part of the first patch of the -drive rerror series has been merged once more
> on top of the rest of the series. This effectively disables the rerror option
> and always goes with the default value. Reverting the commit re-enables the
> option.
>
> This reverts commit fc072ec4df0996682dfbff6c735e2bbc0d93132f.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
>   

Thanks.

Regards,

Anthony Liguori