Commit df43d49c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw: clean up hw/hw.h includes 



Include qom/object.h and exec/memory.h instead of exec/ioport.h;
exec/ioport.h was almost everywhere required only for those two
includes, not for the content of the header itself.

Remove block/aio.h, everybody is already including it through
another path.

With this change, include/hw/hw.h is freed from qemu-common.h.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 89a80e74

exec.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#else /* !CONFIG_USER_ONLY */

#include "hw/hw.h"

#include "exec/memory.h"

#include "exec/ioport.h"

#include "sysemu/dma.h"

#include "exec/address-spaces.h"

#include "sysemu/xen-mapcache.h"

hw/gpio/gpio_key.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "qemu/osdep.h"

#include "hw/sysbus.h"

#include "qemu/timer.h"



#define TYPE_GPIOKEY "gpio-key"

#define GPIOKEY(obj) OBJECT_CHECK(GPIOKEYState, (obj), TYPE_GPIOKEY)

include/exec/ioport.h

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 
#ifndef IOPORT_H

#define IOPORT_H



#include "qemu-common.h"

#include "qom/object.h"

#include "exec/memory.h"



#define MAX_IOPORTS     (64 * 1024)

#define IOPORTS_MASK    (MAX_IOPORTS - 1)

include/hw/hw.h

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
#endif



#include "exec/cpu-common.h"

#include "exec/ioport.h"

#include "qom/object.h"

#include "exec/memory.h"

#include "hw/irq.h"

#include "block/aio.h"

#include "migration/vmstate.h"

#include "qemu/module.h"

include/hw/isa/isa.h

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


/* ISA bus */



#include "exec/ioport.h"

#include "exec/memory.h"

#include "exec/ioport.h"

#include "hw/qdev.h"



#define ISA_NUM_IRQS 16