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

ide: call ide_cmd_done from ide_transfer_stop 



The code can simply be moved to the sole caller that has notify == true.

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-5-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent bed9bcfa

hw/ide/core.c

+4 −7
Original line number Diff line number Diff line
@@ -548,26 +548,23 @@ static void ide_cmd_done(IDEState *s) 
}



static void ide_transfer_halt(IDEState *s,

                              void(*end_transfer_func)(IDEState *),

                              bool notify)

                              void(*end_transfer_func)(IDEState *))

{

    s->end_transfer_func = end_transfer_func;

    s->data_ptr = s->io_buffer;

    s->data_end = s->io_buffer;

    s->status &= ~DRQ_STAT;

    if (notify) {

        ide_cmd_done(s);

    }

}



void ide_transfer_stop(IDEState *s)

{

    ide_transfer_halt(s, ide_transfer_stop, true);

    ide_transfer_halt(s, ide_transfer_stop);

    ide_cmd_done(s);

}



static void ide_transfer_cancel(IDEState *s)

{

    ide_transfer_halt(s, ide_transfer_cancel, false);

    ide_transfer_halt(s, ide_transfer_cancel);

}



int64_t ide_get_sector(IDEState *s)