On 08/18/2015 01:42 AM, Alexander Bezzubikov wrote:
> Signed-off-by: Alexander Bezzubikov <abezzubi...@ispras.ru>
> ---
> hw/ide/atapi.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
> index 6e73910..896f595 100644
> --- a/hw/ide/atapi.c
> +++ b/hw/ide/atapi.c
> @@ -1230,7 +1230,8 @@ void ide_atapi_cmd(IDEState *s)
> * states rely on this behavior.
> */
> if (!(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA) &&
> - !s->tray_open && blk_is_inserted(s->blk) && s->cdrom_changed) {
> + (s->drive_kind != IDE_BRIDGE && !s->tray_open &&
> + blk_is_inserted(s->blk) && s->cdrom_changed)) {
>
> if (s->cdrom_changed == 1) {
> ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT);
> @@ -1245,18 +1246,13 @@ void ide_atapi_cmd(IDEState *s)
>
> /* Report a Not Ready condition if appropriate for the command */
> if ((atapi_cmd_table[s->io_buffer[0]].flags & CHECK_READY) &&
> - (!media_present(s) || !blk_is_inserted(s->blk)))
> + (s->drive_kind != IDE_BRIDGE &&
> + (!media_present(s) || !blk_is_inserted(s->blk))))
> {
> ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT);
> return;
> }
>
> - /* Execute the command */
> - if (atapi_cmd_table[s->io_buffer[0]].handler) {
> - atapi_cmd_table[s->io_buffer[0]].handler(s, buf);
> - return;
> - }
> -
> if (s->drive_kind == IDE_BRIDGE) {
> IDEDevice *dev = s->bus->master;
> SCSIDevice *scsi_dev = scsi_device_find(&dev->scsi_bus, 0, 0, 0);
> @@ -1273,5 +1269,11 @@ void ide_atapi_cmd(IDEState *s)
> return;
> }
>
> + /* Execute the command */
> + if (atapi_cmd_table[s->io_buffer[0]].handler) {
> + atapi_cmd_table[s->io_buffer[0]].handler(s, buf);
> + return;
> + }
> +
> ide_atapi_cmd_error(s, ILLEGAL_REQUEST, ASC_ILLEGAL_OPCODE);
> }
>
Please merge it with patch 3.
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
h...@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
