Skip to contentSkip to conversation

Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)

PATCH In review Kevin Wolf 2 participants 2 messages Dec 4, 2009

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)

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.

---
 vl.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
vl.c +0 -4
index 96ab020..d6f196c 100644
@@ -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;
Signature · 1 line
1.6.2.5
#1 lore raw
Quoted 9 lines · 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.

Thanks.

Regards,

Anthony Liguori