Merge remote-tracking branch 'kraxel/chardev.5' into staging

[qemu.git] / hw / hw.h

diff --git a/hw/hw.h b/hw/hw.h
index e5cb9bf94d45ebab8c436383e6c2a00cfd329a26..1553e54aa740dce645aeeef49f4892a0e3a060cd 100644 (file)
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -4,14 +4,16 @@
 
 #include "qemu-common.h"
 
-#if defined(TARGET_PHYS_ADDR_BITS) && !defined(NEED_CPU_H)
-#include "cpu-common.h"
+#if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H)
+#include "exec/cpu-common.h"
 #endif
 
-#include "ioport.h"
-#include "irq.h"
-#include "qemu-file.h"
-#include "vmstate.h"
+#include "exec/ioport.h"
+#include "hw/irq.h"
+#include "block/aio.h"
+#include "migration/qemu-file.h"
+#include "migration/vmstate.h"
+#include "qemu/log.h"
 
 #ifdef NEED_CPU_H
 #if TARGET_LONG_BITS == 64