david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: call ide_cmd_done from ide_transfer_stop

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180606190955.20845-5-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-06-06 15:09:52 -04:00 committed by John Snow
parent bed9bcfa32
commit ee4cd662ad
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ide/core.c
View File

@ -548,26 +548,23 @@ static void ide_cmd_done(IDEState *s)
} }
static void ide_transfer_halt(IDEState *s, static void ide_transfer_halt(IDEState *s,
void(*end_transfer_func)(IDEState *), void(*end_transfer_func)(IDEState *))
bool notify)
{ {
s->end_transfer_func = end_transfer_func; s->end_transfer_func = end_transfer_func;
s->data_ptr = s->io_buffer; s->data_ptr = s->io_buffer;
s->data_end = s->io_buffer; s->data_end = s->io_buffer;
s->status &= ~DRQ_STAT; s->status &= ~DRQ_STAT;
if (notify) {
ide_cmd_done(s);
}
} }
void ide_transfer_stop(IDEState *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) 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) int64_t ide_get_sector(IDEState *s)