| Submitter | Markus Armbruster |
|---|---|
| Date | Sept. 6, 2011, 4:58 p.m. |
| Message ID | <1315328340-6192-8-git-send-email-armbru@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/113629/ |
| State | New |
| Headers | show |
Comments
On 09/06/2011 06:58 PM, Markus Armbruster wrote: > We already track it in BlockDriverState since commit 4be9762a. As > discussed in that commit's message, we should track it in the device > device models instead, because it's device state. > > Signed-off-by: Markus Armbruster<armbru@redhat.com> > --- > hw/scsi-disk.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c > index c8ad2e7..f18ddd7 100644 > --- a/hw/scsi-disk.c > +++ b/hw/scsi-disk.c > @@ -72,6 +72,7 @@ struct SCSIDiskState > QEMUBH *bh; > char *version; > char *serial; > + bool tray_open; > }; > > static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); > @@ -823,6 +824,7 @@ static void scsi_disk_emulate_start_stop(SCSIDiskReq *r) > > if (s->qdev.type == TYPE_ROM&& loej) { > bdrv_eject(s->bs, !start); > + s->tray_open = !start; > } > } > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Patch
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index c8ad2e7..f18ddd7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -72,6 +72,7 @@ struct SCSIDiskState QEMUBH *bh; char *version; char *serial; + bool tray_open; }; static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); @@ -823,6 +824,7 @@ static void scsi_disk_emulate_start_stop(SCSIDiskReq *r) if (s->qdev.type == TYPE_ROM && loej) { bdrv_eject(s->bs, !start); + s->tray_open = !start; } }
We already track it in BlockDriverState since commit 4be9762a. As discussed in that commit's message, we should track it in the device device models instead, because it's device state. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/scsi-disk.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)