提交 75f12475 编写于 作者: K Kevin Wolf 提交者: Anthony Liguori

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 fc072ec4.
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 40a0d7c3
...@@ -2044,10 +2044,6 @@ BlockInterfaceErrorAction drive_get_on_error( ...@@ -2044,10 +2044,6 @@ BlockInterfaceErrorAction drive_get_on_error(
{ {
DriveInfo *dinfo; DriveInfo *dinfo;
if (is_read) {
return BLOCK_ERR_REPORT;
}
QTAILQ_FOREACH(dinfo, &drives, next) { QTAILQ_FOREACH(dinfo, &drives, next) {
if (dinfo->bdrv == bdrv) if (dinfo->bdrv == bdrv)
return is_read ? dinfo->on_read_error : dinfo->on_write_error; return is_read ? dinfo->on_read_error : dinfo->on_write_error;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册