From 9bb67a3f58c53c643d97dbbf493e86905374c60f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 24 Feb 2018 02:46:08 -0500 Subject: [PATCH] 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. Backports commit df43d49cb8708b9c88a20afe0d1a3089b550a5b8 from qemu --- qemu/include/hw/hw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/include/hw/hw.h b/qemu/include/hw/hw.h index 51d4d629..c757dad0 100644 --- a/qemu/include/hw/hw.h +++ b/qemu/include/hw/hw.h @@ -6,9 +6,9 @@ #error Cannot include hw/hw.h from user emulation #endif -#include "qemu-common.h" #include "exec/cpu-common.h" -#include "exec/ioport.h" +#include "qom/object.h" +#include "exec/memory.h" #ifdef NEED_CPU_H #if TARGET_LONG_BITS == 64