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>
		
			
				
	
	
		
			143 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			143 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Gumstix Platforms
 | 
						|
 *
 | 
						|
 * Copyright (c) 2007 by Thorsten Zitterell <info@bitmux.org>
 | 
						|
 *
 | 
						|
 * Code based on spitz platform by Andrzej Zaborowski <balrog@zabor.org>
 | 
						|
 *
 | 
						|
 * This code is licensed under the 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.
 | 
						|
 */
 | 
						|
 
 | 
						|
/* 
 | 
						|
 * Example usage:
 | 
						|
 * 
 | 
						|
 * connex:
 | 
						|
 * =======
 | 
						|
 * create image:
 | 
						|
 * # dd of=flash bs=1k count=16k if=/dev/zero
 | 
						|
 * # dd of=flash bs=1k conv=notrunc if=u-boot.bin
 | 
						|
 * # dd of=flash bs=1k conv=notrunc seek=256 if=rootfs.arm_nofpu.jffs2
 | 
						|
 * start it:
 | 
						|
 * # qemu-system-arm -M connex -pflash flash -monitor null -nographic
 | 
						|
 *
 | 
						|
 * verdex:
 | 
						|
 * =======
 | 
						|
 * create image:
 | 
						|
 * # dd of=flash bs=1k count=32k if=/dev/zero
 | 
						|
 * # dd of=flash bs=1k conv=notrunc if=u-boot.bin
 | 
						|
 * # dd of=flash bs=1k conv=notrunc seek=256 if=rootfs.arm_nofpu.jffs2
 | 
						|
 * # dd of=flash bs=1k conv=notrunc seek=31744 if=uImage
 | 
						|
 * start it:
 | 
						|
 * # qemu-system-arm -M verdex -pflash flash -monitor null -nographic -m 289
 | 
						|
 */
 | 
						|
 | 
						|
#include "hw/hw.h"
 | 
						|
#include "hw/arm/pxa.h"
 | 
						|
#include "net/net.h"
 | 
						|
#include "hw/block/flash.h"
 | 
						|
#include "hw/devices.h"
 | 
						|
#include "hw/boards.h"
 | 
						|
#include "sysemu/block-backend.h"
 | 
						|
#include "exec/address-spaces.h"
 | 
						|
#include "sysemu/qtest.h"
 | 
						|
 | 
						|
static const int sector_len = 128 * 1024;
 | 
						|
 | 
						|
static void connex_init(MachineState *machine)
 | 
						|
{
 | 
						|
    PXA2xxState *cpu;
 | 
						|
    DriveInfo *dinfo;
 | 
						|
    int be;
 | 
						|
    MemoryRegion *address_space_mem = get_system_memory();
 | 
						|
 | 
						|
    uint32_t connex_rom = 0x01000000;
 | 
						|
    uint32_t connex_ram = 0x04000000;
 | 
						|
 | 
						|
    cpu = pxa255_init(address_space_mem, connex_ram);
 | 
						|
 | 
						|
    dinfo = drive_get(IF_PFLASH, 0, 0);
 | 
						|
    if (!dinfo && !qtest_enabled()) {
 | 
						|
        fprintf(stderr, "A flash image must be given with the "
 | 
						|
                "'pflash' parameter\n");
 | 
						|
        exit(1);
 | 
						|
    }
 | 
						|
 | 
						|
#ifdef TARGET_WORDS_BIGENDIAN
 | 
						|
    be = 1;
 | 
						|
#else
 | 
						|
    be = 0;
 | 
						|
#endif
 | 
						|
    if (!pflash_cfi01_register(0x00000000, NULL, "connext.rom", connex_rom,
 | 
						|
                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
 | 
						|
                               sector_len, connex_rom / sector_len,
 | 
						|
                               2, 0, 0, 0, 0, be)) {
 | 
						|
        fprintf(stderr, "qemu: Error registering flash memory.\n");
 | 
						|
        exit(1);
 | 
						|
    }
 | 
						|
 | 
						|
    /* Interrupt line of NIC is connected to GPIO line 36 */
 | 
						|
    smc91c111_init(&nd_table[0], 0x04000300,
 | 
						|
                    qdev_get_gpio_in(cpu->gpio, 36));
 | 
						|
}
 | 
						|
 | 
						|
static void verdex_init(MachineState *machine)
 | 
						|
{
 | 
						|
    const char *cpu_model = machine->cpu_model;
 | 
						|
    PXA2xxState *cpu;
 | 
						|
    DriveInfo *dinfo;
 | 
						|
    int be;
 | 
						|
    MemoryRegion *address_space_mem = get_system_memory();
 | 
						|
 | 
						|
    uint32_t verdex_rom = 0x02000000;
 | 
						|
    uint32_t verdex_ram = 0x10000000;
 | 
						|
 | 
						|
    cpu = pxa270_init(address_space_mem, verdex_ram, cpu_model ?: "pxa270-c0");
 | 
						|
 | 
						|
    dinfo = drive_get(IF_PFLASH, 0, 0);
 | 
						|
    if (!dinfo && !qtest_enabled()) {
 | 
						|
        fprintf(stderr, "A flash image must be given with the "
 | 
						|
                "'pflash' parameter\n");
 | 
						|
        exit(1);
 | 
						|
    }
 | 
						|
 | 
						|
#ifdef TARGET_WORDS_BIGENDIAN
 | 
						|
    be = 1;
 | 
						|
#else
 | 
						|
    be = 0;
 | 
						|
#endif
 | 
						|
    if (!pflash_cfi01_register(0x00000000, NULL, "verdex.rom", verdex_rom,
 | 
						|
                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
 | 
						|
                               sector_len, verdex_rom / sector_len,
 | 
						|
                               2, 0, 0, 0, 0, be)) {
 | 
						|
        fprintf(stderr, "qemu: Error registering flash memory.\n");
 | 
						|
        exit(1);
 | 
						|
    }
 | 
						|
 | 
						|
    /* Interrupt line of NIC is connected to GPIO line 99 */
 | 
						|
    smc91c111_init(&nd_table[0], 0x04000300,
 | 
						|
                    qdev_get_gpio_in(cpu->gpio, 99));
 | 
						|
}
 | 
						|
 | 
						|
static QEMUMachine connex_machine = {
 | 
						|
    .name = "connex",
 | 
						|
    .desc = "Gumstix Connex (PXA255)",
 | 
						|
    .init = connex_init,
 | 
						|
};
 | 
						|
 | 
						|
static QEMUMachine verdex_machine = {
 | 
						|
    .name = "verdex",
 | 
						|
    .desc = "Gumstix Verdex (PXA270)",
 | 
						|
    .init = verdex_init,
 | 
						|
};
 | 
						|
 | 
						|
static void gumstix_machine_init(void)
 | 
						|
{
 | 
						|
    qemu_register_machine(&connex_machine);
 | 
						|
    qemu_register_machine(&verdex_machine);
 | 
						|
}
 | 
						|
 | 
						|
machine_init(gumstix_machine_init);
 |