From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1CC1-0000sB-5m for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:05:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1CC0-000398-2n for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:05:05 -0400 Received: from mail-vw0-f53.google.com ([209.85.212.53]:47066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1CBz-00038z-UH for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:05:04 -0400 Received: by vws13 with SMTP id 13so6045123vws.12 for ; Wed, 07 Sep 2011 00:05:03 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <4E67179A.7050902@redhat.com> Date: Wed, 07 Sep 2011 09:04:58 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1315328340-6192-1-git-send-email-armbru@redhat.com> <1315328340-6192-7-git-send-email-armbru@redhat.com> In-Reply-To: <1315328340-6192-7-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 06/27] scsi-disk: Factor out scsi_disk_emulate_start_stop() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, stefano.stabellini@eu.citrix.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de On 09/06/2011 06:58 PM, Markus Armbruster wrote: > 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 9724d0f..c8ad2e7 100644 > --- a/hw/scsi-disk.c > +++ b/hw/scsi-disk.c > @@ -814,6 +814,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; /* load on start, eject on !start */ > + > + 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; > @@ -859,10 +871,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); Reviewed-by: Paolo Bonzini