david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus

Browse Source 
Machine types cubieboard, xlnx-ep108, xlnx-zcu102 have an onboard AHCI
controller, but neglect to set their MachineClass member
units_per_default_bus = 1.  This permits -drive if=ide,unit=1, which
makes no sense for AHCI.  It also screws up index=N for odd N, because
it gets desugared to unit=1,bus=N/2

Doesn't really matter, because these machine types fail to honor
-drive if=ide.  Add the missing units_per_default_bus = 1 anyway,
along with a TODO comment on what needs to be done for -drive if=ide.

Also set block_default_type = IF_IDE explicitly.  It's currently the
default, but the next commit will change it to something more
sensible, and we want to keep the IF_IDE default for these three
machines.  See also the previous commit.

Cc: Beniamino Galvani <b.galvani@gmail.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <1487153147-11530-3-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-15 11:05:41 +01:00
parent 2059839baa
commit e0319b0302
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/cubieboard.c
View File

@ -71,6 +71,8 @@ static void cubieboard_init(MachineState *machine)
memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE, memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,
&s->sdram); &s->sdram);
/* TODO create and connect IDE devices for ide_drive_get() */
cubieboard_binfo.ram_size = machine->ram_size; cubieboard_binfo.ram_size = machine->ram_size;
cubieboard_binfo.kernel_filename = machine->kernel_filename; cubieboard_binfo.kernel_filename = machine->kernel_filename;
cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline; cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline;
@ -82,6 +84,8 @@ static void cubieboard_machine_init(MachineClass *mc)
{ {
mc->desc = "cubietech cubieboard"; mc->desc = "cubietech cubieboard";
mc->init = cubieboard_init; mc->init = cubieboard_init;
mc->block_default_type = IF_IDE;
mc->units_per_default_bus = 1;
} }
DEFINE_MACHINE("cubieboard", cubieboard_machine_init) DEFINE_MACHINE("cubieboard", cubieboard_machine_init)

6
hw/arm/xlnx-ep108.c
View File

@ -106,6 +106,8 @@ static void xlnx_ep108_init(MachineState *machine)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]), 1, cs_line); sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]), 1, cs_line);
} }
/* TODO create and connect IDE devices for ide_drive_get() */
xlnx_ep108_binfo.ram_size = ram_size; xlnx_ep108_binfo.ram_size = ram_size;
xlnx_ep108_binfo.kernel_filename = machine->kernel_filename; xlnx_ep108_binfo.kernel_filename = machine->kernel_filename;
xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline; xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline;
@ -118,6 +120,8 @@ static void xlnx_ep108_machine_init(MachineClass *mc)
{ {
mc->desc = "Xilinx ZynqMP EP108 board"; mc->desc = "Xilinx ZynqMP EP108 board";
mc->init = xlnx_ep108_init; mc->init = xlnx_ep108_init;
mc->block_default_type = IF_IDE;
mc->units_per_default_bus = 1;
} }
DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init) DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init)
@ -126,6 +130,8 @@ static void xlnx_zcu102_machine_init(MachineClass *mc)
{ {
mc->desc = "Xilinx ZynqMP ZCU102 board"; mc->desc = "Xilinx ZynqMP ZCU102 board";
mc->init = xlnx_ep108_init; mc->init = xlnx_ep108_init;
mc->block_default_type = IF_IDE;
mc->units_per_default_bus = 1;
} }
DEFINE_MACHINE("xlnx-zcu102", xlnx_zcu102_machine_init) DEFINE_MACHINE("xlnx-zcu102", xlnx_zcu102_machine_init)