It's too generic and next commits will add a new event, rename it
to bdrv_error_mon_event() then.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
---
block.c | 4 ++--
block.h | 4 ++--
hw/ide/core.c | 6 +++---
hw/scsi-disk.c | 6 +++---
hw/virtio-blk.c | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/block.c b/block.c
index ff2795b..5de7559 100644
--- a/block.c
+++ b/block.c
@@ -1553,8 +1553,8 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t
sector_num, int nb_sectors,
return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum);
}
-void bdrv_mon_event(const BlockDriverState *bdrv,
- BlockMonEventAction action, int is_read)
+void bdrv_error_mon_event(const BlockDriverState *bdrv,
+ BlockMonEventAction action, int is_read)
{
QObject *data;
const char *action_str;
diff --git a/block.h b/block.h
index f923add..4874b85 100644
--- a/block.h
+++ b/block.h
@@ -50,8 +50,8 @@ typedef enum {
BDRV_ACTION_REPORT, BDRV_ACTION_IGNORE, BDRV_ACTION_STOP
} BlockMonEventAction;
-void bdrv_mon_event(const BlockDriverState *bdrv,
- BlockMonEventAction action, int is_read);
+void bdrv_error_mon_event(const BlockDriverState *bdrv,
+ BlockMonEventAction action, int is_read);
void bdrv_info_print(Monitor *mon, const QObject *data);
void bdrv_info(Monitor *mon, QObject **ret_data);
void bdrv_stats_print(Monitor *mon, const QObject *data);
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 9496e99..2441a06 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -464,7 +464,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int
op)
BlockErrorAction action = bdrv_get_on_error(s->bs, is_read);
if (action == BLOCK_ERR_IGNORE) {
- bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
return 0;
}
@@ -472,7 +472,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int
op)
|| action == BLOCK_ERR_STOP_ANY) {
s->bus->dma->ops->set_unit(s->bus->dma, s->unit);
s->bus->dma->ops->add_status(s->bus->dma, op);
- bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
vm_stop(0);
} else {
if (op & BM_STATUS_DMA_RETRY) {
@@ -481,7 +481,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int
op)
} else {
ide_rw_error(s);
}
- bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
}
return 1;
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 6cb317c..0d0cd72 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -227,7 +227,7 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error,
int type)
BlockErrorAction action = bdrv_get_on_error(s->bs, is_read);
if (action == BLOCK_ERR_IGNORE) {
- bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
return 0;
}
@@ -237,7 +237,7 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error,
int type)
type &= SCSI_REQ_STATUS_RETRY_TYPE_MASK;
r->status |= SCSI_REQ_STATUS_RETRY | type;
- bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
vm_stop(0);
} else {
if (type == SCSI_REQ_STATUS_RETRY_READ) {
@@ -245,7 +245,7 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error,
int type)
}
scsi_command_complete(r, CHECK_CONDITION,
HARDWARE_ERROR);
- bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
}
return 1;
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index f62ccd1..8210902 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -69,7 +69,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req,
int error,
VirtIOBlock *s = req->dev;
if (action == BLOCK_ERR_IGNORE) {
- bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read);
return 0;
}
@@ -77,11 +77,11 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req,
int error,
|| action == BLOCK_ERR_STOP_ANY) {
req->next = s->rq;
s->rq = req;
- bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_STOP, is_read);
vm_stop(0);
} else {
virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);
- bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
+ bdrv_error_mon_event(s->bs, BDRV_ACTION_REPORT, is_read);
}
return 1;
--
1.7.4.rc1.14.g7fad99
