[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] hw/arm/highbank: Default -drive to if=ide inst
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 05/11] hw/arm/highbank: Default -drive to if=ide instead of if=scsi |
Date: |
Tue, 21 Feb 2017 13:34:33 +0100 |
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 <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
---
hw/arm/highbank.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 80e5fd4..0a4508c 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;
}
--
2.7.4
- [Qemu-devel] [PULL 00/11] Changes to -drive without if= and with if=scsi, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 11/11] hw/i386: Deprecate -drive if=scsi with PC machine types, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 09/11] hw/scsi: Concentrate -drive if=scsi auto-create in one place, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 07/11] blockdev: Make orphaned -drive fatal, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 10/11] hw: Deprecate -drive if=scsi with non-onboard HBAs, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 08/11] hw: Drop superfluous special checks for orphaned -drive, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 06/11] blockdev: Improve message for orphaned -drive, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 03/11] hw: Default -drive to if=none instead of ide when ide cannot work, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 05/11] hw/arm/highbank: Default -drive to if=ide instead of if=scsi,
Markus Armbruster <=
- [Qemu-devel] [PULL 02/11] hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 04/11] hw: Default -drive to if=none instead of scsi when scsi cannot work, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PULL 01/11] hw: Default -drive to if=ide explicitly where it works, Markus Armbruster, 2017/02/21
- Re: [Qemu-devel] [PULL 00/11] Changes to -drive without if= and with if=scsi, no-reply, 2017/02/21
- Re: [Qemu-devel] [PULL 00/11] Changes to -drive without if= and with if=scsi, Peter Maydell, 2017/02/21