]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw/sparc/sun4m: Fix implicit creation of "-drive if=scsi" devices
authorThomas Huth <thuth@redhat.com>
Wed, 7 Mar 2018 09:39:28 +0000 (10:39 +0100)
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Thu, 8 Mar 2018 07:21:54 +0000 (07:21 +0000)
The global hack for creating SCSI devices has recently been removed,
but this apparently broke SCSI devices on some boards that were not
ready for this change yet. For the sun4m machines you now get:

$ sparc-softmmu/qemu-system-sparc -boot d -cdrom x.iso
qemu-system-sparc: -cdrom x.iso: machine type does not support if=scsi,bus=0,unit=2

Fix it by calling scsi_bus_legacy_handle_cmdline() after creating the
corresponding SCSI controller.

Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: 1454509726719e0933c800fad00d6999752688ea
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
hw/sparc/sun4m.c

index 61eb424bbc73d41afa60568b9addd7344f33ed7f..0f5804b3b46037cc16689abfabdbe974f6bedfe0 100644 (file)
@@ -324,6 +324,7 @@ static void *sparc32_dma_init(hwaddr dma_base,
 
     esp = ESP_STATE(object_resolve_path_component(OBJECT(espdma), "esp"));
     sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base);
+    scsi_bus_legacy_handle_cmdline(&esp->esp.bus);
 
     ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component(
                                  OBJECT(dma), "ledma"));