Commit d02cea64 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by John Snow
Browse files

atapi: call ide_set_irq before ide_transfer_start 



The ATAPI_INT_REASON_IO interrupt is raised when I/O starts, but in the
AHCI case ide_set_irq was actually called at the end of a mutual recursion.
Move it early, with the side effect that ide_transfer_start becomes a tail
call in ide_atapi_cmd_reply_end.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180606190955.20845-7-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 882941a5

hw/ide/atapi.c

+2 −2
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ void ide_atapi_cmd_reply_end(IDEState *s) 
        } else {

            /* a new transfer is needed */

            s->nsector = (s->nsector & ~7) | ATAPI_INT_REASON_IO;

            ide_set_irq(s->bus);

            byte_count_limit = atapi_byte_count_limit(s);

            trace_ide_atapi_cmd_reply_end_bcl(s, byte_count_limit);

            size = s->packet_transfer_size;
@@ -304,13 +305,12 @@ void ide_atapi_cmd_reply_end(IDEState *s) 
                if (size > (s->cd_sector_size - s->io_buffer_index))

                    size = (s->cd_sector_size - s->io_buffer_index);

            }

            trace_ide_atapi_cmd_reply_end_new(s, s->status);

            s->packet_transfer_size -= size;

            s->elementary_transfer_size -= size;

            s->io_buffer_index += size;

            ide_transfer_start(s, s->io_buffer + s->io_buffer_index - size,

                               size, ide_atapi_cmd_reply_end);

            ide_set_irq(s->bus);

            trace_ide_atapi_cmd_reply_end_new(s, s->status);

        }

    }

}