 da34e65cb4
			
		
	
	
		da34e65cb4
		
	
	
	
	
		
			
			Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the Error typedef. Since then, we've moved to include qemu/osdep.h everywhere. Its file comment explains: "To avoid getting into possible circular include dependencies, this file should not include any other QEMU headers, with the exceptions of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which are doing a similar job to this file and are under similar constraints." qapi/error.h doesn't do a similar job, and it doesn't adhere to similar constraints: it includes qapi-types.h. That's in excess of 100KiB of crap most .c files don't actually need. Add the typedef to qemu/typedefs.h, and include that instead of qapi/error.h. Include qapi/error.h in .c files that need it and don't get it now. Include qapi-types.h in qom/object.h for uint16List. Update scripts/clean-includes accordingly. Update it further to match reality: replace config.h by config-target.h, add sysemu/os-posix.h, sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h comment quoted above similarly. This reduces the number of objects depending on qapi/error.h from "all of them" to less than a third. Unfortunately, the number depending on qapi-types.h shrinks only a little. More work is needed for that one. Signed-off-by: Markus Armbruster <armbru@redhat.com> [Fix compilation without the spice devel packages. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
		
			
				
	
	
		
			90 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			90 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * ARM RealView Emulation Baseboard Interrupt Controller
 | |
|  *
 | |
|  * Copyright (c) 2006-2007 CodeSourcery.
 | |
|  * Written by Paul Brook
 | |
|  *
 | |
|  * This code is licensed under the GPL.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| #include "hw/intc/realview_gic.h"
 | |
| 
 | |
| static void realview_gic_set_irq(void *opaque, int irq, int level)
 | |
| {
 | |
|     RealViewGICState *s = (RealViewGICState *)opaque;
 | |
| 
 | |
|     qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level);
 | |
| }
 | |
| 
 | |
| static void realview_gic_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 | |
|     RealViewGICState *s = REALVIEW_GIC(dev);
 | |
|     SysBusDevice *busdev;
 | |
|     Error *err = NULL;
 | |
|     /* The GICs on the RealView boards have a fixed nonconfigurable
 | |
|      * number of interrupt lines, so we don't need to expose this as
 | |
|      * a qdev property.
 | |
|      */
 | |
|     int numirq = 96;
 | |
| 
 | |
|     qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", numirq);
 | |
|     object_property_set_bool(OBJECT(&s->gic), true, "realized", &err);
 | |
|     if (err != NULL) {
 | |
|         error_propagate(errp, err);
 | |
|         return;
 | |
|     }
 | |
|     busdev = SYS_BUS_DEVICE(&s->gic);
 | |
| 
 | |
|     /* Pass through outbound IRQ lines from the GIC */
 | |
|     sysbus_pass_irq(sbd, busdev);
 | |
| 
 | |
|     /* Pass through inbound GPIO lines to the GIC */
 | |
|     qdev_init_gpio_in(dev, realview_gic_set_irq, numirq - 32);
 | |
| 
 | |
|     memory_region_add_subregion(&s->container, 0,
 | |
|                                 sysbus_mmio_get_region(busdev, 1));
 | |
|     memory_region_add_subregion(&s->container, 0x1000,
 | |
|                                 sysbus_mmio_get_region(busdev, 0));
 | |
| }
 | |
| 
 | |
| static void realview_gic_init(Object *obj)
 | |
| {
 | |
|     SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 | |
|     RealViewGICState *s = REALVIEW_GIC(obj);
 | |
|     DeviceState *gicdev;
 | |
| 
 | |
|     memory_region_init(&s->container, OBJECT(s),
 | |
|                        "realview-gic-container", 0x2000);
 | |
|     sysbus_init_mmio(sbd, &s->container);
 | |
| 
 | |
|     object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
 | |
|     gicdev = DEVICE(&s->gic);
 | |
|     qdev_set_parent_bus(gicdev, sysbus_get_default());
 | |
|     qdev_prop_set_uint32(gicdev, "num-cpu", 1);
 | |
| }
 | |
| 
 | |
| static void realview_gic_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(oc);
 | |
| 
 | |
|     dc->realize = realview_gic_realize;
 | |
| }
 | |
| 
 | |
| static const TypeInfo realview_gic_info = {
 | |
|     .name          = TYPE_REALVIEW_GIC,
 | |
|     .parent        = TYPE_SYS_BUS_DEVICE,
 | |
|     .instance_size = sizeof(RealViewGICState),
 | |
|     .instance_init = realview_gic_init,
 | |
|     .class_init    = realview_gic_class_init,
 | |
| };
 | |
| 
 | |
| static void realview_gic_register_types(void)
 | |
| {
 | |
|     type_register_static(&realview_gic_info);
 | |
| }
 | |
| 
 | |
| type_init(realview_gic_register_types)
 |