Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

[thirdparty/qemu.git] / hw / scsi / esp.c

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index ff9057283054493836efd9e30f24430dfd1907ca..3a1c9f7c3b80c75f5fc024c74c4b62aa224fb0c6 100644 (file)
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -292,6 +292,15 @@ static void do_command_phase(ESPState *s)
     esp_fifo_pop_buf(&s->cmdfifo, buf, cmdlen);
 
     current_lun = scsi_device_find(&s->bus, 0, s->current_dev->id, s->lun);
+    if (!current_lun) {
+        /* No such drive */
+        s->rregs[ESP_RSTAT] = 0;
+        s->rregs[ESP_RINTR] = INTR_DC;
+        s->rregs[ESP_RSEQ] = SEQ_0;
+        esp_raise_irq(s);
+        return;
+    }
+
     s->current_req = scsi_req_new(current_lun, 0, s->lun, buf, cmdlen, s);
     datalen = scsi_req_enqueue(s->current_req);
     s->ti_size = datalen;