From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBZ-0000De-LQ for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobBV-00019m-J4 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:33 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:52264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBV-00019F-E1 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:29 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:07:50 +0200 Message-Id: <1312376904-16115-12-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/45] scsi-disk: Factor out scsi_disk_emulate_start_stop() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de Signed-off-by: Markus Armbruster --- hw/scsi-disk.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index fa198f9..d549cb7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -820,6 +820,18 @@ static int scsi_disk_emulate_read_toc(SCSIRequest *req, uint8_t *outbuf) return toclen; } +static void scsi_disk_emulate_start_stop(SCSIDiskReq *r) +{ + SCSIRequest *req = &r->req; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); + bool start = req->cmd.buf[4] & 1; + bool loej = req->cmd.buf[4] & 2; + + if (s->qdev.type == TYPE_ROM && loej) { + bdrv_eject(s->bs, !start); + } +} + static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) { SCSIRequest *req = &r->req; @@ -873,10 +885,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) goto illegal_request; break; case START_STOP: - if (s->qdev.type == TYPE_ROM && (req->cmd.buf[4] & 2)) { - /* load/eject medium */ - bdrv_eject(s->bs, !(req->cmd.buf[4] & 1)); - } + scsi_disk_emulate_start_stop(r); break; case ALLOW_MEDIUM_REMOVAL: bdrv_set_locked(s->bs, req->cmd.buf[4] & 1); -- 1.7.6