OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Rename DriveInfo.onerror to on_write_error 

Either rename variables and functions to refer to write errors (which is what
they actually do) or introduce a parameter to distinguish reads and writes.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Kevin Wolf 2009-11-27 13:25:36 +01:00 committed by Anthony Liguori
parent 843079386e
commit f785009961
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ide/core.c
View File

@ -473,7 +473,7 @@ void ide_dma_error(IDEState *s)
static int ide_handle_write_error(IDEState *s, int error, int op)
{
BlockInterfaceErrorAction action = drive_get_onerror(s->bs);
BlockInterfaceErrorAction action = drive_get_on_error(s->bs, 0);
if (action == BLOCK_ERR_IGNORE)
return 0;

3
hw/scsi-disk.c
View File

@ -172,7 +172,8 @@ static void scsi_read_data(SCSIDevice *d, uint32_t tag)
static int scsi_handle_write_error(SCSIDiskReq *r, int error)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
BlockInterfaceErrorAction action = drive_get_onerror(s->qdev.dinfo->bdrv);
BlockInterfaceErrorAction action =
drive_get_on_error(s->qdev.dinfo->bdrv, 0);
if (action == BLOCK_ERR_IGNORE)
return 0;

2
hw/virtio-blk.c
View File

@ -100,7 +100,7 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req, int status)
static int virtio_blk_handle_write_error(VirtIOBlockReq *req, int error)
{
BlockInterfaceErrorAction action = drive_get_onerror(req->dev->bs);
BlockInterfaceErrorAction action = drive_get_on_error(req->dev->bs, 0);
VirtIOBlock *s = req->dev;
if (action == BLOCK_ERR_IGNORE)

6
sysemu.h
View File

@ -180,7 +180,7 @@ typedef struct DriveInfo {
int bus;
int unit;
QemuOpts *opts;
BlockInterfaceErrorAction onerror;
BlockInterfaceErrorAction on_write_error;
char serial[BLOCK_SERIAL_STRLEN + 1];
QTAILQ_ENTRY(DriveInfo) next;
} DriveInfo;
@ -197,7 +197,9 @@ extern DriveInfo *drive_get_by_id(const char *id);
extern int drive_get_max_bus(BlockInterfaceType type);
extern void drive_uninit(DriveInfo *dinfo);
extern const char *drive_get_serial(BlockDriverState *bdrv);
extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);
extern BlockInterfaceErrorAction drive_get_on_error(
BlockDriverState *bdrv, int is_read);
BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type);

11
vl.c
View File

@ -1959,13 +1959,18 @@ const char *drive_get_serial(BlockDriverState *bdrv)
return "\0";
}
BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv)
BlockInterfaceErrorAction drive_get_on_error(
BlockDriverState *bdrv, int is_read)
{
DriveInfo *dinfo;
if (is_read) {
return BLOCK_ERR_REPORT;
}
QTAILQ_FOREACH(dinfo, &drives, next) {
if (dinfo->bdrv == bdrv)
return dinfo->onerror;
return dinfo->on_write_error;
}
return BLOCK_ERR_STOP_ENOSPC;
@ -2263,7 +2268,7 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque,
dinfo->type = type;
dinfo->bus = bus_id;
dinfo->unit = unit_id;
dinfo->onerror = onerror;
dinfo->on_write_error = onerror;
dinfo->opts = opts;
if (serial)
strncpy(dinfo->serial, serial, sizeof(serial));