Instead let the SCSI layer invoke the .cancel callback itself to cancel and reset the request state.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Tested-by: Alexander Bulekov <alx...@bu.edu> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Message-Id: <20210407195801.685-11-mark.cave-ayl...@ilande.co.uk> --- hw/scsi/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index a26a109166..0037197bdb 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -95,6 +95,7 @@ void esp_request_cancelled(SCSIRequest *req) scsi_req_unref(s->current_req); s->current_req = NULL; s->current_dev = NULL; + s->async_len = 0; } } @@ -206,7 +207,6 @@ static int esp_select(ESPState *s) if (s->current_req) { /* Started a new command before the old one finished. Cancel it. */ scsi_req_cancel(s->current_req); - s->async_len = 0; } s->current_dev = scsi_device_find(&s->bus, 0, target, 0); -- 2.20.1