falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 fc072ec4df.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 75f1247539)
This commit is contained in:
Kevin Wolf 2009-12-04 12:06:32 +01:00 committed by Anthony Liguori
parent 73b4ac5cd8
commit bed93b1dcb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vl.c
View File

@ -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;