mirror of
https://github.com/qemu/qemu.git
synced 2024-12-04 09:13:39 +08:00
4be746345f
Device models should access their block backends only through the block-backend.h API. Convert them, and drop direct includes of inappropriate headers. Just four uses of BlockDriverState are left: * The Xen paravirtual block device backend (xen_disk.c) opens images itself when set up via xenbus, bypassing blockdev.c. I figure it should go through qmp_blockdev_add() instead. * Device model "usb-storage" prompts for keys. No other device model does, and this one probably shouldn't do it, either. * ide_issue_trim_cb() uses bdrv_aio_discard() instead of blk_aio_discard() because it fishes its backend out of a BlockAIOCB, which has only the BlockDriverState. * PC87312State has an unused BlockDriverState[] member. The next two commits take care of the latter two. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
73 lines
2.1 KiB
C
73 lines
2.1 KiB
C
/*
|
|
* SA-1110-based Sharp Zaurus SL-5500 platform.
|
|
*
|
|
* Copyright (C) 2011 Dmitry Eremin-Solenikov
|
|
*
|
|
* This code is licensed under GNU GPL v2.
|
|
*
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
#include "hw/hw.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/devices.h"
|
|
#include "strongarm.h"
|
|
#include "hw/arm/arm.h"
|
|
#include "hw/block/flash.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "exec/address-spaces.h"
|
|
|
|
static struct arm_boot_info collie_binfo = {
|
|
.loader_start = SA_SDCS0,
|
|
.ram_size = 0x20000000,
|
|
};
|
|
|
|
static void collie_init(MachineState *machine)
|
|
{
|
|
const char *cpu_model = machine->cpu_model;
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
|
const char *initrd_filename = machine->initrd_filename;
|
|
StrongARMState *s;
|
|
DriveInfo *dinfo;
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
if (!cpu_model) {
|
|
cpu_model = "sa1110";
|
|
}
|
|
|
|
s = sa1110_init(sysmem, collie_binfo.ram_size, cpu_model);
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
(64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 1);
|
|
pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000,
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
(64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);
|
|
|
|
sysbus_create_simple("scoop", 0x40800000, NULL);
|
|
|
|
collie_binfo.kernel_filename = kernel_filename;
|
|
collie_binfo.kernel_cmdline = kernel_cmdline;
|
|
collie_binfo.initrd_filename = initrd_filename;
|
|
collie_binfo.board_id = 0x208;
|
|
arm_load_kernel(s->cpu, &collie_binfo);
|
|
}
|
|
|
|
static QEMUMachine collie_machine = {
|
|
.name = "collie",
|
|
.desc = "Collie PDA (SA-1110)",
|
|
.init = collie_init,
|
|
};
|
|
|
|
static void collie_machine_init(void)
|
|
{
|
|
qemu_register_machine(&collie_machine);
|
|
}
|
|
|
|
machine_init(collie_machine_init)
|