From: Mark Cave-Ayland Date: Fri, 12 Jan 2024 12:52:54 +0000 (+0000) Subject: esp.c: move existing request cancel check into esp_select() X-Git-Tag: pull-vmclock-20250108~471^2~86 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf40a5e42084e157e1cd7bed2619f3b44fbb3fe8;p=users%2Fdwmw2%2Fqemu.git esp.c: move existing request cancel check into esp_select() Since get_cmd() can be called multiple times during a mixed FIFO/DMA request, move the existing request cancel check into esp_select() which always occurs at the start of new SCSI request. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-3-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 68d07edc05..b382865426 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -209,6 +209,11 @@ static int esp_select(ESPState *s) s->ti_size = 0; fifo8_reset(&s->fifo); + if (s->current_req) { + /* Started a new command before the old one finished. Cancel it. */ + scsi_req_cancel(s->current_req); + } + s->current_dev = scsi_device_find(&s->bus, 0, target, 0); if (!s->current_dev) { /* No such drive */ @@ -235,11 +240,6 @@ static uint32_t get_cmd(ESPState *s, uint32_t maxlen) uint32_t dmalen, n; int target; - if (s->current_req) { - /* Started a new command before the old one finished. Cancel it. */ - scsi_req_cancel(s->current_req); - } - target = s->wregs[ESP_WBUSID] & BUSID_DID; if (s->dma) { dmalen = MIN(esp_get_tc(s), maxlen);