In my "build everything" tree, changing hw/qdev-properties.h triggers a recompile of some 2700 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). Many places including hw/qdev-properties.h (directly or via hw/qdev.h) actually need only hw/qdev-core.h. Include hw/qdev-core.h there instead. hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h and hw/qdev-properties.h, which in turn includes hw/qdev-core.h. Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h. While there, delete a few superfluous inclusions of hw/qdev-core.h. Touching hw/qdev-properties.h now recompiles some 1200 objects. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Daniel P. Berrangé" <berrange@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20190812052359.30071-22-armbru@redhat.com>
		
			
				
	
	
		
			87 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * BBC micro:bit machine
 | 
						|
 * http://tech.microbit.org/hardware/
 | 
						|
 *
 | 
						|
 * Copyright 2018 Joel Stanley <joel@jms.id.au>
 | 
						|
 *
 | 
						|
 * This code is licensed under the GPL version 2 or later.  See
 | 
						|
 * the COPYING file in the top-level directory.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "hw/boards.h"
 | 
						|
#include "hw/arm/boot.h"
 | 
						|
#include "sysemu/sysemu.h"
 | 
						|
#include "exec/address-spaces.h"
 | 
						|
 | 
						|
#include "hw/arm/nrf51_soc.h"
 | 
						|
#include "hw/i2c/microbit_i2c.h"
 | 
						|
#include "hw/qdev-properties.h"
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    MachineState parent;
 | 
						|
 | 
						|
    NRF51State nrf51;
 | 
						|
    MicrobitI2CState i2c;
 | 
						|
} MicrobitMachineState;
 | 
						|
 | 
						|
#define TYPE_MICROBIT_MACHINE MACHINE_TYPE_NAME("microbit")
 | 
						|
 | 
						|
#define MICROBIT_MACHINE(obj) \
 | 
						|
    OBJECT_CHECK(MicrobitMachineState, obj, TYPE_MICROBIT_MACHINE)
 | 
						|
 | 
						|
static void microbit_init(MachineState *machine)
 | 
						|
{
 | 
						|
    MicrobitMachineState *s = MICROBIT_MACHINE(machine);
 | 
						|
    MemoryRegion *system_memory = get_system_memory();
 | 
						|
    MemoryRegion *mr;
 | 
						|
    Object *soc = OBJECT(&s->nrf51);
 | 
						|
    Object *i2c = OBJECT(&s->i2c);
 | 
						|
 | 
						|
    sysbus_init_child_obj(OBJECT(machine), "nrf51", soc, sizeof(s->nrf51),
 | 
						|
                          TYPE_NRF51_SOC);
 | 
						|
    qdev_prop_set_chr(DEVICE(&s->nrf51), "serial0", serial_hd(0));
 | 
						|
    object_property_set_link(soc, OBJECT(system_memory), "memory",
 | 
						|
                             &error_fatal);
 | 
						|
    object_property_set_bool(soc, true, "realized", &error_fatal);
 | 
						|
 | 
						|
    /*
 | 
						|
     * Overlap the TWI stub device into the SoC.  This is a microbit-specific
 | 
						|
     * hack until we implement the nRF51 TWI controller properly and the
 | 
						|
     * magnetometer/accelerometer devices.
 | 
						|
     */
 | 
						|
    sysbus_init_child_obj(OBJECT(machine), "microbit.twi", i2c,
 | 
						|
                          sizeof(s->i2c), TYPE_MICROBIT_I2C);
 | 
						|
    object_property_set_bool(i2c, true, "realized", &error_fatal);
 | 
						|
    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0);
 | 
						|
    memory_region_add_subregion_overlap(&s->nrf51.container, NRF51_TWI_BASE,
 | 
						|
                                        mr, -1);
 | 
						|
 | 
						|
    armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
 | 
						|
                       NRF51_SOC(soc)->flash_size);
 | 
						|
}
 | 
						|
 | 
						|
static void microbit_machine_class_init(ObjectClass *oc, void *data)
 | 
						|
{
 | 
						|
    MachineClass *mc = MACHINE_CLASS(oc);
 | 
						|
 | 
						|
    mc->desc = "BBC micro:bit";
 | 
						|
    mc->init = microbit_init;
 | 
						|
    mc->max_cpus = 1;
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo microbit_info = {
 | 
						|
    .name = TYPE_MICROBIT_MACHINE,
 | 
						|
    .parent = TYPE_MACHINE,
 | 
						|
    .instance_size = sizeof(MicrobitMachineState),
 | 
						|
    .class_init = microbit_machine_class_init,
 | 
						|
};
 | 
						|
 | 
						|
static void microbit_machine_init(void)
 | 
						|
{
 | 
						|
    type_register_static(µbit_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(microbit_machine_init);
 |