From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jj-00013z-VY for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37Jh-0006to-N6 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jg-0006sG-Nb for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:57 -0400 From: Kevin Wolf Date: Mon, 12 Sep 2011 16:19:12 +0200 Message-Id: <1315837174-15327-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 13/35] block: Leave enforcing tray lock to device models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster The device model knows best when to accept the guest's eject command. No need to detour through the block layer. bdrv_eject() can't fail anymore. Make it void. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 7 +------ block.h | 2 +- hw/ide/atapi.c | 29 +++++++++-------------------- hw/scsi-disk.c | 3 +++ 4 files changed, 14 insertions(+), 27 deletions(-) diff --git a/block.c b/block.c index 8c86251..7408fa9 100644 --- a/block.c +++ b/block.c @@ -3051,18 +3051,13 @@ int bdrv_media_changed(BlockDriverState *bs) /** * If eject_flag is TRUE, eject the media. Otherwise, close the tray */ -int bdrv_eject(BlockDriverState *bs, int eject_flag) +void bdrv_eject(BlockDriverState *bs, int eject_flag) { BlockDriver *drv = bs->drv; - if (eject_flag && bs->locked) { - return -EBUSY; - } - if (drv && drv->bdrv_eject) { drv->bdrv_eject(bs, eject_flag); } - return 0; } int bdrv_is_locked(BlockDriverState *bs) diff --git a/block.h b/block.h index 8ec409f..5d941e9 100644 --- a/block.h +++ b/block.h @@ -208,7 +208,7 @@ int bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); int bdrv_is_locked(BlockDriverState *bs); void bdrv_set_locked(BlockDriverState *bs, int locked); -int bdrv_eject(BlockDriverState *bs, int eject_flag); +void bdrv_eject(BlockDriverState *bs, int eject_flag); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_next(BlockDriverState *bs); diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index d9db6de..afb27c6 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -905,33 +905,22 @@ static void cmd_seek(IDEState *s, uint8_t* buf) static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) { - int sense, err = 0; + int sense; bool start = buf[4] & 1; bool loej = buf[4] & 2; /* load on start, eject on !start */ if (loej) { - err = bdrv_eject(s->bs, !start); - } - - switch (err) { - case 0: - ide_atapi_cmd_ok(s); - break; - case -EBUSY: - sense = SENSE_NOT_READY; - if (bdrv_is_inserted(s->bs)) { - sense = SENSE_ILLEGAL_REQUEST; + if (!start && s->tray_locked) { + sense = bdrv_is_inserted(s->bs) + ? SENSE_NOT_READY : SENSE_ILLEGAL_REQUEST; + ide_atapi_cmd_error(s, sense, ASC_MEDIA_REMOVAL_PREVENTED); + return; } - ide_atapi_cmd_error(s, sense, ASC_MEDIA_REMOVAL_PREVENTED); - break; - default: - ide_atapi_cmd_error(s, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT); - break; - } - - if (loej && !err) { + bdrv_eject(s->bs, !start); s->tray_open = !start; } + + ide_atapi_cmd_ok(s); } static void cmd_mechanism_status(IDEState *s, uint8_t* buf) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index e7358e3..65783a7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -830,6 +830,9 @@ static void scsi_disk_emulate_start_stop(SCSIDiskReq *r) bool loej = req->cmd.buf[4] & 2; /* load on start, eject on !start */ if (s->qdev.type == TYPE_ROM && loej) { + if (!start && s->tray_locked) { + return; + } bdrv_eject(s->bs, !start); s->tray_open = !start; } -- 1.7.6