diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-15 11:05:44 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-21 13:10:53 +0100 |
| commit | 2a7ae4ee50002a2fb5ac67fc8c32cc9009335cd8 (patch) | |
| tree | 1544c2a3eb9844f4a568e3d383eff78718cd31a5 /hw/arm | |
| parent | 7e465513c1c8a384003053eb8f8362039bbb7a2c (diff) | |
| download | focaccia-qemu-2a7ae4ee50002a2fb5ac67fc8c32cc9009335cd8.tar.gz focaccia-qemu-2a7ae4ee50002a2fb5ac67fc8c32cc9009335cd8.zip | |
hw/arm/highbank: Default -drive to if=ide instead of if=scsi
These machines have no onboard SCSI HBA, and no way to plug one. -drive if=scsi therefore cannot work. They do have an onboard IDE controller (sysbus-ahci), but fail to honor if=ide. Change their default to if=ide, and add a TODO comment on what needs to be done to actually honor -drive if=ide. Cc: Rob Herring <robh@kernel.org> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <1487153147-11530-6-git-send-email-armbru@redhat.com>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/highbank.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 80e5fd458b..0a4508cef3 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -363,6 +363,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[82]); } + /* TODO create and connect IDE devices for ide_drive_get() */ + highbank_binfo.ram_size = ram_size; highbank_binfo.kernel_filename = kernel_filename; highbank_binfo.kernel_cmdline = kernel_cmdline; @@ -405,7 +407,8 @@ static void highbank_class_init(ObjectClass *oc, void *data) mc->desc = "Calxeda Highbank (ECX-1000)"; mc->init = highbank_init; - mc->block_default_type = IF_SCSI; + mc->block_default_type = IF_IDE; + mc->units_per_default_bus = 1; mc->max_cpus = 4; } @@ -421,7 +424,8 @@ static void midway_class_init(ObjectClass *oc, void *data) mc->desc = "Calxeda Midway (ECX-2000)"; mc->init = midway_init; - mc->block_default_type = IF_SCSI; + mc->block_default_type = IF_IDE; + mc->units_per_default_bus = 1; mc->max_cpus = 4; } |