* [Qemu-devel] [RFC 0/3]: QMP: Introduce BLOCK_MEDIA_EJECT event
@ 2011-01-12 18:22 Luiz Capitulino
2011-01-12 18:22 ` [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() Luiz Capitulino
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Luiz Capitulino @ 2011-01-12 18:22 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, aliguori, armbru
Not very well tested, but I'm sending for early review.
Please, check individual patches for details. The event spec can be found
in patch 0/2.
QMP/qmp-events.txt | 15 +++++++++++++++
block.c | 16 ++++++++++++++--
block.h | 5 +++--
blockdev.c | 5 +++++
hw/ide/core.c | 6 +++---
hw/scsi-disk.c | 6 +++---
hw/virtio-blk.c | 6 +++---
monitor.c | 3 +++
monitor.h | 1 +
9 files changed, 50 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() 2011-01-12 18:22 [Qemu-devel] [RFC 0/3]: QMP: Introduce BLOCK_MEDIA_EJECT event Luiz Capitulino @ 2011-01-12 18:22 ` Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 2/3] QMP: Documentation for the BLOCK_MEDIA_EJECT event Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 3/3] QMP: Introduce " Luiz Capitulino 2 siblings, 0 replies; 5+ messages in thread From: Luiz Capitulino @ 2011-01-12 18:22 UTC (permalink / raw) To: qemu-devel; +Cc: kwolf, aliguori, armbru 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 <lcapitulino@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/3] QMP: Documentation for the BLOCK_MEDIA_EJECT event 2011-01-12 18:22 [Qemu-devel] [RFC 0/3]: QMP: Introduce BLOCK_MEDIA_EJECT event Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() Luiz Capitulino @ 2011-01-12 18:22 ` Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 3/3] QMP: Introduce " Luiz Capitulino 2 siblings, 0 replies; 5+ messages in thread From: Luiz Capitulino @ 2011-01-12 18:22 UTC (permalink / raw) To: qemu-devel; +Cc: kwolf, aliguori, armbru Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- QMP/qmp-events.txt | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 0ce5d4e..d13b17a 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -1,6 +1,21 @@ QEMU Monitor Protocol Events ============================ +BLOCK_MEDIA_EJECT +----------------- + +Emitted when a disk media (such as a CDROM or floppy) is ejected. + +Data: + +- "device": device name (json-string) + +Example: + +{ "event": "BLOCK_MEDIA_EJECT", + "data": { "device": "ide1-cd0" }, + "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } + BLOCK_IO_ERROR -------------- -- 1.7.4.rc1.14.g7fad99 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 3/3] QMP: Introduce the BLOCK_MEDIA_EJECT event 2011-01-12 18:22 [Qemu-devel] [RFC 0/3]: QMP: Introduce BLOCK_MEDIA_EJECT event Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 2/3] QMP: Documentation for the BLOCK_MEDIA_EJECT event Luiz Capitulino @ 2011-01-12 18:22 ` Luiz Capitulino 2 siblings, 0 replies; 5+ messages in thread From: Luiz Capitulino @ 2011-01-12 18:22 UTC (permalink / raw) To: qemu-devel; +Cc: kwolf, aliguori, armbru Conforms to the event specification defined in the QMP/qmp-events.txt file. Please, note the following (very important) details: o The event should be emitted only by devices which support the eject operation, which (afaik) are: CDROMs (IDE and SCSI) and floppies o Human monitor commands "eject" and "change" also cause the event to be emitted o The event is only emitted when there's a tray transition from closed to opened. To implement this in the human monitor, we only emit the event if the device is removable and a media is present Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- block.c | 12 ++++++++++++ block.h | 1 + blockdev.c | 5 +++++ monitor.c | 3 +++ monitor.h | 1 + 5 files changed, 22 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 5de7559..4b87a60 100644 --- a/block.c +++ b/block.c @@ -1553,6 +1553,15 @@ 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_eject_mon_event(const BlockDriverState *bdrv) +{ + QObject *data; + + data = qobject_from_jsonf("{ 'device': %s }", bdrv->device_name); + monitor_protocol_event(QEVENT_BLOCK_MEDIA_EJECT, data); + qobject_decref(data); +} + void bdrv_error_mon_event(const BlockDriverState *bdrv, BlockMonEventAction action, int is_read) { @@ -2671,6 +2680,9 @@ int bdrv_eject(BlockDriverState *bs, int eject_flag) ret = 0; } if (ret >= 0) { + if (eject_flag && !bs->tray_open) { + bdrv_eject_mon_event(bs); + } bs->tray_open = eject_flag; } diff --git a/block.h b/block.h index 4874b85..bf5c1b2 100644 --- a/block.h +++ b/block.h @@ -50,6 +50,7 @@ typedef enum { BDRV_ACTION_REPORT, BDRV_ACTION_IGNORE, BDRV_ACTION_STOP } BlockMonEventAction; +void bdrv_eject_mon_event(const BlockDriverState *bdrv); void bdrv_error_mon_event(const BlockDriverState *bdrv, BlockMonEventAction action, int is_read); void bdrv_info_print(Monitor *mon, const QObject *data); diff --git a/blockdev.c b/blockdev.c index d7add36..4d7ce9b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -591,6 +591,11 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force) return -1; } } + + if (bdrv_is_removable(bs) && bdrv_is_inserted(bs)) { + bdrv_eject_mon_event(bs); + } + bdrv_close(bs); return 0; } diff --git a/monitor.c b/monitor.c index f258000..bf50cc4 100644 --- a/monitor.c +++ b/monitor.c @@ -450,6 +450,9 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) case QEVENT_VNC_DISCONNECTED: event_name = "VNC_DISCONNECTED"; break; + case QEVENT_BLOCK_MEDIA_EJECT: + event_name = "BLOCK_MEDIA_EJECT"; + break; case QEVENT_BLOCK_IO_ERROR: event_name = "BLOCK_IO_ERROR"; break; diff --git a/monitor.h b/monitor.h index 4f2d328..7a04137 100644 --- a/monitor.h +++ b/monitor.h @@ -29,6 +29,7 @@ typedef enum MonitorEvent { QEVENT_VNC_CONNECTED, QEVENT_VNC_INITIALIZED, QEVENT_VNC_DISCONNECTED, + QEVENT_BLOCK_MEDIA_EJECT, QEVENT_BLOCK_IO_ERROR, QEVENT_RTC_CHANGE, QEVENT_WATCHDOG, -- 1.7.4.rc1.14.g7fad99 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 0/3]: QMP: Introduce the BLOCK_MEDIA_EJECT event @ 2011-05-27 19:31 Luiz Capitulino 2011-05-27 19:31 ` [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() Luiz Capitulino 0 siblings, 1 reply; 5+ messages in thread From: Luiz Capitulino @ 2011-05-27 19:31 UTC (permalink / raw) To: qemu-devel; +Cc: kwolf, amit.shah, aliguori, armbru The motivation for this event is that clients can get confused if removable media is ejected by the guest (or by a human user). You'll find detailed documentation in patch 2/3 and the actual implementation in patch 3/3. Thanks. QMP/qmp-events.txt | 18 ++++++++++++++++++ block.c | 16 ++++++++++++++-- block.h | 5 +++-- blockdev.c | 5 +++++ hw/ide/core.c | 6 +++--- hw/scsi-disk.c | 6 +++--- hw/virtio-blk.c | 6 +++--- monitor.c | 3 +++ monitor.h | 1 + 9 files changed, 53 insertions(+), 13 deletions(-) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() 2011-05-27 19:31 [Qemu-devel] [PATCH 0/3]: " Luiz Capitulino @ 2011-05-27 19:31 ` Luiz Capitulino 0 siblings, 0 replies; 5+ messages in thread From: Luiz Capitulino @ 2011-05-27 19:31 UTC (permalink / raw) To: qemu-devel; +Cc: kwolf, amit.shah, aliguori, armbru Rename it to bdrv_error_mon_event() in order to better communicate its purpose. Signed-off-by: Luiz Capitulino <lcapitulino@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 effa86f..f5014cf 100644 --- a/block.c +++ b/block.c @@ -1656,8 +1656,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 da7d39c..1f58eab 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 45410e8..96c153e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -440,7 +440,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; } @@ -448,7 +448,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(VMSTOP_DISKFULL); } else { if (op & BM_STATUS_DMA_RETRY) { @@ -457,7 +457,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 397b9d6..687d34c 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -231,7 +231,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; } @@ -241,7 +241,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(VMSTOP_DISKFULL); } else { if (type == SCSI_REQ_STATUS_RETRY_READ) { @@ -249,7 +249,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 91e0394..99db00a 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(VMSTOP_DISKFULL); } 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.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-05-27 19:32 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-01-12 18:22 [Qemu-devel] [RFC 0/3]: QMP: Introduce BLOCK_MEDIA_EJECT event Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 2/3] QMP: Documentation for the BLOCK_MEDIA_EJECT event Luiz Capitulino 2011-01-12 18:22 ` [Qemu-devel] [PATCH 3/3] QMP: Introduce " Luiz Capitulino -- strict thread matches above, loose matches on Subject: below -- 2011-05-27 19:31 [Qemu-devel] [PATCH 0/3]: " Luiz Capitulino 2011-05-27 19:31 ` [Qemu-devel] [PATCH 1/3] block: Rename bdrv_mon_event() Luiz Capitulino
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).