Include hw/irq.h a lot less

In my "build everything" tree, changing hw/irq.h triggers a recompile
of some 5400 out of 6600 objects (not counting tests and objects that
don't depend on qemu/osdep.h).

hw/hw.h supposedly includes it for convenience.  Several other headers
include it just to get qemu_irq and.or qemu_irq_handler.

Move the qemu_irq and qemu_irq_handler typedefs from hw/irq.h to
qemu/typedefs.h, and then include hw/irq.h only where it's still
needed.  Touching it now recompiles only some 500 objects.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-13-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-08-12 07:23:42 +02:00
parent 2a28720d77
commit 64552b6be4
338 changed files with 336 additions and 34 deletions

View file

@ -21,6 +21,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "qemu/fifo8.h"
#include "hw/irq.h"
#include "hw/net/allwinner_emac.h"
#include "qemu/log.h"
#include "qemu/module.h"

View file

@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include <zlib.h> /* For crc32 */
#include "hw/irq.h"
#include "hw/net/cadence_gem.h"
#include "qapi/error.h"
#include "qemu/log.h"

View file

@ -37,6 +37,7 @@
#include "qapi/error.h"
#include "chardev/char.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "net/can_emu.h"

View file

@ -33,6 +33,7 @@
#include "qapi/error.h"
#include "chardev/char.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "net/can_emu.h"

View file

@ -33,6 +33,7 @@
#include "qapi/error.h"
#include "chardev/char.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "net/can_emu.h"

View file

@ -24,10 +24,12 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "chardev/char.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "net/can_emu.h"
#include "can_sja1000.h"

View file

@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "qapi/error.h"

View file

@ -29,6 +29,7 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
#include "etsec.h"
#include "registers.h"

View file

@ -12,6 +12,7 @@
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/net/ftgmac100.h"
#include "sysemu/dma.h"
#include "qemu/log.h"

View file

@ -22,6 +22,7 @@
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/net/imx_fec.h"
#include "sysemu/dma.h"
#include "qemu/log.h"

View file

@ -14,6 +14,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "net/eth.h"
#include "hw/irq.h"
#include "hw/net/lan9118.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"

View file

@ -8,6 +8,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "net/net.h"
#include "qemu/module.h"
#include "hw/m68k/mcf.h"

View file

@ -26,6 +26,7 @@
#include "qapi/error.h"
#include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "trace.h"
#include "net/net.h"

View file

@ -1,5 +1,6 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "net/net.h"
#include "qemu/module.h"
#include "trace.h"

View file

@ -21,7 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "ne2000.h"
#include "sysemu/sysemu.h"

View file

@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "net/eth.h"
#include "qemu/module.h"
#include "hw/irq.h"
#include "ne2000.h"
#include "sysemu/sysemu.h"
#include "trace.h"

View file

@ -33,6 +33,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/net/mii.h"
#include "hw/sysbus.h"
#include "net/net.h"

View file

@ -28,6 +28,7 @@
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "qemu/module.h"

View file

@ -37,6 +37,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "hw/irq.h"
#include "hw/qdev.h"
#include "net/net.h"
#include "net/eth.h"

View file

@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/irq.h"
#include "hw/net/smc91c111.h"
#include "qemu/log.h"
#include "qemu/module.h"

View file

@ -28,6 +28,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "net/net.h"

View file

@ -8,6 +8,7 @@
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "qemu/log.h"

View file

@ -25,6 +25,7 @@
*/
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
#include "qemu/module.h"

View file

@ -30,6 +30,7 @@
#include "net/net.h"
#include "net/checksum.h"
#include "hw/irq.h"
#include "hw/stream.h"
#define DPHY(x)

View file

@ -27,6 +27,7 @@
#include "cpu.h" /* FIXME should not use tswap* */
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "net/net.h"
#define D(x)