From 12850b1bb31876fc7f6382ebffe137357b42e26e Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 7 Mar 2018 10:39:28 +0100 Subject: [PATCH] hw/sparc/sun4m: Fix implicit creation of "-drive if=scsi" devices 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 Fixes: 1454509726719e0933c800fad00d6999752688ea Signed-off-by: Thomas Huth Signed-off-by: Mark Cave-Ayland --- hw/sparc/sun4m.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 61eb424bbc73..0f5804b3b460 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -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"));