hw: include hw header files with full paths

Done with this script:

cd hw
for i in `find . -name '*.h' | sed 's/^..//'`; do
  echo '\,^#.*include.*["<]'$i'[">], s,'$i',hw/&,'
done | sed -i -f - `find . -type f`

This is so that paths remain valid as files are moved.

Instead, files in hw/dataplane are referenced with the relative path.
We know they are not going to move to include/, and they are the only
include files that are in subdirectories _and_ move.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/a15mpcore.c b/hw/a15mpcore.c
index fe6c34ca53315c7a978f7c22d50d32a951532c93..d973d53f0a4cb6417f0d471a323baaf5fc3e2870 100644 (file)
--- a/hw/a15mpcore.c
+++ b/hw/a15mpcore.c
@@ -18,7 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* A15MP private memory region.  */
 

diff --git a/hw/a9mpcore.c b/hw/a9mpcore.c
index 01aee0264dd0bc60ea20d3ddc5fa5787069be7c5..0a1a10f37ae88be84e1c837ec19b1c5aa5866434 100644 (file)
--- a/hw/a9mpcore.c
+++ b/hw/a9mpcore.c
@@ -8,7 +8,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 typedef struct A9MPPrivState {
     SysBusDevice busdev;

diff --git a/hw/a9scu.c b/hw/a9scu.c
index 0e9e54d7fbddbd899de848e1decbd8a5435b548a..05897c2fa2a55471351defd89deb4e1cd8de3282 100644 (file)
--- a/hw/a9scu.c
+++ b/hw/a9scu.c
@@ -8,7 +8,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* A9MP private memory region.  */
 

diff --git a/hw/ac97.c b/hw/ac97.c
index 6c565e755c0fac1b6d10c29bf01faac3cbaa2603..c7d601fdb7dcf736f4b38d8fc966775afb9e44f3 100644 (file)
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -17,10 +17,10 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "audiodev.h"
+#include "hw/hw.h"
+#include "hw/audiodev.h"
 #include "audio/audio.h"
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 
 enum {

diff --git a/hw/acpi.c b/hw/acpi.c
index 8c9dcc51c4b8c403df6017a5f7a73cf5539110e3..53e47d5857a77b96adf746b9195f786eea75763b 100644 (file)
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -19,9 +19,9 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 #include "sysemu/sysemu.h"
-#include "hw.h"
-#include "pc.h"
-#include "acpi.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/acpi.h"
 #include "monitor/monitor.h"
 
 struct acpi_table_header {

diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
index d2f9808242b5cdd23d044a98a153368be55de424..29f84ffb45703c5cbb103538b6967c9e90eb23ab 100644 (file)
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -23,16 +23,16 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "pc.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "acpi.h"
+#include "hw/acpi.h"
 #include "sysemu/kvm.h"
 #include "exec/address-spaces.h"
 
-#include "ich9.h"
+#include "hw/ich9.h"
 
 //#define DEBUG
 

diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h
index ecb82abc65b34bd1286951de713efc1753b07acb..91c3aeb7ea946ae2bf1578a81266c6836fc0214c 100644 (file)
--- a/hw/acpi_ich9.h
+++ b/hw/acpi_ich9.h
@@ -21,7 +21,7 @@
 #ifndef HW_ACPI_ICH9_H
 #define HW_ACPI_ICH9_H
 
-#include "acpi.h"
+#include "hw/acpi.h"
 
 typedef struct ICH9LPCPMRegs {
     /*

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 65b26013bd1492794965693e930e12f9a7a08963..7a4b71291997756ad978e63133a39b1a2c82fa44 100644 (file)
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -18,16 +18,16 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "pc.h"
-#include "apm.h"
-#include "pm_smbus.h"
-#include "pci/pci.h"
-#include "acpi.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/apm.h"
+#include "hw/pm_smbus.h"
+#include "hw/pci/pci.h"
+#include "hw/acpi.h"
 #include "sysemu/sysemu.h"
 #include "qemu/range.h"
 #include "exec/ioport.h"
-#include "fw_cfg.h"
+#include "hw/fw_cfg.h"
 #include "exec/address-spaces.h"
 
 //#define DEBUG

diff --git a/hw/adb.c b/hw/adb.c
index 6cf54650c8afab96fb048eca840a89174ca5e13b..fd9052c16b04571b6198d42e07e28b91031abbeb 100644 (file)
--- a/hw/adb.c
+++ b/hw/adb.c
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "adb.h"
+#include "hw/hw.h"
+#include "hw/adb.h"
 #include "ui/console.h"
 
 /* debug ADB */

diff --git a/hw/adb.h b/hw/adb.h
index 721f1ac43ef260a30f9e028c2d3f879d9c42f14f..bdfccd40416497bf7c5594c58fc8dec2edd5ad45 100644 (file)
--- a/hw/adb.h
+++ b/hw/adb.h
@@ -26,7 +26,7 @@
 #if !defined(__ADB_H__)
 #define __ADB_H__
 
-#include "qdev.h"
+#include "hw/qdev.h"
 
 #define MAX_ADB_DEVICES 16
 

diff --git a/hw/adlib.c b/hw/adlib.c
index 07c69fc967842a8ff556d69072751cbed30634da..e6bce59512d98a7dfca646c3262ec540123e850e 100644 (file)
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "audiodev.h"
+#include "hw/hw.h"
+#include "hw/audiodev.h"
 #include "audio/audio.h"
-#include "isa.h"
+#include "hw/isa.h"
 
 //#define DEBUG
 
@@ -47,7 +47,7 @@
 void YMF262UpdateOneQEMU (int which, INT16 *dst, int length);
 #define SHIFT 2
 #else
-#include "fmopl.h"
+#include "hw/fmopl.h"
 #define SHIFT 1
 #endif
 

diff --git a/hw/ads7846.c b/hw/ads7846.c
index 29e5585d9150fc567204ea863cf57ba6e2919ccc..5da3dc5b2cf7914ea5b3664baa72072f555d7e19 100644 (file)
--- a/hw/ads7846.c
+++ b/hw/ads7846.c
@@ -10,7 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "ssi.h"
+#include "hw/ssi.h"
 #include "ui/console.h"
 
 typedef struct {

diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 1cd549c69fab9bf1ecb715b917b281216cff36f9..13aaa57b9034eb0c59f3e46f0f4c494b6f3d23cd 100644 (file)
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -6,16 +6,16 @@
  * that we need to emulate as well.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "elf.h"
-#include "loader.h"
-#include "boards.h"
-#include "alpha_sys.h"
+#include "hw/loader.h"
+#include "hw/boards.h"
+#include "hw/alpha_sys.h"
 #include "sysemu/sysemu.h"
-#include "mc146818rtc.h"
-#include "ide.h"
-#include "i8254.h"
-#include "serial.h"
+#include "hw/mc146818rtc.h"
+#include "hw/ide.h"
+#include "hw/i8254.h"
+#include "hw/serial.h"
 
 #define MAX_IDE_BUS 2
 

diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
index 7327d488fdb3bbdf7b6dee148c84e24320f55d14..84628686ad71c12cf0bef52676016adfdf88807c 100644 (file)
--- a/hw/alpha_pci.c
+++ b/hw/alpha_pci.c
@@ -7,7 +7,7 @@
  */
 
 #include "config.h"
-#include "alpha_sys.h"
+#include "hw/alpha_sys.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h
index 233a71ecdbdccaa858c8e83af7b9a61cd045c2c7..b4ebd2a9cc68cf897e9d69f40ee19250c7a798d0 100644 (file)
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -3,11 +3,11 @@
 #ifndef HW_ALPHA_H
 #define HW_ALPHA_H 1
 
-#include "pci/pci.h"
-#include "pci/pci_host.h"
-#include "ide.h"
-#include "pc.h"
-#include "irq.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/ide.h"
+#include "hw/pc.h"
+#include "hw/irq.h"
 
 
 PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, AlphaCPU *[4],

diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index bf9aabfc08405300129072d1426bc006fb2bd9ac..95571ffc5dbad4902bc5ab9500380b7f5cbd8ab3 100644 (file)
--- a/hw/alpha_typhoon.c
+++ b/hw/alpha_typhoon.c
@@ -8,10 +8,10 @@
 
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw.h"
-#include "devices.h"
+#include "hw/hw.h"
+#include "hw/devices.h"
 #include "sysemu/sysemu.h"
-#include "alpha_sys.h"
+#include "hw/alpha_sys.h"
 #include "exec/address-spaces.h"
 
 

diff --git a/hw/an5206.c b/hw/an5206.c
index 924be81d5768de93b0264edd3a695eab35db4495..7c21c66cdecb9789bf93e0115586cb7caaa149b2 100644 (file)
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -6,10 +6,10 @@
  * This code is licensed under the GPL
  */
 
-#include "hw.h"
-#include "mcf.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/hw.h"
+#include "hw/mcf.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index 7eb0c2bbcb7e68bf8845efa7e28f8a41e52b43c8..7992d6f6fd8fba7a8b943f71bbad15a8ec735e07 100644 (file)
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -26,12 +26,12 @@
    Ultrasparc PCI host is called the PCI Bus Module (PBM).  The APB is
    the secondary PCI bridge.  */
 
-#include "sysbus.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
-#include "pci/pci_bridge.h"
-#include "pci/pci_bus.h"
-#include "apb_pci.h"
+#include "hw/sysbus.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/pci/pci_bridge.h"
+#include "hw/pci/pci_bus.h"
+#include "hw/apb_pci.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/apic.c b/hw/apic.c
index fd14b73023db0fd8cd126a6052685ee2fa21edef..8eddba06e5500970b7ae4fe1af897a5e8707daf8 100644 (file)
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -17,14 +17,14 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 #include "qemu/thread.h"
-#include "apic_internal.h"
-#include "apic.h"
-#include "ioapic.h"
-#include "pci/msi.h"
+#include "hw/apic_internal.h"
+#include "hw/apic.h"
+#include "hw/ioapic.h"
+#include "hw/pci/msi.h"
 #include "qemu/host-utils.h"
 #include "trace.h"
-#include "pc.h"
-#include "apic-msidef.h"
+#include "hw/pc.h"
+#include "hw/apic-msidef.h"
 
 #define MAX_APIC_WORDS 8
 

diff --git a/hw/apic_common.c b/hw/apic_common.c
index d8c981050950436af7acea6c6bcc63c38fcdf853..d0c261602c63ac5c7fce68f29dfd753e90d1a8ff 100644 (file)
--- a/hw/apic_common.c
+++ b/hw/apic_common.c
@@ -17,8 +17,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
-#include "apic.h"
-#include "apic_internal.h"
+#include "hw/apic.h"
+#include "hw/apic_internal.h"
 #include "trace.h"
 #include "sysemu/kvm.h"
 

diff --git a/hw/apic_internal.h b/hw/apic_internal.h
index 9265e52cd604a79c7b5eaf3c1990f79a82f61d36..578241f861c19684c8205618e882a69c4c456c31 100644 (file)
--- a/hw/apic_internal.h
+++ b/hw/apic_internal.h
@@ -21,7 +21,7 @@
 #define QEMU_APIC_INTERNAL_H
 
 #include "exec/memory.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 
 /* APIC Local Vector Table */

diff --git a/hw/apm.c b/hw/apm.c
index 2e1b1372d24baeccb94d30318b57a8bfa39cc8db..e2846f99c844969e528ea56bdc5db81e9d8975c8 100644 (file)
--- a/hw/apm.c
+++ b/hw/apm.c
@@ -20,9 +20,9 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "apm.h"
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/apm.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 
 //#define DEBUG
 

diff --git a/hw/apm.h b/hw/apm.h
index 9abb47f99ff208d1695a338c794248f01a26268d..3edea5f623a93ed9583898a5480b678286192a3c 100644 (file)
--- a/hw/apm.h
+++ b/hw/apm.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include "qemu-common.h"
-#include "hw.h"
+#include "hw/hw.h"
 #include "exec/memory.h"
 
 typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);

diff --git a/hw/applesmc.c b/hw/applesmc.c
index 5a8c4ff2d26e9558c20c30d529f2930d0336011c..44b9bacd88aa4c7dc3e0055bca4657a500b5490a 100644 (file)
--- a/hw/applesmc.c
+++ b/hw/applesmc.c
@@ -30,8 +30,8 @@
  *
  */
 
-#include "hw.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
 #include "ui/console.h"
 #include "qemu/timer.h"
 

diff --git a/hw/arm11mpcore.c b/hw/arm11mpcore.c
index ca49948ffcefa37ddc217ecd2e96533f1dca9809..90dceade715cbe0f0ba10988de6b0f3da6ceb13a 100644 (file)
--- a/hw/arm11mpcore.c
+++ b/hw/arm11mpcore.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 
 /* MPCore private memory region.  */

diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 4065424d60b87232cede6af1526b6a8d908b4285..43253fd34a2d4844bc513df1d2e0a6761ba547c6 100644 (file)
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -8,11 +8,11 @@
  */
 
 #include "config.h"
-#include "hw.h"
-#include "arm-misc.h"
+#include "hw/hw.h"
+#include "hw/arm-misc.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "sysemu/device_tree.h"
 #include "qemu/config-file.h"

diff --git a/hw/arm_gic.c b/hw/arm_gic.c
index 90e43d072875ce176172ed2a5caae03cbe3ff8ce..6b30e0bf4243f9efe0cbedc6f598200e0d067de8 100644 (file)
--- a/hw/arm_gic.c
+++ b/hw/arm_gic.c
@@ -18,8 +18,8 @@
  *  armv7m_nvic device.
  */
 
-#include "sysbus.h"
-#include "arm_gic_internal.h"
+#include "hw/sysbus.h"
+#include "hw/arm_gic_internal.h"
 
 //#define DEBUG_GIC
 

diff --git a/hw/arm_gic_common.c b/hw/arm_gic_common.c
index 40e8dd704596abb4fe4ac564d6497be873b440f6..745b4b2a0ab3af43df5afdc495a4a00fba1953c9 100644 (file)
--- a/hw/arm_gic_common.c
+++ b/hw/arm_gic_common.c
@@ -18,7 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arm_gic_internal.h"
+#include "hw/arm_gic_internal.h"
 
 static void gic_save(QEMUFile *f, void *opaque)
 {

diff --git a/hw/arm_gic_internal.h b/hw/arm_gic_internal.h
index 699352ca8b022ec563e147a4c8dd927c379856e7..b10ac5e9f6a4f04bfd687a08f472dc6cdab21cd7 100644 (file)
--- a/hw/arm_gic_internal.h
+++ b/hw/arm_gic_internal.h
@@ -21,7 +21,7 @@
 #ifndef QEMU_ARM_GIC_INTERNAL_H
 #define QEMU_ARM_GIC_INTERNAL_H
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* Maximum number of possible interrupts, determined by the GIC architecture */
 #define GIC_MAXIRQ 1020

diff --git a/hw/arm_l2x0.c b/hw/arm_l2x0.c
index ae1e51d00939790b7145622f48d9eb8408962560..eb4427d9c4937f1857e882393997355fa9e1cc8d 100644 (file)
--- a/hw/arm_l2x0.c
+++ b/hw/arm_l2x0.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* L2C-310 r3p2 */
 #define CACHE_ID 0x410000c8

diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c
index 7b08aa3644bdf73817fd3fb97634a894e0957fa4..f59a9f11f083bf19e37a55c490c70ea10c33a757 100644 (file)
--- a/hw/arm_mptimer.c
+++ b/hw/arm_mptimer.c
@@ -19,7 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 
 /* This device implements the per-cpu private timer and watchdog block

diff --git a/hw/arm_pic.c b/hw/arm_pic.c
index ffb4d4171a587249fa01acdc01ee06765a7b7a4b..a7ad893cc2f89b4fc0ac3a147813e39ad42982a6 100644 (file)
--- a/hw/arm_pic.c
+++ b/hw/arm_pic.c
@@ -7,8 +7,8 @@
  * This code is licensed under the LGPL
  */
 
-#include "hw.h"
-#include "arm-misc.h"
+#include "hw/hw.h"
+#include "hw/arm-misc.h"
 
 /* Input 0 is IRQ and input 1 is FIQ.  */
 static void arm_pic_cpu_handler(void *opaque, int irq, int level)

diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c
index 7ecb7da54b1e28ad9b59127e1e7f326534476e30..a46f8d450eeb081d479df26c550e5bde33206aa6 100644 (file)
--- a/hw/arm_sysctl.c
+++ b/hw/arm_sysctl.c
@@ -7,10 +7,10 @@
  * This code is licensed under the GPL.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "sysbus.h"
-#include "primecell.h"
+#include "hw/sysbus.h"
+#include "hw/primecell.h"
 #include "sysemu/sysemu.h"
 
 #define LOCK_VALUE 0xa05f

diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index c1e56be74e5cb8cef695f79d0088616ca06068c1..644987046aabf72e325200f9ee5e664afd26a0da 100644 (file)
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -7,11 +7,11 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
-#include "qdev.h"
-#include "ptimer.h"
+#include "hw/qdev.h"
+#include "hw/ptimer.h"
 
 /* Common timer implementation.  */
 

diff --git a/hw/armv7m.c b/hw/armv7m.c
index 904696ca7f24887ad71e030820c4e0f33d65dc8d..1d5bb592c49a81e24a6aae2a2b5a6e96d006b309 100644 (file)
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -7,9 +7,9 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "loader.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/loader.h"
 #include "elf.h"
 
 /* Bitbanded IO.  Each word corresponds to a single bit.  */

diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index d5798d0309c96648020a83c96d5e83d73a6c4ff7..4d3042348bbf71ecf19a2ffdc3767dd3d1f5f741 100644 (file)
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -10,11 +10,11 @@
  * NVIC.  Much of that is also implemented here.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "arm-misc.h"
+#include "hw/arm-misc.h"
 #include "exec/address-spaces.h"
-#include "arm_gic_internal.h"
+#include "hw/arm_gic_internal.h"
 
 typedef struct {
     GICState gic;

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index dd37fa13e22546ba3e190209ee3e3aed9f93ba35..eccd423abfba294455906df5627cce649dee29db 100644 (file)
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
-#include "flash.h"
-#include "boards.h"
-#include "etraxfs.h"
-#include "loader.h"
+#include "hw/flash.h"
+#include "hw/boards.h"
+#include "hw/etraxfs.h"
+#include "hw/loader.h"
 #include "elf.h"
-#include "cris-boot.h"
+#include "hw/cris-boot.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/bitbang_i2c.c b/hw/bitbang_i2c.c
index 114508fade9cfe13eb77371b58d756c9baebc14d..b8e6d3a1033e03d8a1657da10fd0f5d85ec7d892 100644 (file)
--- a/hw/bitbang_i2c.c
+++ b/hw/bitbang_i2c.c
@@ -9,9 +9,9 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "bitbang_i2c.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/bitbang_i2c.h"
+#include "hw/sysbus.h"
 
 //#define DEBUG_BITBANG_I2C
 

diff --git a/hw/bitbang_i2c.h b/hw/bitbang_i2c.h
index 519d2dc22fe4dce8a9504de930273e0cda1848c8..e86062742c6f810037df10ab6ab54e3cf0414515 100644 (file)
--- a/hw/bitbang_i2c.h
+++ b/hw/bitbang_i2c.h
@@ -1,7 +1,7 @@
 #ifndef BITBANG_I2C_H
 #define BITBANG_I2C_H
 
-#include "i2c.h"
+#include "hw/i2c.h"
 
 typedef struct bitbang_i2c_interface bitbang_i2c_interface;
 

diff --git a/hw/blizzard.c b/hw/blizzard.c
index 24bde32e5afbc892cd8e79e1aa2df5017a913cdd..805f4d55586a9741c51aecf8c241c7c9ff50b599 100644 (file)
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -20,8 +20,8 @@
 
 #include "qemu-common.h"
 #include "ui/console.h"
-#include "devices.h"
-#include "vga_int.h"
+#include "hw/devices.h"
+#include "hw/vga_int.h"
 #include "ui/pixel_ops.h"
 
 typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int);
@@ -941,15 +941,15 @@ static void blizzard_screen_dump(void *opaque, const char *filename,
 }
 
 #define DEPTH 8
-#include "blizzard_template.h"
+#include "hw/blizzard_template.h"
 #define DEPTH 15
-#include "blizzard_template.h"
+#include "hw/blizzard_template.h"
 #define DEPTH 16
-#include "blizzard_template.h"
+#include "hw/blizzard_template.h"
 #define DEPTH 24
-#include "blizzard_template.h"
+#include "hw/blizzard_template.h"
 #define DEPTH 32
-#include "blizzard_template.h"
+#include "hw/blizzard_template.h"
 
 void *s1d13745_init(qemu_irq gpio_int)
 {

diff --git a/hw/boards.h b/hw/boards.h
index 3813d4e551b127e550dc0a56269d796380983fed..425bdc74a810dd7bdc88b7fd3b5505577f47bb78 100644 (file)
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -4,7 +4,7 @@
 #define HW_BOARDS_H
 
 #include "sysemu/blockdev.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 
 #define DEFAULT_MACHINE_OPTIONS \
     .boot_order = "cad"

diff --git a/hw/bonito.c b/hw/bonito.c
index 0498c9be7980da5e94b671f72f93c2222b346c56..3456e7840ed0f81e4f09255927f53cc0f49ace8e 100644 (file)
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -39,11 +39,11 @@
 
 #include <assert.h>
 
-#include "hw.h"
-#include "pci/pci.h"
-#include "pc.h"
-#include "mips.h"
-#include "pci/pci_host.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/pc.h"
+#include "hw/mips.h"
+#include "hw/pci/pci_host.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 2070bb940c7a1316afde7a6d1ca620cb33def32e..e4ada3c731174983afaed69056e564e9bae3bbf2 100644 (file)
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -21,9 +21,9 @@
 #include "qemu-common.h"
 #include "char/char.h"
 #include "qemu/timer.h"
-#include "irq.h"
+#include "hw/irq.h"
 #include "bt/bt.h"
-#include "bt.h"
+#include "hw/bt.h"
 
 struct csrhci_s {
     int enable;

diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index 69d2c73862c3c6a1492d7f86274f7255d7fa3e14..a76edea2c910ebedc692bbae515206774140d455 100644 (file)
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -20,9 +20,9 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "usb.h"
+#include "hw/usb.h"
 #include "bt/bt.h"
-#include "bt.h"
+#include "hw/bt.h"
 
 struct bt_hci_s {
     uint8_t *(*evt_packet)(void *opaque);

diff --git a/hw/bt-hid.c b/hw/bt-hid.c
index cfa7c145b88075526d01b851742ebe229058a324..69ccf9b4329e48cbe83f7f8f1e97e25df0b07eaa 100644 (file)
--- a/hw/bt-hid.c
+++ b/hw/bt-hid.c
@@ -21,8 +21,8 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "ui/console.h"
-#include "hid.h"
-#include "bt.h"
+#include "hw/hid.h"
+#include "hw/bt.h"
 
 enum hid_transaction_req {
     BT_HANDSHAKE                       = 0x0,

diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c
index ba061c0da32762297fe23fbe8ca04c19157a3833..521587a1120a822ac20abc26211fa0683f92b079 100644 (file)
--- a/hw/bt-l2cap.c
+++ b/hw/bt-l2cap.c
@@ -19,7 +19,7 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "bt.h"
+#include "hw/bt.h"
 
 #define L2CAP_CID_MAX  0x100   /* Between 0x40 and 0x10000 */
 

diff --git a/hw/bt-sdp.c b/hw/bt-sdp.c
index c0431d1a40ad98399146c032293e0aa31cfc03fb..218e075df75f6593c85d53dcf30877b608914b9d 100644 (file)
--- a/hw/bt-sdp.c
+++ b/hw/bt-sdp.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu-common.h"
-#include "bt.h"
+#include "hw/bt.h"
 
 struct bt_l2cap_sdp_state_s {
     struct bt_l2cap_conn_params_s *channel;

diff --git a/hw/bt.c b/hw/bt.c
index 4f2372d7943b7046473546ad351da2917e8105b5..24ef4de49d15adc460f1f916b29cd694324e2e41 100644 (file)
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -19,7 +19,7 @@
 
 #include "qemu-common.h"
 #include "bt/bt.h"
-#include "bt.h"
+#include "hw/bt.h"
 
 /* Slave implementations can ignore this */
 static void bt_dummy_lmp_mode_change(struct bt_link_s *link)

diff --git a/hw/cadence_gem.c b/hw/cadence_gem.c
index de7d15ab76767c1ca0ad23c13af26715202a5ec9..e177057e4980808dfd9dadca7c9acc4381acd0a8 100644 (file)
--- a/hw/cadence_gem.c
+++ b/hw/cadence_gem.c
@@ -24,7 +24,7 @@
 
 #include <zlib.h> /* For crc32 */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
 #include "net/checksum.h"
 

diff --git a/hw/cadence_ttc.c b/hw/cadence_ttc.c
index 67028a3f75694c7ef771c9e50386cacf276f1f5a..ba584f47190a78e4489d974ea3d3d0ca0e092942 100644 (file)
--- a/hw/cadence_ttc.c
+++ b/hw/cadence_ttc.c
@@ -16,7 +16,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 
 #ifdef CADENCE_TTC_ERR_DEBUG

diff --git a/hw/cadence_uart.c b/hw/cadence_uart.c
index 5766d38f13ce50e6b4ad6f73c2aae95583ee650a..5426f1001896eecbd58ddbd167594bfd95fc9189 100644 (file)
--- a/hw/cadence_uart.c
+++ b/hw/cadence_uart.c
@@ -16,7 +16,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "char/char.h"
 #include "qemu/timer.h"
 

diff --git a/hw/cbus.c b/hw/cbus.c
index 6fd39054486956f3b5f17b46f30aac011f8dbf4f..29b467b61fdb928d2bec56dc7a757447e60bc0c8 100644 (file)
--- a/hw/cbus.c
+++ b/hw/cbus.c
@@ -21,8 +21,8 @@
  */
 
 #include "qemu-common.h"
-#include "irq.h"
-#include "devices.h"
+#include "hw/irq.h"
+#include "hw/devices.h"
 #include "sysemu/sysemu.h"
 
 //#define DEBUG

diff --git a/hw/ccid.h b/hw/ccid.h
index 6adc745a6d1f250ccb85ca4a178572f2897177a2..9334da8acd004a9546572e9928af762afc2b55a3 100644 (file)
--- a/hw/ccid.h
+++ b/hw/ccid.h
@@ -10,7 +10,7 @@
 #ifndef CCID_H
 #define CCID_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 
 typedef struct CCIDCardState CCIDCardState;
 typedef struct CCIDCardInfo CCIDCardInfo;

diff --git a/hw/cdrom.c b/hw/cdrom.c
index 3b99535dcebc3e005811ce1500cbd2d2e2bfb523..a018eec40aa898facb230a97d308f6d16d6f18c8 100644 (file)
--- a/hw/cdrom.c
+++ b/hw/cdrom.c
@@ -26,7 +26,7 @@
    here.  */
 
 #include "qemu-common.h"
-#include "scsi.h"
+#include "hw/scsi.h"
 
 static void lba_to_msf(uint8_t *buf, int lba)
 {

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 2a2c8dad628cf77f845301b0e43d082b154274e3..7babcb67c84ef07e0b25cad39328c2c41a1a7869 100644 (file)
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -26,11 +26,11 @@
  * Reference: Finn Thogersons' VGADOC4b
  *   available at http://home.worldonline.dk/~finth/
  */
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 #include "ui/console.h"
-#include "vga_int.h"
-#include "loader.h"
+#include "hw/vga_int.h"
+#include "hw/loader.h"
 
 /*
  * TODO:
@@ -288,63 +288,63 @@ static void cirrus_bitblt_fill_nop(CirrusVGAState *s,
 
 #define ROP_NAME 0
 #define ROP_FN(d, s) 0
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src_and_dst
 #define ROP_FN(d, s) (s) & (d)
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src_and_notdst
 #define ROP_FN(d, s) (s) & (~(d))
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME notdst
 #define ROP_FN(d, s) ~(d)
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src
 #define ROP_FN(d, s) s
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME 1
 #define ROP_FN(d, s) ~0
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME notsrc_and_dst
 #define ROP_FN(d, s) (~(s)) & (d)
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src_xor_dst
 #define ROP_FN(d, s) (s) ^ (d)
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src_or_dst
 #define ROP_FN(d, s) (s) | (d)
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME notsrc_or_notdst
 #define ROP_FN(d, s) (~(s)) | (~(d))
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src_notxor_dst
 #define ROP_FN(d, s) ~((s) ^ (d))
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME src_or_notdst
 #define ROP_FN(d, s) (s) | (~(d))
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME notsrc
 #define ROP_FN(d, s) (~(s))
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME notsrc_or_dst
 #define ROP_FN(d, s) (~(s)) | (d)
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 #define ROP_NAME notsrc_and_notdst
 #define ROP_FN(d, s) (~(s)) & (~(d))
-#include "cirrus_vga_rop.h"
+#include "hw/cirrus_vga_rop.h"
 
 static const cirrus_bitblt_rop_t cirrus_fwd_rop[16] = {
     cirrus_bitblt_rop_fwd_0,
@@ -2165,13 +2165,13 @@ static void cirrus_cursor_invalidate(VGACommonState *s1)
 }
 
 #define DEPTH 8
-#include "cirrus_vga_template.h"
+#include "hw/cirrus_vga_template.h"
 
 #define DEPTH 16
-#include "cirrus_vga_template.h"
+#include "hw/cirrus_vga_template.h"
 
 #define DEPTH 32
-#include "cirrus_vga_template.h"
+#include "hw/cirrus_vga_template.h"
 
 static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y)
 {

diff --git a/hw/cirrus_vga_rop.h b/hw/cirrus_vga_rop.h
index 9c7bb092862cc5f9a49b9a3d22f82a0336af1387..894610cc22349a56b3fe7ab3a637159bb5761ea2 100644 (file)
--- a/hw/cirrus_vga_rop.h
+++ b/hw/cirrus_vga_rop.h
@@ -191,16 +191,16 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_16)(CirrusVGAState *s,
 }
 
 #define DEPTH 8
-#include "cirrus_vga_rop2.h"
+#include "hw/cirrus_vga_rop2.h"
 
 #define DEPTH 16
-#include "cirrus_vga_rop2.h"
+#include "hw/cirrus_vga_rop2.h"
 
 #define DEPTH 24
-#include "cirrus_vga_rop2.h"
+#include "hw/cirrus_vga_rop2.h"
 
 #define DEPTH 32
-#include "cirrus_vga_rop2.h"
+#include "hw/cirrus_vga_rop2.h"
 
 #undef ROP_NAME
 #undef ROP_OP

diff --git a/hw/collie.c b/hw/collie.c
index d19db590febf8189681e15de72b15a0628b0fe5c..17fddc8d5b08a4df102a325e71149723260de135 100644 (file)
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -8,13 +8,13 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "sysbus.h"
-#include "boards.h"
-#include "devices.h"
-#include "strongarm.h"
-#include "arm-misc.h"
-#include "flash.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
+#include "hw/boards.h"
+#include "hw/devices.h"
+#include "hw/strongarm.h"
+#include "hw/arm-misc.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/cris-boot.c b/hw/cris-boot.c
index b21326fadeda9f8e4810e00a67292755100af9a5..c330e22a86cb387ded7e2a1443812d3c275f51a3 100644 (file)
--- a/hw/cris-boot.c
+++ b/hw/cris-boot.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "loader.h"
+#include "hw/hw.h"
+#include "hw/loader.h"
 #include "elf.h"
-#include "cris-boot.h"
+#include "hw/cris-boot.h"
 
 static void main_cpu_reset(void *opaque)
 {

diff --git a/hw/cris_pic_cpu.c b/hw/cris_pic_cpu.c
index 3da0e86536669c6b9aaee841a90366cf0e620cbf..7f50471e53c7d2766b81a5a3b85d6202548b0f7f 100644 (file)
--- a/hw/cris_pic_cpu.c
+++ b/hw/cris_pic_cpu.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
-#include "etraxfs.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/etraxfs.h"
 
 #define D(x)
 

diff --git a/hw/cs4231.c b/hw/cs4231.c
index ae384b90fd2f1d8c635850555ed3e0db2038716f..29753360579024016c51c6dbe9ed26abf3d1c4b6 100644 (file)
--- a/hw/cs4231.c
+++ b/hw/cs4231.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 /*

diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 73f08594bf468ea616d24c6bc61e09e7a5590fc5..f005f2589918176e29ce6fee95f77322e59b8b52 100644 (file)
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "audiodev.h"
+#include "hw/hw.h"
+#include "hw/audiodev.h"
 #include "audio/audio.h"
-#include "isa.h"
-#include "qdev.h"
+#include "hw/isa.h"
+#include "hw/qdev.h"
 #include "qemu/timer.h"
 
 /*

diff --git a/hw/cuda.c b/hw/cuda.c
index b36c53527ab03c4137d6f96d9e9b677e20903e1e..2ae430d326e3e9382fae3a69d609de231143ec5f 100644 (file)
--- a/hw/cuda.c
+++ b/hw/cuda.c
@@ -22,9 +22,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc/mac.h"
-#include "adb.h"
+#include "hw/hw.h"
+#include "hw/ppc/mac.h"
+#include "hw/adb.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/dataplane/event-poll.c b/hw/dataplane/event-poll.c
index 2b55c6e255e5b28a6add7c22eebbc9b6ac67e41e..b98acf9aecb10a579fff094ded009f5d2c6d37e9 100644 (file)
--- a/hw/dataplane/event-poll.c
+++ b/hw/dataplane/event-poll.c
@@ -13,7 +13,7 @@
  */
 
 #include <sys/epoll.h>
-#include "hw/dataplane/event-poll.h"
+#include "event-poll.h"
 
 /* Add an event notifier and its callback for polling */
 void event_poll_add(EventPoll *poll, EventHandler *handler,

diff --git a/hw/dataplane/ioq.c b/hw/dataplane/ioq.c
index 0c9f5c4d6082a42e89c6df972cb8aeafbe0d6864..f709f87ed630b1f598e0da834f626c6eea3f9816 100644 (file)
--- a/hw/dataplane/ioq.c
+++ b/hw/dataplane/ioq.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include "hw/dataplane/ioq.h"
+#include "ioq.h"
 
 void ioq_init(IOQueue *ioq, int fd, unsigned int max_reqs)
 {

diff --git a/hw/dataplane/virtio-blk.c b/hw/dataplane/virtio-blk.c
index 8588f931144c41f89eef2ff0c94ac92b9e6f3352..8319c94b766e979821a43389856ceeb1428bd89a 100644 (file)
--- a/hw/dataplane/virtio-blk.c
+++ b/hw/dataplane/virtio-blk.c
@@ -22,7 +22,7 @@
 #include "migration/migration.h"
 #include "block/block.h"
 #include "hw/virtio-blk.h"
-#include "hw/dataplane/virtio-blk.h"
+#include "virtio-blk.h"
 
 enum {
     SEG_MAX = 126,                  /* maximum number of I/O segments */

diff --git a/hw/dataplane/vring.c b/hw/dataplane/vring.c
index eff5ad88317f633918fef9b749535483aad65f5c..e3b225315ff99353dadece9055a36ecb595737da 100644 (file)
--- a/hw/dataplane/vring.c
+++ b/hw/dataplane/vring.c
@@ -15,7 +15,7 @@
  */
 
 #include "trace.h"
-#include "hw/dataplane/vring.h"
+#include "vring.h"
 #include "qemu/error-report.h"
 
 /* Map the guest's vring to host memory */

diff --git a/hw/dataplane/vring.h b/hw/dataplane/vring.h
index 3274f623f5267bba0cb4b335f8f54e141b2c7973..defb1efcda4be1cfcbf772025dcf29a27b372b98 100644 (file)
--- a/hw/dataplane/vring.h
+++ b/hw/dataplane/vring.h
@@ -19,7 +19,7 @@
 
 #include <linux/virtio_ring.h>
 #include "qemu-common.h"
-#include "hw/dataplane/hostmem.h"
+#include "hostmem.h"
 #include "hw/virtio.h"
 
 typedef struct {

diff --git a/hw/debugcon.c b/hw/debugcon.c
index 81b2bb00fd0da132f479fa180c069ec8ba01fab5..cab7691b12e4b4af88fa187bffb10150e5dbba73 100644 (file)
--- a/hw/debugcon.c
+++ b/hw/debugcon.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "char/char.h"
-#include "isa.h"
-#include "pc.h"
+#include "hw/isa.h"
+#include "hw/pc.h"
 
 #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon"
 #define ISA_DEBUGCON_DEVICE(obj) \

diff --git a/hw/debugexit.c b/hw/debugexit.c
index c1b489ddcb81ff19165fb84324e68f6181ead71a..ba67a8fb415956add7a1e8b97f1012c5c5b3c4ca 100644 (file)
--- a/hw/debugexit.c
+++ b/hw/debugexit.c
@@ -7,8 +7,8 @@
  * (at your option) any later version.
  */
 
-#include "hw.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
 
 #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit"
 #define ISA_DEBUG_EXIT_DEVICE(obj) \

diff --git a/hw/dec_pci.c b/hw/dec_pci.c
index ee3f4ca834400137855a6998a8cfe61546b6a8e6..64a50924f6bf356b74fdc72a621869fcb13f41b7 100644 (file)
--- a/hw/dec_pci.c
+++ b/hw/dec_pci.c
@@ -23,12 +23,12 @@
  * THE SOFTWARE.
  */
 
-#include "dec_pci.h"
-#include "sysbus.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
-#include "pci/pci_bridge.h"
-#include "pci/pci_bus.h"
+#include "hw/dec_pci.h"
+#include "hw/sysbus.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/pci/pci_bridge.h"
+#include "hw/pci/pci_bus.h"
 
 /* debug DEC */
 //#define DEBUG_DEC

diff --git a/hw/dma.c b/hw/dma.c
index 5bdf4358e3d31cc15d1adbc86cdb57a63f9b5c64..fd1161ca312c4f8cc01cffb0ab898655c10098cb 100644 (file)
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
 #include "qemu/main-loop.h"
 
 /* #define DEBUG_DMA */

diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index 808157b38b7d8368ee0a1c452b6a42ab79a4deba..8b5ca6a4ece6636bec71106129d353c2fd7df057 100644 (file)
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -17,10 +17,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "net/net.h"
-#include "mips.h"
+#include "hw/mips.h"
 
 //#define DEBUG_SONIC
 

diff --git a/hw/ds1225y.c b/hw/ds1225y.c
index a6219a7908c1cbd701375c9dadf258c470d5fc41..488f1d7241889289f186de2704a42fda3a9f52bb 100644 (file)
--- a/hw/ds1225y.c
+++ b/hw/ds1225y.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 typedef struct {

diff --git a/hw/ds1338.c b/hw/ds1338.c
index 1da0f96fdc300bd25b986e0a06c003a504a7bcc1..ae7ca9f82daaae05f4d671edb714a01ea6897cb3 100644 (file)
--- a/hw/ds1338.c
+++ b/hw/ds1338.c
@@ -10,7 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "i2c.h"
+#include "hw/i2c.h"
 
 /* Size of NVRAM including both the user-accessible area and the
  * secondary register area.

diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 3a88805d0f0ea5e92bcfad0839b87b2919a4d1f5..544d56b59d6df9bdb0b7d11139982ff82a239e8c 100644 (file)
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -6,9 +6,9 @@
  * This code is licensed under the GPL
  */
 
-#include "hw.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/hw.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/e1000.c b/hw/e1000.c
index d6fe815edacf38153b3feb421aa8480acdfb73a6..ed37061563ddb35592c8f775d65c730637df1391 100644 (file)
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -25,15 +25,15 @@
  */
 
 
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 #include "net/net.h"
 #include "net/checksum.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 
-#include "e1000_hw.h"
+#include "hw/e1000_hw.h"
 
 #define E1000_DEBUG
 

diff --git a/hw/ecc.c b/hw/ecc.c
index 60d1f1d4f23c283e74bd786d93b5507d302404a8..8c97c33debd0832cfb5b2f7a71d1281196b93d0c 100644 (file)
--- a/hw/ecc.c
+++ b/hw/ecc.c
@@ -11,8 +11,8 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "flash.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
 
 /*
  * Pre-calculated 256-way 1 byte column parity.  Table borrowed from Linux.

diff --git a/hw/eccmemctl.c b/hw/eccmemctl.c
index dbac2c2bbcce1a6b241ff1fded07c1332df9f63b..6f4a407cbfb847e22882067e26e6b7c6c2dae6e4 100644 (file)
--- a/hw/eccmemctl.c
+++ b/hw/eccmemctl.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 /* There are 3 versions of this chip used in SMP sun4m systems:

diff --git a/hw/eepro100.c b/hw/eepro100.c
index 5d237968e74c890f719a38214f3120a82ee73cc8..68d729c17af4d67b53b5fc348739c99ca68aebe2 100644 (file)
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -41,10 +41,10 @@
  */
 
 #include <stddef.h>             /* offsetof */
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 #include "net/net.h"
-#include "eeprom93xx.h"
+#include "hw/eeprom93xx.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c
index 4c7158d1a59a753bf2eeacfd63c0a7aa75b61355..39f560553d15c22589c513ad840147118a396ef3 100644 (file)
--- a/hw/eeprom93xx.c
+++ b/hw/eeprom93xx.c
@@ -35,8 +35,8 @@
  * - No emulation of EEPROM timings.
  */
 
-#include "hw.h"
-#include "eeprom93xx.h"
+#include "hw/hw.h"
+#include "hw/eeprom93xx.h"
 
 /* Debug EEPROM emulation. */
 //~ #define DEBUG_EEPROM

diff --git a/hw/empty_slot.c b/hw/empty_slot.c
index d7b54973a425a66f3f34d0f93fb6031ccca5669a..5234a4ddc6cbe558333d09cc950049ade1cfd1b8 100644 (file)
--- a/hw/empty_slot.c
+++ b/hw/empty_slot.c
@@ -9,9 +9,9 @@
  * version.
  */
 
-#include "hw.h"
-#include "sysbus.h"
-#include "empty_slot.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
+#include "hw/empty_slot.h"
 
 //#define DEBUG_EMPTY_SLOT
 

diff --git a/hw/es1370.c b/hw/es1370.c
index 977d2e376767de68f8160e11597952e0ecfe6c82..e64cf23099ed695233332fb9d2b2ad72e4665269 100644 (file)
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -26,10 +26,10 @@
 /* #define VERBOSE_ES1370 */
 #define SILENT_ES1370
 
-#include "hw.h"
-#include "audiodev.h"
+#include "hw/hw.h"
+#include "hw/audiodev.h"
 #include "audio/audio.h"
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 
 /* Missing stuff:

diff --git a/hw/escc.c b/hw/escc.c
index 18c02921e3035985e7a0fb8803d59a9f09c168ef..baf02193043bb6e923ec8f960ca753ac91fb61a3 100644 (file)
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "sysbus.h"
-#include "escc.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
+#include "hw/escc.h"
 #include "char/char.h"
 #include "ui/console.h"
 #include "trace.h"

diff --git a/hw/esp-pci.c b/hw/esp-pci.c
index c949e6e0d9e7d3abb16dac545f451606223d2c01..7599b39d8d564b1802bc9666fbb7c8e339b02fcb 100644 (file)
--- a/hw/esp-pci.c
+++ b/hw/esp-pci.c
@@ -23,9 +23,9 @@
  * THE SOFTWARE.
  */
 
-#include "pci/pci.h"
-#include "eeprom93xx.h"
-#include "esp.h"
+#include "hw/pci/pci.h"
+#include "hw/eeprom93xx.h"
+#include "hw/esp.h"
 #include "trace.h"
 #include "qemu/log.h"
 

diff --git a/hw/esp.c b/hw/esp.c
index 2af48aac4bb33a58df77d613fc6eac3c96e4395f..5365eacec0fa7ddde81514bbff33e779fafa6ddc 100644 (file)
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "esp.h"
+#include "hw/sysbus.h"
+#include "hw/esp.h"
 #include "trace.h"
 #include "qemu/log.h"
 

diff --git a/hw/esp.h b/hw/esp.h
index f15cc7b5bdbdaba1cd87257a0d76e314478fffd2..830673be8f33a27aa7779a40017162b4ada1e1db 100644 (file)
--- a/hw/esp.h
+++ b/hw/esp.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_ESP_H
 #define QEMU_HW_ESP_H
 
-#include "scsi.h"
+#include "hw/scsi.h"
 
 /* esp.c */
 #define ESP_MAX_DEVS 7

diff --git a/hw/etraxfs.h b/hw/etraxfs.h
index 180de5a0887bbfd13946173d4d473a6c54438758..0df4fdd2e999253414bf981d66112bdadb29862c 100644 (file)
--- a/hw/etraxfs.h
+++ b/hw/etraxfs.h
@@ -26,7 +26,7 @@
 #define HW_EXTRAXFS_H 1
 
 #include "net/net.h"
-#include "etraxfs_dma.h"
+#include "hw/etraxfs_dma.h"
 
 qemu_irq *cris_pic_init_cpu(CPUCRISState *env);
 

diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index d41500316fbf4c7123ff8ffd04b9985d98d04d52..a84ec1f23ce1286b23b2db9a8058c6ee539636f1 100644 (file)
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -23,12 +23,12 @@
  */
 #include <stdio.h>
 #include <sys/time.h>
-#include "hw.h"
+#include "hw/hw.h"
 #include "exec/address-spaces.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 
-#include "etraxfs_dma.h"
+#include "hw/etraxfs_dma.h"
 
 #define D(x)
 

diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index ad36411193034d00e4c07325636daa74cb367993..591bee245cc5f8b07892d461feed862799aa4ba2 100644 (file)
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -23,9 +23,9 @@
  */
 
 #include <stdio.h>
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
-#include "etraxfs.h"
+#include "hw/etraxfs.h"
 
 #define D(x)
 

diff --git a/hw/etraxfs_pic.c b/hw/etraxfs_pic.c
index 64af31c46e9ab6bb97fc5f2c8484e456c03062c4..635103c00109a1725ec9b3ea5dc60dad5f57ec53 100644 (file)
--- a/hw/etraxfs_pic.c
+++ b/hw/etraxfs_pic.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
 //#include "pc.h"
 //#include "etraxfs.h"
 

diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c
index 72c8868639b7a56f561699756a5fd82a10426ae8..7e24d34230ade124e976edbf9c6f8fb5be25a22d 100644 (file)
--- a/hw/etraxfs_ser.c
+++ b/hw/etraxfs_ser.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "char/char.h"
 #include "qemu/log.h"
 

diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
index d3dac52315c5de2af5df87a4f1fa1d9fcc50fb57..3cd9476bb19885a46426a3ba5767dbc70ad573f5 100644 (file)
--- a/hw/etraxfs_timer.c
+++ b/hw/etraxfs_timer.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 
 #define D(x)
 

diff --git a/hw/exynos4210.c b/hw/exynos4210.c
index fa54e42a478f989d3e1c087e9615d93142dc3dec..4592514bb26a8aaedbfd8ca35bf19a8c61071636 100644 (file)
--- a/hw/exynos4210.c
+++ b/hw/exynos4210.c
@@ -21,13 +21,13 @@
  *
  */
 
-#include "boards.h"
+#include "hw/boards.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "loader.h"
-#include "exynos4210.h"
-#include "usb/hcd-ehci.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/loader.h"
+#include "hw/exynos4210.h"
+#include "hw/usb/hcd-ehci.h"
 
 #define EXYNOS4210_CHIPID_ADDR         0x10000000
 

diff --git a/hw/exynos4210_combiner.c b/hw/exynos4210_combiner.c
index ba644b43c226c267a18733e398ecab99b5eb01e6..5818f101324f239f2091383be24217b3936baa29 100644 (file)
--- a/hw/exynos4210_combiner.c
+++ b/hw/exynos4210_combiner.c
@@ -27,9 +27,9 @@
  * IRQs are passed to GIC through Combiner.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
-#include "exynos4210.h"
+#include "hw/exynos4210.h"
 
 //#define DEBUG_COMBINER
 

diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index 3d498b77f848a27e449e9c0daaa5d354e29a4d4f..6b31ae33b61ff7e82d6eb4755aab777a2eae4262 100644 (file)
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -24,7 +24,7 @@
 
 #include "qemu-common.h"
 #include "exec/cpu-all.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "qemu/bswap.h"

diff --git a/hw/exynos4210_gic.c b/hw/exynos4210_gic.c
index 94b138fa467e3dd080b0f0bc792cafd634938b2f..807849c5741787660ea0aec73b8787154da49f29 100644 (file)
--- a/hw/exynos4210_gic.c
+++ b/hw/exynos4210_gic.c
@@ -20,10 +20,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu-common.h"
-#include "irq.h"
-#include "exynos4210.h"
+#include "hw/irq.h"
+#include "hw/exynos4210.h"
 
 enum ExtGicId {
     EXT_GIC_ID_MDMA_LCD0 = 66,

diff --git a/hw/exynos4210_i2c.c b/hw/exynos4210_i2c.c
index cefd736092d4377abb53984c48d318df99e1a8f2..9e428759a11a0584bdee4b61a612b5a1f4d401eb 100644 (file)
--- a/hw/exynos4210_i2c.c
+++ b/hw/exynos4210_i2c.c
@@ -21,8 +21,8 @@
  */
 
 #include "qemu/timer.h"
-#include "sysbus.h"
-#include "i2c.h"
+#include "hw/sysbus.h"
+#include "hw/i2c.h"
 
 #ifndef EXYNOS4_I2C_DEBUG
 #define EXYNOS4_I2C_DEBUG                 0

diff --git a/hw/exynos4210_mct.c b/hw/exynos4210_mct.c
index d7d5904cc00aea901d2ae43d46116989a678f01f..862c96212bc96f2aec551357f328c319d20aedd1 100644 (file)
--- a/hw/exynos4210_mct.c
+++ b/hw/exynos4210_mct.c
@@ -52,12 +52,12 @@
  * there is no way to avoid frequently events).
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 
-#include "exynos4210.h"
+#include "hw/exynos4210.h"
 
 //#define DEBUG_MCT
 

diff --git a/hw/exynos4210_pmu.c b/hw/exynos4210_pmu.c
index 7c81a1b6283ead7d15ed5e50e69abe9b863feaad..ba5aa8d0e4805efcdd440b7e4b6c5dfa1a16753b 100644 (file)
--- a/hw/exynos4210_pmu.c
+++ b/hw/exynos4210_pmu.c
@@ -24,7 +24,7 @@
  * uses PMU INFORM5 register as a holding pen.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #ifndef DEBUG_PMU
 #define DEBUG_PMU           0

diff --git a/hw/exynos4210_pwm.c b/hw/exynos4210_pwm.c
index c8656248a816bbd67a0578331ceae50608ac86ff..6d74cd4db5fc1131d07fadd88c3bef4488e1311a 100644 (file)
--- a/hw/exynos4210_pwm.c
+++ b/hw/exynos4210_pwm.c
@@ -20,12 +20,12 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 
-#include "exynos4210.h"
+#include "hw/exynos4210.h"
 
 //#define DEBUG_PWM
 

diff --git a/hw/exynos4210_rtc.c b/hw/exynos4210_rtc.c
index 5694a6207b238654eeb104ef41d206eda3a20f24..d170ca755ade22b5eb0b1ce4b91cbdfab80b107c 100644 (file)
--- a/hw/exynos4210_rtc.c
+++ b/hw/exynos4210_rtc.c
@@ -25,16 +25,16 @@
  *  CLKOUTEN Bit[9] not used
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 
-#include "exynos4210.h"
+#include "hw/exynos4210.h"
 
 #define DEBUG_RTC 0
 

diff --git a/hw/exynos4210_uart.c b/hw/exynos4210_uart.c
index bdf797a02915b78455c24c3ddfeb6f6b39e9390c..006f3d44fb1d8108051282a296d2fe5029ed159b 100644 (file)
--- a/hw/exynos4210_uart.c
+++ b/hw/exynos4210_uart.c
@@ -19,11 +19,11 @@
  *
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "char/char.h"
 
-#include "exynos4210.h"
+#include "hw/exynos4210.h"
 
 #undef DEBUG_UART
 #undef DEBUG_UART_EXTEND

diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index b59e6aabf36c15b82dddf08e42b20bfe2e80e66f..473da349bd1d4df8878489f4fc897aa3831bd693 100644 (file)
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -22,12 +22,12 @@
  */
 
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
-#include "arm-misc.h"
+#include "hw/arm-misc.h"
 #include "exec/address-spaces.h"
-#include "exynos4210.h"
-#include "boards.h"
+#include "hw/exynos4210.h"
+#include "hw/boards.h"
 
 #undef DEBUG
 

diff --git a/hw/fdc.c b/hw/fdc.c
index 976a587c42f9976e8cf4b9207723dc5c39d2bf15..a4bb1290effed7aba5151f6c075143960a863758 100644 (file)
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -27,13 +27,13 @@
  * way. There are changes in DOR register and DMA is not available.
  */
 
-#include "hw.h"
-#include "fdc.h"
+#include "hw/hw.h"
+#include "hw/fdc.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
-#include "isa.h"
-#include "sysbus.h"
-#include "qdev-addr.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
+#include "hw/qdev-addr.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"

diff --git a/hw/fmopl.c b/hw/fmopl.c
index f0a023477db5f9074fc822179121ded489ee55ba..e50ba6c0ec06d50262dc40e8a12c8d560fdf1fe3 100644 (file)
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -39,7 +39,7 @@
 #include <stdarg.h>
 #include <math.h>
 //#include "driver.h"          /* use M.A.M.E. */
-#include "fmopl.h"
+#include "hw/fmopl.h"
 
 #ifndef PI
 #define PI 3.14159265358979323846

diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index 2a870961bc965155de650e81773c21a272a60648..d341aa0c6b8c9eb1659f05e99a90803b91ac7cec 100644 (file)
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -17,9 +17,9 @@
    - Remove all DisplayState knowledge from devices.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "framebuffer.h"
+#include "hw/framebuffer.h"
 
 /* Render an image from a shared memory framebuffer.  */
    

diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 02618f248002e899e5bc3b82aa9f5b382e85cb50..63a199876cfe39412576af61acf7d514f563cb72 100644 (file)
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/sysemu.h"
-#include "isa.h"
-#include "fw_cfg.h"
-#include "sysbus.h"
+#include "hw/isa.h"
+#include "hw/fw_cfg.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"

diff --git a/hw/g364fb.c b/hw/g364fb.c
index 0c0c8ba3028e01c07e661a75e4e96120c6abef84..7b69815bc980f5a06091bd2aedcf91319b8d1dd5 100644 (file)
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -17,11 +17,11 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 typedef struct G364State {
     /* hardware */

diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c
index 95639d5735d34d2b4551f4442a1f5227c26e7c88..11e47d560e6e2eaaddd8f48b065fb1019a25f911 100644 (file)
--- a/hw/grackle_pci.c
+++ b/hw/grackle_pci.c
@@ -23,9 +23,9 @@
  * THE SOFTWARE.
  */
 
-#include "pci/pci_host.h"
-#include "ppc/mac.h"
-#include "pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/ppc/mac.h"
+#include "hw/pci/pci.h"
 
 /* debug Grackle */
 //#define DEBUG_GRACKLE

diff --git a/hw/grlib.h b/hw/grlib.h
index afd53892b05172a050feed7b205e36cdc760029a..470ce722506b1da5948506c4a2d0affa062129a8 100644 (file)
--- a/hw/grlib.h
+++ b/hw/grlib.h
@@ -25,8 +25,8 @@
 #ifndef _GRLIB_H_
 #define _GRLIB_H_
 
-#include "qdev.h"
-#include "sysbus.h"
+#include "hw/qdev.h"
+#include "hw/sysbus.h"
 
 /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual:
  * http://www.gaisler.com/products/grlib/grip.pdf

diff --git a/hw/grlib_apbuart.c b/hw/grlib_apbuart.c
index ba1685afd1946ce4b2d8f1c7dd360e805df0f3d4..62f799083c8ad0874cc8e0d1342b8a70b0370155 100644 (file)
--- a/hw/grlib_apbuart.c
+++ b/hw/grlib_apbuart.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "char/char.h"
 
 #include "trace.h"

diff --git a/hw/grlib_gptimer.c b/hw/grlib_gptimer.c
index 7962b74f2c430a1b107c23bd9551868b08fb70ac..7043a346843f52d359e0cacba652f55d7e3db678 100644 (file)
--- a/hw/grlib_gptimer.c
+++ b/hw/grlib_gptimer.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 
 #include "trace.h"
 

diff --git a/hw/grlib_irqmp.c b/hw/grlib_irqmp.c
index ef8dd95ac9bd222a8f02b4f6851a38c2b3b26fe0..7ee469d1911ba9c15688acef210f632db77baca8 100644 (file)
--- a/hw/grlib_irqmp.c
+++ b/hw/grlib_irqmp.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "cpu.h"
 
-#include "grlib.h"
+#include "hw/grlib.h"
 
 #include "trace.h"
 

diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 977a2c5e692e1f6e310067073e921754fcfd9a4f..c73a58a04518bd01cb1c42f3c54ed501dcb70be2 100644 (file)
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -22,11 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "mips.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
-#include "pc.h"
+#include "hw/hw.h"
+#include "hw/mips.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/pc.h"
 #include "exec/address-spaces.h"
 
 //#define DEBUG

diff --git a/hw/gumstix.c b/hw/gumstix.c
index bea16058f713771f29c804c9964c26a01c565a14..8859b7392fe70d9bc381338da83b3291705d3da9 100644 (file)
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -34,12 +34,12 @@
  * # qemu-system-arm -M verdex -pflash flash -monitor null -nographic -m 289
  */
 
-#include "hw.h"
-#include "pxa.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
 #include "net/net.h"
-#include "flash.h"
-#include "devices.h"
-#include "boards.h"
+#include "hw/flash.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/gus.c b/hw/gus.c
index aa13fccf0d530a796179c57a89d3568ab6118201..d2682249ca5031763a312c69a70ede06a56b923c 100644 (file)
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "audiodev.h"
+#include "hw/hw.h"
+#include "hw/audiodev.h"
 #include "audio/audio.h"
-#include "isa.h"
-#include "gusemu.h"
-#include "gustate.h"
+#include "hw/isa.h"
+#include "hw/gusemu.h"
+#include "hw/gustate.h"
 
 #define dolog(...) AUD_log ("audio", __VA_ARGS__)
 #ifdef DEBUG

diff --git a/hw/gusemu_hal.c b/hw/gusemu_hal.c
index 60966907351c8590f262ca6079665a0516424c25..0eee6176529c8c674079874f89ddf58481196365 100644 (file)
--- a/hw/gusemu_hal.c
+++ b/hw/gusemu_hal.c
@@ -26,8 +26,8 @@
  * TODO: check mixer: see 7.20 of sdk for panning pos (applies to all gus models?)?
  */
 
-#include "gustate.h"
-#include "gusemu.h"
+#include "hw/gustate.h"
+#include "hw/gusemu.h"
 
 #define GUSregb(position) (*            (gusptr+(position)))
 #define GUSregw(position) (*(GUSword *) (gusptr+(position)))

diff --git a/hw/gusemu_mixer.c b/hw/gusemu_mixer.c
index 6d8d9ced1178c2bcf0ec9ace96f4f6c200c77c2b..816c58a7ed76eef33cf4c0356492de575190cafc 100644 (file)
--- a/hw/gusemu_mixer.c
+++ b/hw/gusemu_mixer.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "gusemu.h"
-#include "gustate.h"
+#include "hw/gusemu.h"
+#include "hw/gustate.h"
 
 #define GUSregb(position)  (*            (gusptr+(position)))
 #define GUSregw(position)  (*(GUSword *) (gusptr+(position)))

diff --git a/hw/hda-audio.c b/hw/hda-audio.c
index 3190bd1cf840e5b328427fd772b2dd0037720422..6bdd8209fb963620523d3c49e1fd20c964f7f50f 100644 (file)
--- a/hw/hda-audio.c
+++ b/hw/hda-audio.c
@@ -17,10 +17,10 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "pci/pci.h"
-#include "intel-hda.h"
-#include "intel-hda-defs.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/intel-hda.h"
+#include "hw/intel-hda-defs.h"
 #include "audio/audio.h"
 
 /* -------------------------------------------------------------------------- */

diff --git a/hw/heathrow_pic.c b/hw/heathrow_pic.c
index c0a71c3d5f201d665f030e6ad30967c81c7ea238..beb966118249b838758e0bfde1486b78737172eb 100644 (file)
--- a/hw/heathrow_pic.c
+++ b/hw/heathrow_pic.c
@@ -22,8 +22,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc/mac.h"
+#include "hw/hw.h"
+#include "hw/ppc/mac.h"
 
 /* debug PIC */
 //#define DEBUG_PIC

diff --git a/hw/hid.c b/hw/hid.c
index 89b5415c0fefcafa9ffd185a287c8f75cd8d21ff..28b34747ff82c4c772fc3d4d455a6bc7de472d96 100644 (file)
--- a/hw/hid.c
+++ b/hw/hid.c
@@ -22,10 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
 #include "qemu/timer.h"
-#include "hid.h"
+#include "hw/hid.h"
 
 #define HID_USAGE_ERROR_ROLLOVER        0x01
 #define HID_USAGE_POSTFAIL              0x02

diff --git a/hw/highbank.c b/hw/highbank.c
index defcc092b4cf9d56c5a159a6c98c58433656bdae..a622224dccedda7b589f7fbde28d73b9f00cf05a 100644 (file)
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -17,14 +17,14 @@
  *
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "devices.h"
-#include "loader.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
+#include "hw/loader.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "sysbus.h"
+#include "hw/boards.h"
+#include "hw/sysbus.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/hpet.c b/hw/hpet.c
index 97eaa2f700a16c39df87d7610ee374a6fcb62641..6bfbf3a68ca69bd22d84709323b63796f9c1705e 100644 (file)
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -24,14 +24,14 @@
  * This driver attempts to emulate an HPET device in software.
  */
 
-#include "hw.h"
-#include "pc.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
 #include "ui/console.h"
 #include "qemu/timer.h"
-#include "hpet_emul.h"
-#include "sysbus.h"
-#include "mc146818rtc.h"
-#include "i8254.h"
+#include "hw/hpet_emul.h"
+#include "hw/sysbus.h"
+#include "hw/mc146818rtc.h"
+#include "hw/i8254.h"
 
 //#define HPET_DEBUG
 #ifdef HPET_DEBUG

diff --git a/hw/hw.h b/hw/hw.h
index dfced97bbc1ce605cd5b2b6b8e1b0e272e879b21..1553e54aa740dce645aeeef49f4892a0e3a060cd 100644 (file)
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -9,7 +9,7 @@
 #endif
 
 #include "exec/ioport.h"
-#include "irq.h"
+#include "hw/irq.h"
 #include "block/aio.h"
 #include "migration/qemu-file.h"
 #include "migration/vmstate.h"

diff --git a/hw/i2c.c b/hw/i2c.c
index ec314a40d1f2467f3f630c196094bd11bf730384..ad361cc57f98809dc6867971153c19ebcf7e1ba7 100644 (file)
--- a/hw/i2c.c
+++ b/hw/i2c.c
@@ -7,7 +7,7 @@
  * This code is licensed under the LGPL.
  */
 
-#include "i2c.h"
+#include "hw/i2c.h"
 
 struct i2c_bus
 {

diff --git a/hw/i2c.h b/hw/i2c.h
index 0e80d5a9cbd25a394f30a99510d4da41447b0e08..461392f3745c8f27c6567749ba7707a58f659654 100644 (file)
--- a/hw/i2c.h
+++ b/hw/i2c.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_I2C_H
 #define QEMU_I2C_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 
 /* The QEMU I2C implementation only supports simple transfers that complete
    immediately.  It does not support slave devices that need to be able to

diff --git a/hw/i82374.c b/hw/i82374.c
index 6a62ba2ab8856be438e5086ace78c3e1ed931d7b..22115e4fcf4a6d2efef4385e755ee892660830ff 100644 (file)
--- a/hw/i82374.c
+++ b/hw/i82374.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "isa.h"
+#include "hw/isa.h"
 
 //#define DEBUG_I82374
 

diff --git a/hw/i82378.c b/hw/i82378.c
index 0914d7bbfb6c87cce58efcedaaee57e92557074f..6f8c48b9aedfc7c0243b8cd7c85118a01ba96cd5 100644 (file)
--- a/hw/i82378.c
+++ b/hw/i82378.c
@@ -17,10 +17,10 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pci/pci.h"
-#include "pc.h"
-#include "i8254.h"
-#include "pcspk.h"
+#include "hw/pci/pci.h"
+#include "hw/pc.h"
+#include "hw/i8254.h"
+#include "hw/pcspk.h"
 
 //#define DEBUG_I82378
 

diff --git a/hw/i8254.c b/hw/i8254.c
index 394b2e81d760695a91b4e27d3308ae1ac99cb397..67bfc6a80668f406c2c7d38f77a8623b8ce7695f 100644 (file)
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
 #include "qemu/timer.h"
-#include "i8254.h"
-#include "i8254_internal.h"
+#include "hw/i8254.h"
+#include "hw/i8254_internal.h"
 
 //#define DEBUG_PIT
 

diff --git a/hw/i8254.h b/hw/i8254.h
index ba6b598a9988a3c31b21984fc3240595725d9e1d..7d4432e72270a0c14dca41162152272a1676ce7f 100644 (file)
--- a/hw/i8254.h
+++ b/hw/i8254.h
@@ -25,8 +25,8 @@
 #ifndef HW_I8254_H
 #define HW_I8254_H
 
-#include "hw.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
 
 #define PIT_FREQ 1193182
 

diff --git a/hw/i8254_common.c b/hw/i8254_common.c
index 8c2e45a92e788ad1173524d451040a6aa12640e8..c6c0c80c248e87ecb547709337d9a52e246d1713 100644 (file)
--- a/hw/i8254_common.c
+++ b/hw/i8254_common.c
@@ -22,12 +22,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
 #include "qemu/timer.h"
-#include "i8254.h"
-#include "i8254_internal.h"
+#include "hw/i8254.h"
+#include "hw/i8254_internal.h"
 
 /* val must be 0 or 1 */
 void pit_set_gate(ISADevice *dev, int channel, int val)

diff --git a/hw/i8254_internal.h b/hw/i8254_internal.h
index 686f0c2ba9db225665a97695415d8b1bca345a29..30d5b1b95018714c1f539e2667e58a64e45db6bc 100644 (file)
--- a/hw/i8254_internal.h
+++ b/hw/i8254_internal.h
@@ -25,9 +25,9 @@
 #ifndef QEMU_I8254_INTERNAL_H
 #define QEMU_I8254_INTERNAL_H
 
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
 
 typedef struct PITChannelState {
     int count; /* can be 65536 */

diff --git a/hw/i8259.c b/hw/i8259.c
index 54fe14447b767d9a0a0795021dc2aaa12ecebe16..1d8275232abc778147f741ff5116d964d1ef8a17 100644 (file)
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
 #include "monitor/monitor.h"
 #include "qemu/timer.h"
-#include "i8259_internal.h"
+#include "hw/i8259_internal.h"
 
 /* debug PIC */
 //#define DEBUG_PIC

diff --git a/hw/i8259_common.c b/hw/i8259_common.c
index fc91056afbf8e01cda6e3dde468ec832a7591233..98052db1fa261d201ac3f40d2cbae25f77d4aecf 100644 (file)
--- a/hw/i8259_common.c
+++ b/hw/i8259_common.c
@@ -22,8 +22,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "pc.h"
-#include "i8259_internal.h"
+#include "hw/pc.h"
+#include "hw/i8259_internal.h"
 
 void pic_reset_common(PICCommonState *s)
 {

diff --git a/hw/i8259_internal.h b/hw/i8259_internal.h
index 8785b1da3fd391d849fbd3cf1308d5ee25d8fe2f..2813ec1baa00f5691b5e72b36f9bb5d78a031199 100644 (file)
--- a/hw/i8259_internal.h
+++ b/hw/i8259_internal.h
@@ -25,9 +25,9 @@
 #ifndef QEMU_I8259_INTERNAL_H
 #define QEMU_I8259_INTERNAL_H
 
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
 
 typedef struct PICCommonState PICCommonState;
 

diff --git a/hw/i82801b11.c b/hw/i82801b11.c
index 3dc10000a447966bc068bd1cda8335b188022d32..992095c80fcd24749258271eb9e7d344511bd1e5 100644 (file)
--- a/hw/i82801b11.c
+++ b/hw/i82801b11.c
@@ -41,8 +41,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
-#include "pci/pci.h"
-#include "ich9.h"
+#include "hw/pci/pci.h"
+#include "hw/ich9.h"
 
 
 /*****************************************************************************/

diff --git a/hw/ich9.h b/hw/ich9.h
index d4509bb60670176f907b75a5ae2cf0a40383d8d6..59c25e9aa043c0c5d94035655b4e41fcd29bc3af 100644 (file)
--- a/hw/ich9.h
+++ b/hw/ich9.h
@@ -1,20 +1,20 @@
 #ifndef HW_ICH9_H
 #define HW_ICH9_H
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/range.h"
-#include "isa.h"
-#include "sysbus.h"
-#include "pc.h"
-#include "apm.h"
-#include "ioapic.h"
-#include "pci/pci.h"
-#include "pci/pcie_host.h"
-#include "pci/pci_bridge.h"
-#include "acpi.h"
-#include "acpi_ich9.h"
-#include "pam.h"
-#include "pci/pci_bus.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
+#include "hw/pc.h"
+#include "hw/apm.h"
+#include "hw/ioapic.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pcie_host.h"
+#include "hw/pci/pci_bridge.h"
+#include "hw/acpi.h"
+#include "hw/acpi_ich9.h"
+#include "hw/pam.h"
+#include "hw/pci/pci_bus.h"
 
 void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
 int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);

diff --git a/hw/ide.h b/hw/ide.h
index 0eb3a744676bd71c2cfddacd25885f60026301b5..35444a39f94c21e4ab93760d3d2a3ad2750ad774 100644 (file)
--- a/hw/ide.h
+++ b/hw/ide.h
@@ -1,8 +1,8 @@
 #ifndef HW_IDE_H
 #define HW_IDE_H
 
-#include "isa.h"
-#include "pci/pci.h"
+#include "hw/isa.h"
+#include "hw/pci/pci.h"
 #include "exec/memory.h"
 
 #define MAX_IDE_DEVS   2

diff --git a/hw/imx_avic.c b/hw/imx_avic.c
index f1f066cf9c7667d44010c869404bce6438f3aa86..4e280b6ab98886edcfaa4e21c5703cc6ba055c24 100644 (file)
--- a/hw/imx_avic.c
+++ b/hw/imx_avic.c
@@ -14,8 +14,8 @@
  * TODO: implement vectors.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "qemu/host-utils.h"
 
 #define DEBUG_INT 1

diff --git a/hw/imx_ccm.c b/hw/imx_ccm.c
index 477903a5467fd81e0f4311e7d49085026bd0b769..ad7aad339747356c01a067009099555f63acaedf 100644 (file)
--- a/hw/imx_ccm.c
+++ b/hw/imx_ccm.c
@@ -10,10 +10,10 @@
  * the CCM.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
-#include "imx.h"
+#include "hw/imx.h"
 
 #define CKIH_FREQ 26000000 /* 26MHz crystal input */
 #define CKIL_FREQ    32768 /* nominal 32khz clock */

diff --git a/hw/imx_serial.c b/hw/imx_serial.c
index 2d8253e0ee0f6b8e788eba693aa9b6027571aa5c..746723cd6e7cbd38dbeba0d96183f4eb4c7bd54e 100644 (file)
--- a/hw/imx_serial.c
+++ b/hw/imx_serial.c
@@ -17,11 +17,11 @@
  *     is a real serial device.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "char/char.h"
-#include "imx.h"
+#include "hw/imx.h"
 
 //#define DEBUG_SERIAL 1
 #ifdef DEBUG_SERIAL

diff --git a/hw/imx_timer.c b/hw/imx_timer.c
index e924c747c542b4cc8cef0b82175b155b3ed5e003..a8c311141e9caa1459786ab4a654aeaa32766672 100644 (file)
--- a/hw/imx_timer.c
+++ b/hw/imx_timer.c
@@ -11,11 +11,11 @@
  *
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
-#include "sysbus.h"
-#include "imx.h"
+#include "hw/ptimer.h"
+#include "hw/sysbus.h"
+#include "hw/imx.h"
 
 //#define DEBUG_TIMER 1
 #ifdef DEBUG_TIMER

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 9e3630a43de5a02fe65449f74e9d6e688fa748dd..e0ba327a5545d249eee94ec03afff9725fe38c26 100644 (file)
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -7,10 +7,10 @@
  * This code is licensed under the GPL
  */
 
-#include "sysbus.h"
-#include "devices.h"
-#include "boards.h"
-#include "arm-misc.h"
+#include "hw/sysbus.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/arm-misc.h"
 #include "net/net.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 784c229d8f68fd4d3631ac58f63ea7d50358ad2e..728b60fb9a7468ea80dfa6e57d70a6c69b12d48f 100644 (file)
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -17,13 +17,13 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "pci/pci.h"
-#include "pci/msi.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/msi.h"
 #include "qemu/timer.h"
-#include "audiodev.h"
-#include "intel-hda.h"
-#include "intel-hda-defs.h"
+#include "hw/audiodev.h"
+#include "hw/intel-hda.h"
+#include "hw/intel-hda-defs.h"
 #include "sysemu/dma.h"
 
 /* --------------------------------------------------------------------- */

diff --git a/hw/intel-hda.h b/hw/intel-hda.h
index 22e0968d50a762ea123192eb7ca446443082e047..2544f0a34484427148db9c1502178cb761de61d3 100644 (file)
--- a/hw/intel-hda.h
+++ b/hw/intel-hda.h
@@ -1,7 +1,7 @@
 #ifndef HW_INTEL_HDA_H
 #define HW_INTEL_HDA_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 
 /* --------------------------------------------------------------------- */
 /* hda bus                                                               */

diff --git a/hw/ioapic.c b/hw/ioapic.c
index f06c2dcf2e8a2592e90f6fb8cb4b2db80145d230..78629fac6cc054bb855623feee0efbad6504914e 100644 (file)
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -20,11 +20,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "apic.h"
-#include "ioapic.h"
-#include "ioapic_internal.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/apic.h"
+#include "hw/ioapic.h"
+#include "hw/ioapic_internal.h"
 
 //#define DEBUG_IOAPIC
 

diff --git a/hw/ioapic_common.c b/hw/ioapic_common.c
index 7dc552f033c976e28af86299eb1c47c618be5bde..d4aff2954468e4dba475d55cf3c31b77e7ce9b26 100644 (file)
--- a/hw/ioapic_common.c
+++ b/hw/ioapic_common.c
@@ -19,9 +19,9 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ioapic.h"
-#include "ioapic_internal.h"
-#include "sysbus.h"
+#include "hw/ioapic.h"
+#include "hw/ioapic_internal.h"
+#include "hw/sysbus.h"
 
 void ioapic_reset_common(DeviceState *dev)
 {

diff --git a/hw/ioapic_internal.h b/hw/ioapic_internal.h
index c8447d7f3ba8d15bcae38c9d1fbc2bd71100276a..25576c819e5bb7b63f6f17c2f91954fc05000760 100644 (file)
--- a/hw/ioapic_internal.h
+++ b/hw/ioapic_internal.h
@@ -22,9 +22,9 @@
 #ifndef QEMU_IOAPIC_INTERNAL_H
 #define QEMU_IOAPIC_INTERNAL_H
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "exec/memory.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #define MAX_IOAPICS                     1
 

diff --git a/hw/ioh3420.c b/hw/ioh3420.c
index 95bceb5347a8a517cb70e7c287d15e3a0611ff9e..43f855427b7b5a35732ad7862e9c5e747c7b2ee9 100644 (file)
--- a/hw/ioh3420.c
+++ b/hw/ioh3420.c
@@ -20,10 +20,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pci/pci_ids.h"
-#include "pci/msi.h"
-#include "pci/pcie.h"
-#include "ioh3420.h"
+#include "hw/pci/pci_ids.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/pcie.h"
+#include "hw/ioh3420.h"
 
 #define PCI_DEVICE_ID_IOH_EPORT         0x3420  /* D0:F0 express mode */
 #define PCI_DEVICE_ID_IOH_REV           0x2

diff --git a/hw/ioh3420.h b/hw/ioh3420.h
index 046cf2c281d360867795da492a15b48aa90ed4d4..7776e5b02d99815b1d2164b3ba4d2dd71c44ef3e 100644 (file)
--- a/hw/ioh3420.h
+++ b/hw/ioh3420.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_IOH3420_H
 #define QEMU_IOH3420_H
 
-#include "pci/pcie_port.h"
+#include "hw/pci/pcie_port.h"
 
 PCIESlot *ioh3420_init(PCIBus *bus, int devfn, bool multifunction,
                        const char *bus_name, pci_map_irq_fn map_irq,

diff --git a/hw/ipack.c b/hw/ipack.c
index e15540d5cdbf1f52e3706c0b008e582764894230..b1f46c10a42b7bddf12b4ea3e8e2802923d3b296 100644 (file)
--- a/hw/ipack.c
+++ b/hw/ipack.c
@@ -8,7 +8,7 @@
  * later version.
  */
 
-#include "ipack.h"
+#include "hw/ipack.h"
 
 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
 {

diff --git a/hw/ipack.h b/hw/ipack.h
index 69e26282d3e932ad1b9d4735fa70c22e7fc4f0bf..f2b7a12e05c02fd20159e7828e26fc55434eaa3f 100644 (file)
--- a/hw/ipack.h
+++ b/hw/ipack.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_IPACK_H
 #define QEMU_IPACK_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 
 typedef struct IPackBus IPackBus;
 

diff --git a/hw/ipoctal232.c b/hw/ipoctal232.c
index c1e3b197b5763c624f440893eed355ac3c2f42b6..1da6a9917505275d65058b9faef1da44e3985de3 100644 (file)
--- a/hw/ipoctal232.c
+++ b/hw/ipoctal232.c
@@ -8,7 +8,7 @@
  * later version.
  */
 
-#include "ipack.h"
+#include "hw/ipack.h"
 #include "qemu/bitops.h"
 #include "char/char.h"
 

diff --git a/hw/irq.c b/hw/irq.c
index f4e2a7804a3a24528417abbae22334ffadab753f..20785428ef00eff815b67a98a90a8816ccab9987 100644 (file)
--- a/hw/irq.c
+++ b/hw/irq.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "irq.h"
+#include "hw/irq.h"
 
 struct IRQState {
     qemu_irq_handler handler;

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 6dc34f09f3b3e72984794011a531a7ef1644c2cc..67ff8fd314c62c5143590e3333b82ad25e4bbfbf 100644 (file)
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "monitor/monitor.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
-#include "isa.h"
+#include "hw/isa.h"
 #include "exec/address-spaces.h"
 
 static ISABus *isabus;

diff --git a/hw/isa.h b/hw/isa.h
index 7a8874abfd3ff2f2716e02c1eac320bc713d3415..82da37c11d288834b037c731164f700f32fd6b9a 100644 (file)
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -5,7 +5,7 @@
 
 #include "exec/ioport.h"
 #include "exec/memory.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 
 #define ISA_NUM_IRQS 16
 

diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c
index 487cf6a8fb70675bffe49be27c83771252966c4e..a7860e7459b6613b09b24ef87f8f04d441f7da34 100644 (file)
--- a/hw/isa_mmio.c
+++ b/hw/isa_mmio.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
 #include "exec/address-spaces.h"
 
 static void isa_mmio_writeb (void *opaque, hwaddr addr,

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index afaf9b3bbfcb258d9e861253b37596c611d7f457..68a2cf2e69c943312963d153eaaf1389fdb44314 100644 (file)
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -16,10 +16,10 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "pc.h"
-#include "pci/pci.h"
-#include "pci/msix.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/msix.h"
 #include "sysemu/kvm.h"
 #include "migration/migration.h"
 #include "qapi/qmp/qerror.h"

diff --git a/hw/jazz_led.c b/hw/jazz_led.c
index 4822c485f208768289a88d7234428d7a94858ce6..a418a7d1b6f13626bb16d30ca366ac9836025b2c 100644 (file)
--- a/hw/jazz_led.c
+++ b/hw/jazz_led.c
@@ -26,7 +26,7 @@
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 typedef enum {
     REDRAW_NONE = 0, REDRAW_SEGMENTS = 1, REDRAW_BACKGROUND = 2,

diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c
index 9265baf568409f95dee2674fcca8328537640425..c151c95c3e23b368c24b7c34841c1579716114b4 100644 (file)
--- a/hw/kvmvapic.c
+++ b/hw/kvmvapic.c
@@ -11,7 +11,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"
-#include "apic_internal.h"
+#include "hw/apic_internal.h"
 
 #define APIC_DEFAULT_ADDRESS    0xfee00000
 

diff --git a/hw/kzm.c b/hw/kzm.c
index fb3316551dd03f59dcef1fcd87e47dfc027d9779..ec50a319acb97ea1b32d0c5edec9ac038398c446 100644 (file)
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -13,16 +13,16 @@
  * i.MX31 SoC
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
-#include "hw.h"
-#include "arm-misc.h"
-#include "devices.h"
+#include "hw/hw.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "serial.h"
-#include "imx.h"
+#include "hw/boards.h"
+#include "hw/serial.h"
+#include "hw/imx.h"
 
     /* Memory map for Kzm Emulation Baseboard:
      * 0x00000000-0x00003fff 16k secure ROM       IGNORED

diff --git a/hw/lan9118.c b/hw/lan9118.c
index 0e844e535c3a679df6ba9f8ff7204157b560f42b..403fb868aeab3b4d5127f52e30e72f085d6915dd 100644 (file)
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -10,11 +10,11 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
-#include "devices.h"
+#include "hw/devices.h"
 #include "sysemu/sysemu.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 /* For crc32 */
 #include <zlib.h>
 

diff --git a/hw/lance.c b/hw/lance.c
index 4b9242529928ab29e734a200bf6d26749b65ed37..acfffaed31091163cc8d168d24e083ad622ced3b 100644 (file)
--- a/hw/lance.c
+++ b/hw/lance.c
@@ -35,12 +35,12 @@
  * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"
-#include "sun4m.h"
-#include "pcnet.h"
+#include "hw/sun4m.h"
+#include "hw/pcnet.h"
 #include "trace.h"
 
 typedef struct {

diff --git a/hw/leon3.c b/hw/leon3.c
index f16a8bb4ece5ed0d4159c748cb19c6c365f810a8..f58061f8edf03d09825711441651272ee72bdaf4 100644 (file)
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -21,18 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "char/char.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "trace.h"
 #include "exec/address-spaces.h"
 
-#include "grlib.h"
+#include "hw/grlib.h"
 
 /* Default system clock.  */
 #define CPU_CLK (40 * 1000 * 1000)

diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 2bc06d7b7b35f4fdcbe812639c26a57bd8ec4863..1ce466a1b1da3f0383381d7c23336834609989cf 100644 (file)
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -17,16 +17,16 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
-#include "hw.h"
-#include "flash.h"
-#include "devices.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "sysemu/blockdev.h"
 #include "elf.h"
-#include "lm32_hwsetup.h"
-#include "lm32.h"
+#include "hw/lm32_hwsetup.h"
+#include "hw/lm32.h"
 #include "exec/address-spaces.h"
 
 typedef struct {

diff --git a/hw/lm32_hwsetup.h b/hw/lm32_hwsetup.h
index 853e9abc7bd62e17fba54a2eb060b0e260231ed7..3449bd8dfc10b6506c71e553b8665f68c58a1c80 100644 (file)
--- a/hw/lm32_hwsetup.h
+++ b/hw/lm32_hwsetup.h
@@ -26,7 +26,7 @@
 #define QEMU_HW_LM32_HWSETUP_H
 
 #include "qemu-common.h"
-#include "loader.h"
+#include "hw/loader.h"
 
 typedef struct {
     void *data;

diff --git a/hw/lm32_juart.c b/hw/lm32_juart.c
index 8c82c85f6dc253a276b5615d4f4e3a43fa6cd6bc..472e9c25fd808748726a89295accf4c290d9f688 100644 (file)
--- a/hw/lm32_juart.c
+++ b/hw/lm32_juart.c
@@ -17,12 +17,12 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "char/char.h"
 
-#include "lm32_juart.h"
+#include "hw/lm32_juart.h"
 
 enum {
     LM32_JUART_MIN_SAVE_VERSION = 0,

diff --git a/hw/lm32_pic.c b/hw/lm32_pic.c
index 42f298ad5103e4279c9bfbcf0cd43edd7b1894ea..d17c310d5c14e7fd77666ca5b0d83588d0550cbc 100644 (file)
--- a/hw/lm32_pic.c
+++ b/hw/lm32_pic.c
@@ -19,12 +19,12 @@
 
 #include <assert.h>
 
-#include "hw.h"
-#include "pc.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
 #include "monitor/monitor.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
-#include "lm32_pic.h"
+#include "hw/lm32_pic.h"
 
 struct LM32PicState {
     SysBusDevice busdev;

diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index 187ef6d0d6f689b8403ae793bcac8add3075bf04..33a3b80ce779410a323dd33b8effa5c50e7e5a9d 100644 (file)
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -28,8 +28,8 @@
  * the test is passed or any non-zero value to it if the test is failed.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"

diff --git a/hw/lm32_timer.c b/hw/lm32_timer.c
index db527e9dc6f503b523598fb601dea7c2bd9201ec..e06fac708259e9ae2ab8eb1b1005a51fe327c507 100644 (file)
--- a/hw/lm32_timer.c
+++ b/hw/lm32_timer.c
@@ -21,11 +21,11 @@
  *   http://www.latticesemi.com/documents/mico32timer.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "qemu/error-report.h"
 
 #define DEFAULT_FREQUENCY (50*1000000)

diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index 9c89cca49b5ca06106f1db94fbab55c89ba18454..02f6f89174392f3187bb9b8a428a49fa671c64fe 100644 (file)
--- a/hw/lm32_uart.c
+++ b/hw/lm32_uart.c
@@ -22,8 +22,8 @@
  */
 
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "char/char.h"
 #include "qemu/error-report.h"

diff --git a/hw/lm4549.c b/hw/lm4549.c
index b3c2d5f25d10bb1dc220fe5dc5848d417f244ba7..67335cba615b3af24de97bab7c303005d2e51cce 100644 (file)
--- a/hw/lm4549.c
+++ b/hw/lm4549.c
@@ -13,9 +13,9 @@
  * It supports only one playback voice and no record voice.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "audio/audio.h"
-#include "lm4549.h"
+#include "hw/lm4549.h"
 
 #if 0
 #define LM4549_DEBUG  1

diff --git a/hw/lm832x.c b/hw/lm832x.c
index 94b8ae06d8e0a37574f03b005f594fefc3d14850..a064dfd17262ac7c5911de48d70c9a74f3f81046 100644 (file)
--- a/hw/lm832x.c
+++ b/hw/lm832x.c
@@ -18,8 +18,8 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "i2c.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
 #include "qemu/timer.h"
 #include "ui/console.h"
 

diff --git a/hw/loader.c b/hw/loader.c
index 995edc3f981dde3734a1e91ba1dac9b8378bcb4f..d2a974beb9d1480315f088f6f8dba219c1440f68 100644 (file)
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -42,13 +42,13 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "disas/disas.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
-#include "uboot_image.h"
-#include "loader.h"
-#include "fw_cfg.h"
+#include "hw/uboot_image.h"
+#include "hw/loader.h"
+#include "hw/fw_cfg.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 
@@ -260,7 +260,7 @@ static void *load_at(int fd, int offset, int size)
 #define elf_word        uint32_t
 #define elf_sword        int32_t
 #define bswapSZs       bswap32s
-#include "elf_ops.h"
+#include "hw/elf_ops.h"
 
 #undef elfhdr
 #undef elf_phdr
@@ -280,7 +280,7 @@ static void *load_at(int fd, int offset, int size)
 #define elf_sword        int64_t
 #define bswapSZs       bswap64s
 #define SZ             64
-#include "elf_ops.h"
+#include "hw/elf_ops.h"
 
 /* return < 0 if error, otherwise the number of bytes loaded in memory */
 int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),

diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index e25689bf8744b53474b36d621f50f8f8ed3c5d59..e55d66a7a476479736e753cfbcac6a8a542bd04f 100644 (file)
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -28,21 +28,21 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/range.h"
-#include "isa.h"
-#include "sysbus.h"
-#include "pc.h"
-#include "apm.h"
-#include "ioapic.h"
-#include "pci/pci.h"
-#include "pci/pcie_host.h"
-#include "pci/pci_bridge.h"
-#include "ich9.h"
-#include "acpi.h"
-#include "acpi_ich9.h"
-#include "pam.h"
-#include "pci/pci_bus.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
+#include "hw/pc.h"
+#include "hw/apm.h"
+#include "hw/ioapic.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pcie_host.h"
+#include "hw/pci/pci_bridge.h"
+#include "hw/ich9.h"
+#include "hw/acpi.h"
+#include "hw/acpi_ich9.h"
+#include "hw/pam.h"
+#include "hw/pci/pci_bus.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 860df328e5945611ba8c2ffa9f222dbd21f506be..5a8bf4d0e9b33a46d860502effec9ad5b934f533 100644 (file)
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -12,9 +12,9 @@
 
 #include <assert.h>
 
-#include "hw.h"
-#include "pci/pci.h"
-#include "scsi.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/scsi.h"
 #include "sysemu/dma.h"
 
 //#define DEBUG_LSI

diff --git a/hw/m25p80.c b/hw/m25p80.c
index 1372d06409c3578337e538c0bec9cfcaba801aed..55e9d0d37a1379fd092bf5d56f8dc57368c87d2a 100644 (file)
--- a/hw/m25p80.c
+++ b/hw/m25p80.c
@@ -21,10 +21,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/blockdev.h"
-#include "ssi.h"
-#include "devices.h"
+#include "hw/ssi.h"
+#include "hw/devices.h"
 
 #ifdef M25P80_ERR_DEBUG
 #define DB_PRINT(...) do { \

diff --git a/hw/m48t59.c b/hw/m48t59.c
index 427d95b5a600caab6882b29ae35ebc66d2d2d1cd..39a9d808cd9e18c072c66a3af9ada6d7f18b2322 100644 (file)
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "nvram.h"
+#include "hw/hw.h"
+#include "hw/nvram.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
-#include "isa.h"
+#include "hw/sysbus.h"
+#include "hw/isa.h"
 #include "exec/address-spaces.h"
 
 //#define DEBUG_NVRAM

diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c
index b894ab21aa93a2205b7b582f2b0bdba4b1bbe2e7..a1514708deb620ad12a9e19e48aef8928964fc5e 100644 (file)
--- a/hw/mac_dbdma.c
+++ b/hw/mac_dbdma.c
@@ -36,9 +36,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "isa.h"
-#include "mac_dbdma.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
+#include "hw/mac_dbdma.h"
 #include "qemu/main-loop.h"
 
 /* debug DBDMA */

diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c
index 25121fa482c1e50df70048edcb5a237568898582..ed32bde5aba2fbc2b7e385bb3b16afd9bc2b0e2d 100644 (file)
--- a/hw/mac_nvram.c
+++ b/hw/mac_nvram.c
@@ -22,10 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "firmware_abi.h"
+#include "hw/hw.h"
+#include "hw/firmware_abi.h"
 #include "sysemu/sysemu.h"
-#include "ppc/mac.h"
+#include "hw/ppc/mac.h"
 
 /* debug NVR */
 //#define DEBUG_NVR

diff --git a/hw/macio.c b/hw/macio.c
index 74bdcd10397bb3d55421ca993460e1a5ef9a5ce8..792fa390e65a32010d12a039a5e77df4cadfe05f 100644 (file)
--- a/hw/macio.c
+++ b/hw/macio.c
@@ -22,11 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc/mac.h"
-#include "pci/pci.h"
-#include "mac_dbdma.h"
-#include "escc.h"
+#include "hw/hw.h"
+#include "hw/ppc/mac.h"
+#include "hw/pci/pci.h"
+#include "hw/mac_dbdma.h"
+#include "hw/escc.h"
 
 #define TYPE_MACIO "macio"
 #define MACIO(obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO)

diff --git a/hw/mainstone.c b/hw/mainstone.c
index d1ff6e76d6d6268cfb00f665155818dc15ee7cda..aea908f0365f175cc14c4b13a785cc6d577f5c92 100644 (file)
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -11,15 +11,15 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "pxa.h"
-#include "arm-misc.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/arm-misc.h"
 #include "net/net.h"
-#include "devices.h"
-#include "boards.h"
-#include "flash.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 
 /* Device addresses */

diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c
index c792caf2717e7d3ffecc25a842117b173c5e843d..e042046e4f15d7d7ed8c6ad5d92b221ff5f9fd43 100644 (file)
--- a/hw/marvell_88w8618_audio.c
+++ b/hw/marvell_88w8618_audio.c
@@ -9,10 +9,10 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "sysbus.h"
-#include "hw.h"
-#include "i2c.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
+#include "hw/sysbus.h"
 #include "audio/audio.h"
 
 #define MP_AUDIO_SIZE           0x00001000

diff --git a/hw/max111x.c b/hw/max111x.c
index de1be4ddd6cf9c96aee289b341269ca0ddb50a8d..d477ecdb29c0a88ebe3086c674d53150bd59899f 100644 (file)
--- a/hw/max111x.c
+++ b/hw/max111x.c
@@ -10,7 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "ssi.h"
+#include "hw/ssi.h"
 
 typedef struct {
     SSISlave ssidev;

diff --git a/hw/max7310.c b/hw/max7310.c
index c2df0b49ebb242b30dccf13c2796338f222d901f..e5cb810a276494218c2d1204cf034f7750f48512 100644 (file)
--- a/hw/max7310.c
+++ b/hw/max7310.c
@@ -7,7 +7,7 @@
  * This file is licensed under GNU GPL.
  */
 
-#include "i2c.h"
+#include "hw/i2c.h"
 
 typedef struct {
     I2CSlave i2c;

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 2fb11f69a31760e1603d7ea11212836b26a8f361..a2119ad2f1b2a2ecd03a27b8a0feb1c9dfe42e5d 100644 (file)
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "mc146818rtc.h"
+#include "hw/mc146818rtc.h"
 #include "qapi/visitor.h"
 
 #ifdef TARGET_I386
-#include "apic.h"
+#include "hw/apic.h"
 #endif
 
 //#define DEBUG_CMOS

diff --git a/hw/mc146818rtc.h b/hw/mc146818rtc.h
index f286b6a12ae36326bfdb9855403ffc73fb4f1dac..967403edb5384237ce390a2d509c27038251eaae 100644 (file)
--- a/hw/mc146818rtc.h
+++ b/hw/mc146818rtc.h
@@ -1,8 +1,8 @@
 #ifndef MC146818RTC_H
 #define MC146818RTC_H
 
-#include "isa.h"
-#include "mc146818rtc_regs.h"
+#include "hw/isa.h"
+#include "hw/mc146818rtc_regs.h"
 
 ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq);
 void rtc_set_memory(ISADevice *dev, int addr, int val);

diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index ea2db2325a70d56badda0501f776a2b227b70e8e..58cd8d46c9a32597f39c2a36a50935712e4a2b91 100644 (file)
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -5,10 +5,10 @@
  *
  * This code is licensed under the GPL
  */
-#include "hw.h"
-#include "mcf.h"
+#include "hw/hw.h"
+#include "hw/mcf.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 86402d30d55e7659130c8ad4964f1d17622fca1e..748bf5698378796ac017a331683aca626ea34d3f 100644 (file)
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -5,14 +5,14 @@
  *
  * This code is licensed under the GPL
  */
-#include "hw.h"
-#include "mcf.h"
+#include "hw/hw.h"
+#include "hw/mcf.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "sysemu/sysemu.h"
 #include "net/net.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
index 8e60f09fbbf371ac1615681cb912556f37852d0b..0227bd852c4b77ae54d7dc04f61715b548f18c04 100644 (file)
--- a/hw/mcf_fec.c
+++ b/hw/mcf_fec.c
@@ -5,9 +5,9 @@
  *
  * This code is licensed under the GPL
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "net/net.h"
-#include "mcf.h"
+#include "hw/mcf.h"
 /* For crc32 */
 #include <zlib.h>
 #include "exec/address-spaces.h"

diff --git a/hw/mcf_intc.c b/hw/mcf_intc.c
index b2136563008e97793ace040f3e032b62e4274c0b..fff27b34aa09e0859ae163c7ebec586cce719f59 100644 (file)
--- a/hw/mcf_intc.c
+++ b/hw/mcf_intc.c
@@ -5,8 +5,8 @@
  *
  * This code is licensed under the GPL
  */
-#include "hw.h"
-#include "mcf.h"
+#include "hw/hw.h"
+#include "hw/mcf.h"
 #include "exec/address-spaces.h"
 
 typedef struct {

diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c
index c44344317a960035611e2938e8a19fe73f26cb1b..aacf0f05ed3a500040de2bba960d782408c356aa 100644 (file)
--- a/hw/mcf_uart.c
+++ b/hw/mcf_uart.c
@@ -5,8 +5,8 @@
  *
  * This code is licensed under the GPL
  */
-#include "hw.h"
-#include "mcf.h"
+#include "hw/hw.h"
+#include "hw/mcf.h"
 #include "char/char.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/megasas.c b/hw/megasas.c
index eb191f5e12c033ef2d2a45208de61aaf06deadeb..9b815d4b8fc6191dbc41951da07fd8886b940f0d 100644 (file)
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -18,16 +18,16 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 #include "sysemu/dma.h"
-#include "pci/msix.h"
+#include "hw/pci/msix.h"
 #include "qemu/iov.h"
-#include "scsi.h"
-#include "scsi-defs.h"
+#include "hw/scsi.h"
+#include "hw/scsi-defs.h"
 #include "trace.h"
 
-#include "mfi.h"
+#include "hw/mfi.h"
 
 #define MEGASAS_VERSION "1.70"
 #define MEGASAS_MAX_FRAMES 2048         /* Firmware limit at 65535 */

diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index 3ec5c0f7dd67118f750d072028d789d17f8f7ed9..e13b3e13bbf4838c2417ac872925ad30708cbb55 100644 (file)
--- a/hw/microblaze_boot.c
+++ b/hw/microblaze_boot.c
@@ -28,10 +28,10 @@
 #include "qemu/config-file.h"
 #include "qemu-common.h"
 #include "sysemu/device_tree.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "elf.h"
 
-#include "microblaze_boot.h"
+#include "hw/microblaze_boot.h"
 
 static struct
 {

diff --git a/hw/microblaze_boot.h b/hw/microblaze_boot.h
index c1cf836b99397ba5cc36c338e8a0276572914637..b14ef2b99276192bd21899d265bedd5f56fa8db4 100644 (file)
--- a/hw/microblaze_boot.h
+++ b/hw/microblaze_boot.h
@@ -1,7 +1,7 @@
 #ifndef __MICROBLAZE_BOOT__
 #define __MICROBLAZE_BOOT__
 
-#include "hw.h"
+#include "hw/hw.h"
 
 void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
                             uint32_t ramsize, const char *dtb_filename,

diff --git a/hw/microblaze_pic_cpu.c b/hw/microblaze_pic_cpu.c
index ff36a526fc7cbfa098ad917ba796f378083c0e5b..d4743ab3909fd08b767dd58740fb8bf4b964af3f 100644 (file)
--- a/hw/microblaze_pic_cpu.c
+++ b/hw/microblaze_pic_cpu.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "microblaze_pic_cpu.h"
+#include "hw/hw.h"
+#include "hw/microblaze_pic_cpu.h"
 
 #define D(x)
 

diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c
index d51d1ac9937f6364c30f595654cc4090551a2d1c..e08e9dca166e88ea237489697b735bcd8a6529b0 100644 (file)
--- a/hw/milkymist-ac97.c
+++ b/hw/milkymist-ac97.c
@@ -21,8 +21,8 @@
  *   http://www.milkymist.org/socdoc/ac97.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "audio/audio.h"
 #include "qemu/error-report.h"

diff --git a/hw/milkymist-hpdmc.c b/hw/milkymist-hpdmc.c
index ea4d210685d1f4330e27ae479500d71e1fe805cc..d922f6ffad19ff338e9389d576dbf8a66ec357ff 100644 (file)
--- a/hw/milkymist-hpdmc.c
+++ b/hw/milkymist-hpdmc.c
@@ -21,8 +21,8 @@
  *   http://www.milkymist.org/socdoc/hpdmc.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h
index c8bd7e93dd159ab02c6733e93f00e2958130e518..d49f96b5d42e0c00387486ed8071f22b17eb7cbc 100644 (file)
--- a/hw/milkymist-hw.h
+++ b/hw/milkymist-hw.h
@@ -1,8 +1,8 @@
 #ifndef QEMU_HW_MILKYMIST_H
 #define QEMU_HW_MILKYMIST_H
 
-#include "qdev.h"
-#include "qdev-addr.h"
+#include "hw/qdev.h"
+#include "hw/qdev-addr.h"
 #include "net/net.h"
 
 static inline DeviceState *milkymist_uart_create(hwaddr base,

diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c
index 9d15309ab79b3ee86a332c7c5ec901d66dffa5b5..d5944bca69b11cdc78433e48129954dfaceaa8e4 100644 (file)
--- a/hw/milkymist-memcard.c
+++ b/hw/milkymist-memcard.c
@@ -21,13 +21,13 @@
  *   http://www.milkymist.org/socdoc/memcard.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/error-report.h"
 #include "sysemu/blockdev.h"
-#include "sd.h"
+#include "hw/sd.h"
 
 enum {
     ENABLE_CMD_TX   = (1<<0),

diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
index 9992dcceafaba596a9a599da860982dbaea020c6..c20ff904ecdfce74f3d28fa69c52ce140416c68c 100644 (file)
--- a/hw/milkymist-minimac2.c
+++ b/hw/milkymist-minimac2.c
@@ -22,12 +22,12 @@
  *
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "net/net.h"
 #include "qemu/error-report.h"
-#include "qdev-addr.h"
+#include "hw/qdev-addr.h"
 
 #include <zlib.h>
 

diff --git a/hw/milkymist-pfpu.c b/hw/milkymist-pfpu.c
index c347680ad74368debf93592fec01bfb2c3154f80..ad44b4db22f6b964745dd5058c63e0d35fc4a960 100644 (file)
--- a/hw/milkymist-pfpu.c
+++ b/hw/milkymist-pfpu.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"

diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c
index 01660bebf0581927ee76943a8f5f613858d800a9..d911686de7aa2b1757b12871a60f5255861e8471 100644 (file)
--- a/hw/milkymist-softusb.c
+++ b/hw/milkymist-softusb.c
@@ -21,11 +21,11 @@
  *   not available yet
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "ui/console.h"
-#include "hid.h"
+#include "hw/hid.h"
 #include "qemu/error-report.h"
 
 enum {

diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
index e69ac6f047997751a814fa304a8fb00741941daa..e083a280c4355d6f8c96073c21743a7e4fce9628 100644 (file)
--- a/hw/milkymist-sysctl.c
+++ b/hw/milkymist-sysctl.c
@@ -21,12 +21,12 @@
  *   http://www.milkymist.org/socdoc/sysctl.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "qemu/error-report.h"
 
 enum {

diff --git a/hw/milkymist-tmu2.c b/hw/milkymist-tmu2.c
index 42de10aafdea0a793bb9cd10233f3bf6b2f8d695..b723a04cc9473f6b48cdb97aa5c61e7729fe484c 100644 (file)
--- a/hw/milkymist-tmu2.c
+++ b/hw/milkymist-tmu2.c
@@ -24,8 +24,8 @@
  *
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c
index e73eb8476c0dfac7176c55b56145827a609d255f..ac6f5373add3ba4c9ee83dd0357caaafd6e075c8 100644 (file)
--- a/hw/milkymist-uart.c
+++ b/hw/milkymist-uart.c
@@ -21,8 +21,8 @@
  *   http://www.milkymist.org/socdoc/uart.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "char/char.h"
 #include "qemu/error-report.h"

diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c
index 4d0a5dfb78dab213d8a6cf2fdef663109a9266f8..85ebb851bda36726faecee9d82a0bd4c7ea9df5f 100644 (file)
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -22,24 +22,24 @@
  *   http://www.milkymist.org/socdoc/vgafb.pdf
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 #include "ui/console.h"
-#include "framebuffer.h"
+#include "hw/framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "qemu/error-report.h"
 
 #define BITS 8
-#include "milkymist-vgafb_template.h"
+#include "hw/milkymist-vgafb_template.h"
 #define BITS 15
-#include "milkymist-vgafb_template.h"
+#include "hw/milkymist-vgafb_template.h"
 #define BITS 16
-#include "milkymist-vgafb_template.h"
+#include "hw/milkymist-vgafb_template.h"
 #define BITS 24
-#include "milkymist-vgafb_template.h"
+#include "hw/milkymist-vgafb_template.h"
 #define BITS 32
-#include "milkymist-vgafb_template.h"
+#include "hw/milkymist-vgafb_template.h"
 
 enum {
     R_CTRL = 0,

diff --git a/hw/milkymist.c b/hw/milkymist.c
index c04eb35fddbe462cf873d66188e38b04cebd6ee6..fd36de57b5f3f97a92a72bacdd7460d358428a3e 100644 (file)
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -17,17 +17,17 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
-#include "hw.h"
-#include "flash.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
 #include "sysemu/sysemu.h"
-#include "devices.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "sysemu/blockdev.h"
-#include "milkymist-hw.h"
-#include "lm32.h"
+#include "hw/milkymist-hw.h"
+#include "hw/lm32.h"
 #include "exec/address-spaces.h"
 
 #define BIOS_FILENAME    "mmone-bios.bin"

diff --git a/hw/mips_addr.c b/hw/mips_addr.c
index aa1c7d84d698bba45028b022d263f4663ba5508f..cddc25cf3f69f8603e6591d0909e6ee3a5094982 100644 (file)
--- a/hw/mips_addr.c
+++ b/hw/mips_addr.c
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "mips_cpudevs.h"
+#include "hw/hw.h"
+#include "hw/mips_cpudevs.h"
 
 uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr)
 {

diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 8b532e1e0dce0433838b81abdea3f51e74db8249..766aa9dfb56b7c061bf3d02fb86a23a0a210a44c 100644 (file)
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -18,29 +18,29 @@
  * http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "serial.h"
-#include "fdc.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/serial.h"
+#include "hw/fdc.h"
 #include "net/net.h"
-#include "boards.h"
-#include "smbus.h"
+#include "hw/boards.h"
+#include "hw/smbus.h"
 #include "block/block.h"
-#include "flash.h"
-#include "mips.h"
-#include "mips_cpudevs.h"
-#include "pci/pci.h"
+#include "hw/flash.h"
+#include "hw/mips.h"
+#include "hw/mips_cpudevs.h"
+#include "hw/pci/pci.h"
 #include "char/char.h"
 #include "sysemu/sysemu.h"
 #include "audio/audio.h"
 #include "qemu/log.h"
-#include "loader.h"
-#include "mips-bios.h"
-#include "ide.h"
+#include "hw/loader.h"
+#include "hw/mips-bios.h"
+#include "hw/ide.h"
 #include "elf.h"
-#include "vt82c686.h"
-#include "mc146818rtc.h"
-#include "i8254.h"
+#include "hw/vt82c686.h"
+#include "hw/mc146818rtc.h"
+#include "hw/i8254.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/mips_int.c b/hw/mips_int.c
index 6423fd0bd9ed050d48ff1a2f4ec473f116a513a1..ddd3b1bb010d721fd8345749d2ac784b879ebef1 100644 (file)
--- a/hw/mips_int.c
+++ b/hw/mips_int.c
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "mips_cpudevs.h"
+#include "hw/hw.h"
+#include "hw/mips_cpudevs.h"
 #include "cpu.h"
 
 static void cpu_mips_irq_request(void *opaque, int irq, int level)

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 17fbdde0630294009f6bee9ac8fc44f9066b9f7a..daeb985b1d0368daa249f84c2ccadae4f2f537dc 100644 (file)
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -22,25 +22,25 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "mips.h"
-#include "mips_cpudevs.h"
-#include "pc.h"
-#include "serial.h"
-#include "isa.h"
-#include "fdc.h"
+#include "hw/hw.h"
+#include "hw/mips.h"
+#include "hw/mips_cpudevs.h"
+#include "hw/pc.h"
+#include "hw/serial.h"
+#include "hw/isa.h"
+#include "hw/fdc.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "net/net.h"
-#include "esp.h"
-#include "mips-bios.h"
-#include "loader.h"
-#include "mc146818rtc.h"
-#include "i8254.h"
-#include "pcspk.h"
+#include "hw/esp.h"
+#include "hw/mips-bios.h"
+#include "hw/loader.h"
+#include "hw/mc146818rtc.h"
+#include "hw/i8254.h"
+#include "hw/pcspk.h"
 #include "sysemu/blockdev.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 
 enum jazz_model_e

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 2a150dfb84d84d68eb091988ff7e5b52a773f796..9a67dce2077227aca2d29fe557c0b981086b5c44 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -22,32 +22,32 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "serial.h"
-#include "fdc.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/serial.h"
+#include "hw/fdc.h"
 #include "net/net.h"
-#include "boards.h"
-#include "smbus.h"
+#include "hw/boards.h"
+#include "hw/smbus.h"
 #include "block/block.h"
-#include "flash.h"
-#include "mips.h"
-#include "mips_cpudevs.h"
-#include "pci/pci.h"
+#include "hw/flash.h"
+#include "hw/mips.h"
+#include "hw/mips_cpudevs.h"
+#include "hw/pci/pci.h"
 #include "char/char.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "qemu/log.h"
-#include "mips-bios.h"
-#include "ide.h"
-#include "loader.h"
+#include "hw/mips-bios.h"
+#include "hw/ide.h"
+#include "hw/loader.h"
 #include "elf.h"
-#include "mc146818rtc.h"
-#include "i8254.h"
+#include "hw/mc146818rtc.h"
+#include "hw/i8254.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
-#include "sysbus.h"             /* SysBusDevice */
+#include "hw/sysbus.h"             /* SysBusDevice */
 
 //#define DEBUG_BOARD_INIT
 

diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index b0ab8f69e2ea83614dd1e301b307323d4336e7b4..4935c78c01643e7c56152b4e1ed5adcbd0d8a2d9 100644 (file)
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -24,18 +24,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "mips.h"
-#include "mips_cpudevs.h"
-#include "serial.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/mips.h"
+#include "hw/mips_cpudevs.h"
+#include "hw/serial.h"
+#include "hw/isa.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "mips-bios.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/mips-bios.h"
+#include "hw/loader.h"
 #include "elf.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 
 static struct _loaderparams {

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 5df7eb44696f2ac8c780cd58a785dba778ac4a81..539a56262078f6d3a88c44c17bef1f95920ab9f4 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -7,23 +7,23 @@
  * All peripherial devices are attached to this "bus" with
  * the standard PC ISA addresses.
 */
-#include "hw.h"
-#include "mips.h"
-#include "mips_cpudevs.h"
-#include "pc.h"
-#include "serial.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/mips.h"
+#include "hw/mips_cpudevs.h"
+#include "hw/pc.h"
+#include "hw/serial.h"
+#include "hw/isa.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "flash.h"
+#include "hw/boards.h"
+#include "hw/flash.h"
 #include "qemu/log.h"
-#include "mips-bios.h"
-#include "ide.h"
-#include "loader.h"
+#include "hw/mips-bios.h"
+#include "hw/ide.h"
+#include "hw/loader.h"
 #include "elf.h"
-#include "mc146818rtc.h"
-#include "i8254.h"
+#include "hw/mc146818rtc.h"
+#include "hw/i8254.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/mips_timer.c b/hw/mips_timer.c
index 83c400c158c5ff97bcacd9300b33df4b84dec32f..9ad13f3924a61137b0dc999cbc919a6fe7c6c737 100644 (file)
--- a/hw/mips_timer.c
+++ b/hw/mips_timer.c
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "mips_cpudevs.h"
+#include "hw/hw.h"
+#include "hw/mips_cpudevs.h"
 #include "qemu/timer.h"
 
 #define TIMER_FREQ     100 * 1000 * 1000

diff --git a/hw/mipsnet.c b/hw/mipsnet.c
index ff6bf7fdcb83350b6ab75ce72c3ab6fa293292a2..ac6193a89ea2b3fd3bd72265675d4425b27bd555 100644 (file)
--- a/hw/mipsnet.c
+++ b/hw/mipsnet.c
@@ -1,7 +1,7 @@
-#include "hw.h"
+#include "hw/hw.h"
 #include "net/net.h"
 #include "trace.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* MIPSnet register offsets */
 

diff --git a/hw/mpc8544_guts.c b/hw/mpc8544_guts.c
index 728723c946cc498efa77982cbd768f6b7c0b567c..193beab2c2f9a3aafe28257820572e70e87db970 100644 (file)
--- a/hw/mpc8544_guts.c
+++ b/hw/mpc8544_guts.c
@@ -17,9 +17,9 @@
  *
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #define MPC8544_GUTS_MMIO_SIZE        0x1000
 #define MPC8544_GUTS_RSTCR_RESET      0x02

diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c
index 7ae05e389f8ab24bb9dcc87f09b9c933a5400831..1dd15054d0c52d55b557a4dfff8f369f2ff12a34 100644 (file)
--- a/hw/mst_fpga.c
+++ b/hw/mst_fpga.c
@@ -10,8 +10,8 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 
 /* Mainstone FPGA for extern irqs */
 #define FPGA_GPIO_PIN  0

diff --git a/hw/multiboot.c b/hw/multiboot.c
index c4ec2e34a7c2d70e488a1749c4e47bc140cbab4c..3cb228f0ca67952739448b95ee58bdbf943b0bb2 100644 (file)
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "fw_cfg.h"
-#include "multiboot.h"
-#include "loader.h"
+#include "hw/hw.h"
+#include "hw/fw_cfg.h"
+#include "hw/multiboot.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/musicpal.c b/hw/musicpal.c
index 272cb8030303c6b5608eb74ab830a807a35de4ca..a37dbd796163558a138d0257840ba19881529505 100644 (file)
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -9,19 +9,19 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "devices.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "serial.h"
+#include "hw/boards.h"
+#include "hw/serial.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "block/block.h"
-#include "flash.h"
+#include "hw/flash.h"
 #include "ui/console.h"
-#include "i2c.h"
+#include "hw/i2c.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/nand.c b/hw/nand.c
index 4a71265ed3c63b042594aca2b09a5c61e07f0be9..4176272993ff7eda9e8f2a25c1d7f341f9881aab 100644 (file)
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -18,10 +18,10 @@
 
 #ifndef NAND_IO
 
-# include "hw.h"
-# include "flash.h"
+# include "hw/hw.h"
+# include "hw/flash.h"
 # include "sysemu/blockdev.h"
-# include "sysbus.h"
+# include "hw/sysbus.h"
 #include "qemu/error-report.h"
 
 # define NAND_CMD_READ0                0x00

diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index 342c6bdad1634ffbe3a275873dd8980779047ac2..47c00c3a7652e7792c46496945940ca01e1aa6c6 100644 (file)
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
-#include "qdev.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
+#include "hw/qdev.h"
 #include "net/net.h"
-#include "ne2000.h"
+#include "hw/ne2000.h"
 #include "exec/address-spaces.h"
 
 typedef struct ISANE2000State {

diff --git a/hw/ne2000.c b/hw/ne2000.c
index 3dd1c844e835816ddac2618bae7e60beb4206f2e..7dadc1cea7ab60f593f0a3bd4c6f18f79674cd42 100644 (file)
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 #include "net/net.h"
-#include "ne2000.h"
-#include "loader.h"
+#include "hw/ne2000.h"
+#include "hw/loader.h"
 #include "sysemu/sysemu.h"
 
 /* debug NE2000 card */

diff --git a/hw/nseries.c b/hw/nseries.c
index 99d353aaa9749bad36c4828c606bbb681f2c7a20..c5bf9f95b3d58c63b70a659535e0ee55ff0e3668 100644 (file)
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -20,19 +20,19 @@
 
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
-#include "omap.h"
-#include "arm-misc.h"
-#include "irq.h"
+#include "hw/omap.h"
+#include "hw/arm-misc.h"
+#include "hw/irq.h"
 #include "ui/console.h"
-#include "boards.h"
-#include "i2c.h"
-#include "devices.h"
-#include "flash.h"
-#include "hw.h"
-#include "bt.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/i2c.h"
+#include "hw/devices.h"
+#include "hw/flash.h"
+#include "hw/hw.h"
+#include "hw/bt.h"
+#include "hw/loader.h"
 #include "sysemu/blockdev.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 
 /* Nokia N8x0 support */

diff --git a/hw/omap1.c b/hw/omap1.c
index 623b101f8012c883ee0912918e8d5cbd0082e621..6f0a8ca074ca28da5127ad44c82fe57a7db330ff 100644 (file)
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "arm-misc.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/arm-misc.h"
+#include "hw/omap.h"
 #include "sysemu/sysemu.h"
-#include "soc_dma.h"
+#include "hw/soc_dma.h"
 #include "sysemu/blockdev.h"
 #include "qemu/range.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* Should signal the TCMI/GPMC */
 uint32_t omap_badwidth_read8(void *opaque, hwaddr addr)

diff --git a/hw/omap2.c b/hw/omap2.c
index 038a82a5172108fc79da81dbf0c27e81809b7a13..0a2cd7bab668cb768c86dac43c22124f07b5d6b7 100644 (file)
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -19,15 +19,15 @@
  */
 
 #include "sysemu/blockdev.h"
-#include "hw.h"
-#include "arm-misc.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/arm-misc.h"
+#include "hw/omap.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "char/char.h"
-#include "flash.h"
-#include "soc_dma.h"
-#include "sysbus.h"
+#include "hw/flash.h"
+#include "hw/soc_dma.h"
+#include "hw/sysbus.h"
 #include "audio/audio.h"
 
 /* Enhanced Audio Controller (CODEC only) */

diff --git a/hw/omap_clk.c b/hw/omap_clk.c
index 844800606766664ae5e2422c2f79f476bc9f684b..c7b5c11626e23e7a035b67da2b20b561ea148bb9 100644 (file)
--- a/hw/omap_clk.c
+++ b/hw/omap_clk.c
@@ -18,8 +18,8 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
 
 struct clk {
     const char *name;

diff --git a/hw/omap_dma.c b/hw/omap_dma.c
index 0c878b6ef2571a5a9c11acdaf22f53ce84b165e7..0c5902f6f9cad0dd9b1889108344c2bd21a685de 100644 (file)
--- a/hw/omap_dma.c
+++ b/hw/omap_dma.c
@@ -19,9 +19,9 @@
  */
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "omap.h"
-#include "irq.h"
-#include "soc_dma.h"
+#include "hw/omap.h"
+#include "hw/irq.h"
+#include "hw/soc_dma.h"
 
 struct omap_dma_channel_s {
     /* transfer data */

diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index ae51bdfe4114de69177c95e99fc4a1428e416a50..948ad8fcc5fc2e1b6ba28a84742535951c3636fd 100644 (file)
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "omap.h"
+#include "hw/omap.h"
 
 struct omap_dss_s {
     qemu_irq irq;

diff --git a/hw/omap_gpio.c b/hw/omap_gpio.c
index aadf1cc59f3ec8a6ab5a3b59629a8febe982c5c8..c79f61c2ba07911206a1d6e54b98bff3ec78e2f7 100644 (file)
--- a/hw/omap_gpio.c
+++ b/hw/omap_gpio.c
@@ -18,9 +18,9 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "omap.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
+#include "hw/sysbus.h"
 
 struct omap_gpio_s {
     qemu_irq irq;

diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 02ab0ab568627583dc67944463a96e949102ce5d..ebb259c283333a04624686aaf4b66ae3428da08c 100644 (file)
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -18,9 +18,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "flash.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
+#include "hw/omap.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c
index a5db710dcb9577c051006ac2bcaa56b0fafa956b..8485ee84f532efaf15adc97fd847ac78759950a7 100644 (file)
--- a/hw/omap_gptimer.c
+++ b/hw/omap_gptimer.c
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "omap.h"
+#include "hw/omap.h"
 
 /* GP timers */
 struct omap_gp_timer_s {

diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c
index 143b198f1d8a01a33679cb75526810a4f879fb3f..92f7b371eaf216af25b32a0e618b7d684d26722e 100644 (file)
--- a/hw/omap_i2c.c
+++ b/hw/omap_i2c.c
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "i2c.h"
-#include "omap.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
+#include "hw/omap.h"
+#include "hw/sysbus.h"
 
 
 typedef struct OMAPI2CState {

diff --git a/hw/omap_intc.c b/hw/omap_intc.c
index 4b0acd0f3324521d397c37a9d2846834d00092be..7da9c3548cda494953b448986d94a5eacd1a5233 100644 (file)
--- a/hw/omap_intc.c
+++ b/hw/omap_intc.c
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "omap.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
+#include "hw/sysbus.h"
 
 /* Interrupt Handlers */
 struct omap_intr_handler_bank_s {

diff --git a/hw/omap_l4.c b/hw/omap_l4.c
index 09e983f319de84c6ef96e884f7acac15cffd4e05..cbe8a06033725ec7f5be5daf3e212737c709cc67 100644 (file)
--- a/hw/omap_l4.c
+++ b/hw/omap_l4.c
@@ -17,8 +17,8 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
 
 struct omap_l4_s {
     MemoryRegion *address_space;

diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c
index 936850a6216ba6f3938d045795c168f4e8af45e1..c426f3a13af0ca7ff87067dfd7ab45e9dd5e7c5a 100644 (file)
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "omap.h"
-#include "framebuffer.h"
+#include "hw/omap.h"
+#include "hw/framebuffer.h"
 #include "ui/pixel_ops.h"
 
 struct omap_lcd_panel_s {
@@ -70,13 +70,13 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s)
 #define draw_line_func drawfn
 
 #define DEPTH 8
-#include "omap_lcd_template.h"
+#include "hw/omap_lcd_template.h"
 #define DEPTH 15
-#include "omap_lcd_template.h"
+#include "hw/omap_lcd_template.h"
 #define DEPTH 16
-#include "omap_lcd_template.h"
+#include "hw/omap_lcd_template.h"
 #define DEPTH 32
-#include "omap_lcd_template.h"
+#include "hw/omap_lcd_template.h"
 
 static draw_line_func draw_line_table2[33] = {
     [0 ... 32] = NULL,

diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index 7ecd9bd4caa10da71eaedeb2f9045ef8adcb21fc..6e48110c9eef0e739f030aea5eeaf2ee6e85bf0d 100644 (file)
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "omap.h"
-#include "sd.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
+#include "hw/sd.h"
 
 struct omap_mmc_s {
     qemu_irq irq;

diff --git a/hw/omap_sdrc.c b/hw/omap_sdrc.c
index b0f3b8e675657962eecb341b4d13985999b4c42e..510e6cc5808bfa3c0c4a574affcdf9ed1fbc485d 100644 (file)
--- a/hw/omap_sdrc.c
+++ b/hw/omap_sdrc.c
@@ -17,8 +17,8 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
 
 /* SDRAM Controller Subsystem */
 struct omap_sdrc_s {

diff --git a/hw/omap_spi.c b/hw/omap_spi.c
index 8ff01ed99d0e07826f8e5e760553aca4f6ccb866..1cbd98d338f6e4af033af60b0e5cfa41a701ed41 100644 (file)
--- a/hw/omap_spi.c
+++ b/hw/omap_spi.c
@@ -19,8 +19,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "hw.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
 
 /* Multichannel SPI */
 struct omap_mcspi_s {

diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 30998c5ff36a5dfbe08f1bc68e788fe199abafa2..85982334bdbda4eba0d6f4a6718b5929a064c5e5 100644 (file)
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -25,12 +25,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "omap.h"
-#include "boards.h"
-#include "arm-misc.h"
-#include "flash.h"
+#include "hw/omap.h"
+#include "hw/boards.h"
+#include "hw/arm-misc.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c
index 945711eff56e0d7af122fdce20ae31f91ed9ba5c..13e7280e6939857d439c14c1dd4a5a4f500e3d15 100644 (file)
--- a/hw/omap_synctimer.c
+++ b/hw/omap_synctimer.c
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "omap.h"
+#include "hw/omap.h"
 struct omap_synctimer_s {
     MemoryRegion iomem;
     uint32_t val;

diff --git a/hw/omap_tap.c b/hw/omap_tap.c
index e273e971ed422d14e16b872116c46d5f1f0c3a8e..181ecee1a5d115125f66a8b08d24abe4d222969c 100644 (file)
--- a/hw/omap_tap.c
+++ b/hw/omap_tap.c
@@ -18,8 +18,8 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "omap.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
 
 /* TEST-Chip-level TAP */
 static uint64_t omap_tap_read(void *opaque, hwaddr addr,

diff --git a/hw/omap_uart.c b/hw/omap_uart.c
index 0ebfbf8caec5c7cf8aa4ce85dc2be7f1ded3d49a..af51ce753491a900e03a7380c9cfd13730f2e463 100644 (file)
--- a/hw/omap_uart.c
+++ b/hw/omap_uart.c
@@ -18,9 +18,9 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "char/char.h"
-#include "hw.h"
-#include "omap.h"
-#include "serial.h"
+#include "hw/hw.h"
+#include "hw/omap.h"
+#include "hw/serial.h"
 #include "exec/address-spaces.h"
 
 /* UARTs */

diff --git a/hw/onenand.c b/hw/onenand.c
index 00a8738caf5b8cbc0e9af0f09fe0e7b58bf4e0f7..ddba366ef5ba60460499a2f285ad3660a40e55af 100644 (file)
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -19,13 +19,13 @@
  */
 
 #include "qemu-common.h"
-#include "hw.h"
-#include "flash.h"
-#include "irq.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
+#include "hw/irq.h"
 #include "sysemu/blockdev.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/error-report.h"
 
 /* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */

diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c
index f9ba5eeabae72404a7b543bb178013b51749fad3..be64bf2a68ac018da65a333e60446742942b9fc1 100644 (file)
--- a/hw/opencores_eth.c
+++ b/hw/opencores_eth.c
@@ -31,8 +31,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"

diff --git a/hw/openpic.c b/hw/openpic.c
index 20a479c794f2aa42c0515fe8fd767cc5453523cc..03a7075c39c9ddd8c77e5a9a95872837d425132d 100644 (file)
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -33,14 +33,14 @@
  * Serial interrupts, as implemented in Raven chipset are not supported yet.
  *
  */
-#include "hw.h"
-#include "ppc/mac.h"
-#include "pci/pci.h"
-#include "openpic.h"
-#include "sysbus.h"
-#include "pci/msi.h"
+#include "hw/hw.h"
+#include "hw/ppc/mac.h"
+#include "hw/pci/pci.h"
+#include "hw/openpic.h"
+#include "hw/sysbus.h"
+#include "hw/pci/msi.h"
 #include "qemu/bitops.h"
-#include "ppc.h"
+#include "hw/ppc.h"
 
 //#define DEBUG_OPENPIC
 

diff --git a/hw/openrisc_pic.c b/hw/openrisc_pic.c
index aaeb9a9171933849cdfb42ccb461eb44ef319156..931511ec0f772fe71066bdf339f57ef57bef2b4b 100644 (file)
--- a/hw/openrisc_pic.c
+++ b/hw/openrisc_pic.c
@@ -18,7 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "cpu.h"
 
 /* OpenRISC pic handler */

diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index 30947dee6e1b5963d46acba6a724f16afa0f971c..db2aac8cf81afe95a31c61efc6157b35682ed82d 100644 (file)
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -18,15 +18,15 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "boards.h"
+#include "hw/hw.h"
+#include "hw/boards.h"
 #include "elf.h"
-#include "serial.h"
+#include "hw/serial.h"
 #include "net/net.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/qtest.h"
 
 #define KERNEL_LOAD_ADDR 0x100

diff --git a/hw/openrisc_timer.c b/hw/openrisc_timer.c
index d965be77dee8c31c94900e91fbb343a7f90981ac..f6c877f42549fd0bcbe33242afeb4f5c60eebda2 100644 (file)
--- a/hw/openrisc_timer.c
+++ b/hw/openrisc_timer.c
@@ -19,7 +19,7 @@
  */
 
 #include "cpu.h"
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 
 #define TIMER_FREQ    (20 * 1000 * 1000)    /* 20MHz */

diff --git a/hw/palm.c b/hw/palm.c
index a633dfc4b17a8012363328f813ef8b7b5d128716..91bc74af24d9d1fcdd171e4a9ba982bf385acc60 100644 (file)
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "audio/audio.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
-#include "omap.h"
-#include "boards.h"
-#include "arm-misc.h"
-#include "devices.h"
-#include "loader.h"
+#include "hw/omap.h"
+#include "hw/boards.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
+#include "hw/loader.h"
 #include "exec/address-spaces.h"
 
 static uint32_t static_readb(void *opaque, hwaddr offset)

diff --git a/hw/pam.c b/hw/pam.c
index 1d72e88e626dec22754692c7c5dc35aa14a4fb2e..6c0061e06edc2903114c69d1aaacf8d5239c107b 100644 (file)
--- a/hw/pam.c
+++ b/hw/pam.c
@@ -27,7 +27,7 @@
  * THE SOFTWARE.
  */
 #include "sysemu/sysemu.h"
-#include "pam.h"
+#include "hw/pam.h"
 
 void smram_update(MemoryRegion *smram_region, uint8_t smram,
                   uint8_t smm_enabled)

diff --git a/hw/parallel.c b/hw/parallel.c
index 3a4e06bab0c986a462302d001f6a715b4d77ed54..0b9af43d8b36425e088a65b35896b5db3ffac345 100644 (file)
--- a/hw/parallel.c
+++ b/hw/parallel.c
@@ -22,10 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "char/char.h"
-#include "isa.h"
-#include "pc.h"
+#include "hw/isa.h"
+#include "hw/pc.h"
 #include "sysemu/sysemu.h"
 
 //#define DEBUG_PARALLEL

diff --git a/hw/pc-testdev.c b/hw/pc-testdev.c
index cf64a1f20356ac6fc7985c516195097585093b07..8236bce0c79b1a891744708c1fe83861ae3b62d7 100644 (file)
--- a/hw/pc-testdev.c
+++ b/hw/pc-testdev.c
@@ -39,9 +39,9 @@
 #if defined(CONFIG_POSIX)
 #include <sys/mman.h>
 #endif
-#include "hw.h"
-#include "qdev.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/qdev.h"
+#include "hw/isa.h"
 
 #define IOMEM_LEN    0x10000
 

diff --git a/hw/pc.c b/hw/pc.c
index 07caba78ba27359510d6b272cbcf4d25623175aa..309bb83cabf9449b791f82ba7a3e4c910c41fef5 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -21,29 +21,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pc.h"
-#include "serial.h"
-#include "apic.h"
-#include "fdc.h"
-#include "ide.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/serial.h"
+#include "hw/apic.h"
+#include "hw/fdc.h"
+#include "hw/ide.h"
+#include "hw/pci/pci.h"
 #include "monitor/monitor.h"
-#include "fw_cfg.h"
-#include "hpet_emul.h"
-#include "smbios.h"
-#include "loader.h"
+#include "hw/fw_cfg.h"
+#include "hw/hpet_emul.h"
+#include "hw/smbios.h"
+#include "hw/loader.h"
 #include "elf.h"
-#include "multiboot.h"
-#include "mc146818rtc.h"
-#include "i8254.h"
-#include "pcspk.h"
-#include "pci/msi.h"
-#include "sysbus.h"
+#include "hw/multiboot.h"
+#include "hw/mc146818rtc.h"
+#include "hw/i8254.h"
+#include "hw/pcspk.h"
+#include "hw/pci/msi.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_i386.h"
-#include "xen.h"
+#include "hw/xen.h"
 #include "sysemu/blockdev.h"
 #include "hw/block-common.h"
 #include "ui/qemu-spice.h"

diff --git a/hw/pc.h b/hw/pc.h
index da1b102ef1e05e2bcb0be5ae67349ebba782feec..03a027785274b9525f8dab71fa2bf68447b39dc6 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -4,11 +4,11 @@
 #include "qemu-common.h"
 #include "exec/memory.h"
 #include "exec/ioport.h"
-#include "isa.h"
-#include "fdc.h"
+#include "hw/isa.h"
+#include "hw/fdc.h"
 #include "net/net.h"
 #include "exec/memory.h"
-#include "ioapic.h"
+#include "hw/ioapic.h"
 
 /* PC-style peripherals (also used by other machines).  */
 

diff --git a/hw/pc87312.c b/hw/pc87312.c
index 0e9760e6b293f08bc2d0e5c43d6493b41d0e5b5e..c4e4c6273bd3fa1855e921ccc0da4645e8e8de13 100644 (file)
--- a/hw/pc87312.c
+++ b/hw/pc87312.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include "pc87312.h"
+#include "hw/pc87312.h"
 #include "qemu/error-report.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/pc87312.h b/hw/pc87312.h
index 7b9e6f613201eb374115c6c1683b4fd5153b47ab..ad087c73e5a8cbaecd96a92df6b4af1a81d5ba48 100644 (file)
--- a/hw/pc87312.h
+++ b/hw/pc87312.h
@@ -25,7 +25,7 @@
 #ifndef QEMU_PC87312_H
 #define QEMU_PC87312_H
 
-#include "isa.h"
+#include "hw/isa.h"
 
 
 #define TYPE_PC87312 "pc87312"

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index aa9cc81a2d5dfe1423d9664b2e2a6981029e3568..73a8656df82b25d03b181e47dc057fab194d3489 100644 (file)
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -24,23 +24,23 @@
 
 #include <glib.h>
 
-#include "hw.h"
-#include "pc.h"
-#include "apic.h"
-#include "pci/pci.h"
-#include "pci/pci_ids.h"
-#include "usb.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/apic.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_ids.h"
+#include "hw/usb.h"
 #include "net/net.h"
-#include "boards.h"
-#include "ide.h"
+#include "hw/boards.h"
+#include "hw/ide.h"
 #include "sysemu/kvm.h"
-#include "kvm/clock.h"
+#include "hw/kvm/clock.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/arch_init.h"
 #include "sysemu/blockdev.h"
-#include "smbus.h"
-#include "xen.h"
+#include "hw/smbus.h"
+#include "hw/xen.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "cpu.h"

diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index e22fb9891d17e71911fc6ea270d8688de57d7379..4f5f34730900bf4ce62ca3bf4205364cee279474 100644 (file)
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -27,17 +27,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/arch_init.h"
-#include "smbus.h"
-#include "boards.h"
-#include "mc146818rtc.h"
-#include "xen.h"
+#include "hw/smbus.h"
+#include "hw/boards.h"
+#include "hw/mc146818rtc.h"
+#include "hw/xen.h"
 #include "sysemu/kvm.h"
-#include "kvm/clock.h"
-#include "q35.h"
+#include "hw/kvm/clock.h"
+#include "hw/q35.h"
 #include "exec/address-spaces.h"
-#include "ich9.h"
+#include "hw/ich9.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/usb.h"

diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
index 8b65a7a4d8d40844fde1076dd502f0d63fc3308c..3e01528e786941867c28266b36f6734a08a5968f 100644 (file)
--- a/hw/pc_sysfw.c
+++ b/hw/pc_sysfw.c
@@ -25,13 +25,13 @@
 
 #include "sysemu/blockdev.h"
 #include "qemu/error-report.h"
-#include "sysbus.h"
-#include "hw.h"
-#include "pc.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
 #include "hw/boards.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "sysemu/sysemu.h"
-#include "flash.h"
+#include "hw/flash.h"
 #include "sysemu/kvm.h"
 
 #define BIOS_FILENAME "bios.bin"

diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c
index 1124c53b8c0dc716fb45feffc1ad36d306540486..9cc6a4082df89d818dcb99521c7482be6bf58582 100644 (file)
--- a/hw/pci_bridge_dev.c
+++ b/hw/pci_bridge_dev.c
@@ -19,13 +19,13 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pci/pci_bridge.h"
-#include "pci/pci_ids.h"
-#include "pci/msi.h"
-#include "pci/shpc.h"
-#include "pci/slotid_cap.h"
+#include "hw/pci/pci_bridge.h"
+#include "hw/pci/pci_ids.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/shpc.h"
+#include "hw/pci/slotid_cap.h"
 #include "exec/memory.h"
-#include "pci/pci_bus.h"
+#include "hw/pci/pci_bus.h"
 
 struct PCIBridgeDev {
     PCIBridge bridge;

diff --git a/hw/pckbd.c b/hw/pckbd.c
index 3bad09baf28e830e5fd11ee7b8cc709e54fdd038..cc63df0570dcd910e8a219b93eac1d0138d07dcd 100644 (file)
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "isa.h"
-#include "pc.h"
-#include "ps2.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
+#include "hw/pc.h"
+#include "hw/ps2.h"
 #include "sysemu/sysemu.h"
 
 /* debug PC keyboard */

diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index df63b2246319e4d9cc223816bf8a873dcd87ad88..55f80ca671dbaff610cf4bc4ccbc309337b56a8c 100644 (file)
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -27,13 +27,13 @@
  * AMD Publication# 19436  Rev:E  Amendment/0  Issue Date: June 2000
  */
 
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 #include "net/net.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "qemu/timer.h"
 #include "sysemu/dma.h"
 
-#include "pcnet.h"
+#include "hw/pcnet.h"
 
 //#define PCNET_DEBUG
 //#define PCNET_DEBUG_IO

diff --git a/hw/pcnet.c b/hw/pcnet.c
index e0de1e3458fee83e7e0f89601b976d33aee029d7..b0b462b02e3151b62f6ee386ac5e3ee0e1cf9c1a 100644 (file)
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -35,13 +35,13 @@
  * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
  */
 
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "net/net.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"
 #include "sysemu/sysemu.h"
 
-#include "pcnet.h"
+#include "hw/pcnet.h"
 
 //#define PCNET_DEBUG
 //#define PCNET_DEBUG_IO

diff --git a/hw/pcspk.c b/hw/pcspk.c
index dfab9559ae92426c74fcad229855cc140cb5babf..d5334159502916f08e685ed81d35b03a96822170 100644 (file)
--- a/hw/pcspk.c
+++ b/hw/pcspk.c
@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
 #include "audio/audio.h"
 #include "qemu/timer.h"
-#include "i8254.h"
-#include "pcspk.h"
+#include "hw/i8254.h"
+#include "hw/pcspk.h"
 
 #define PCSPK_BUF_LEN 1792
 #define PCSPK_SAMPLE_RATE 32000

diff --git a/hw/pcspk.h b/hw/pcspk.h
index 7f42bac1c8e035965a009ebd3d40b5e9c21425dc..f448d221dafbcfc43f9500bc4bca31be7f4580c8 100644 (file)
--- a/hw/pcspk.h
+++ b/hw/pcspk.h
@@ -25,8 +25,8 @@
 #ifndef HW_PCSPK_H
 #define HW_PCSPK_H
 
-#include "hw.h"
-#include "isa.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
 
 static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit)
 {

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index fe7a932009127e58402ec4175325a75b5373cba2..cfc02207abe66199bc496a2544c23017b6012703 100644 (file)
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -25,23 +25,23 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
 #include "net/net.h"
-#include "flash.h"
+#include "hw/flash.h"
 #include "sysemu/sysemu.h"
-#include "devices.h"
-#include "boards.h"
-#include "xilinx.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/xilinx.h"
 #include "sysemu/blockdev.h"
-#include "serial.h"
+#include "hw/serial.h"
 #include "exec/address-spaces.h"
-#include "ssi.h"
+#include "hw/ssi.h"
 
-#include "microblaze_boot.h"
-#include "microblaze_pic_cpu.h"
+#include "hw/microblaze_boot.h"
+#include "hw/microblaze_pic_cpu.h"
 
-#include "stream.h"
+#include "hw/stream.h"
 
 #define LMB_BRAM_SIZE  (128 * 1024)
 #define FLASH_SIZE     (32 * 1024 * 1024)

diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 8605fb8c003b1836273e46ce0a4c0b85082e890a..24983621e59fbf0b2c9d59136a863ba98442c14b 100644 (file)
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -23,19 +23,19 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
 #include "net/net.h"
-#include "flash.h"
+#include "hw/flash.h"
 #include "sysemu/sysemu.h"
-#include "devices.h"
-#include "boards.h"
-#include "xilinx.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/xilinx.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
-#include "microblaze_boot.h"
-#include "microblaze_pic_cpu.h"
+#include "hw/microblaze_boot.h"
+#include "hw/microblaze_pic_cpu.h"
 
 #define LMB_BRAM_SIZE  (128 * 1024)
 #define FLASH_SIZE     (16 * 1024 * 1024)

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 123b00653a80777f1533ea1fd1c60b45fdc21ee4..5d57babe078230b72694b470a6a45d008c075395 100644 (file)
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -36,13 +36,13 @@
  * It does not implement much more ...
  */
 
-#include "hw.h"
-#include "flash.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
 #include "block/block.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
 #include "qemu/host-utils.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #define PFLASH_BUG(fmt, ...) \
 do { \

diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 44bd4654f0f20e1517513a5df75a7c13ca59d816..37b4fcc234d56b5be9e7923d7814f562631c4b8c 100644 (file)
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -35,13 +35,13 @@
  * It does not implement multiple sectors erase
  */
 
-#include "hw.h"
-#include "flash.h"
+#include "hw/hw.h"
+#include "hw/flash.h"
 #include "qemu/timer.h"
 #include "block/block.h"
 #include "exec/address-spaces.h"
 #include "qemu/host-utils.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 //#define PFLASH_DEBUG
 #ifdef PFLASH_DEBUG

diff --git a/hw/piix4.c b/hw/piix4.c
index c1cb94d39f57c8860c4afd6c79e78277ad0dfaf5..0f5cd014e59815ccb5656529687c08a295d4d96d 100644 (file)
--- a/hw/piix4.c
+++ b/hw/piix4.c
@@ -22,11 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "pci/pci.h"
-#include "isa.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
 
 PCIDevice *piix4_dev;
 

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 6c77e493e469836fd4d3561f35502cc40e9364f3..ac33db5cde2df7387b919c37e5da59eba1226d37 100644 (file)
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -22,15 +22,15 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
-#include "isa.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
 #include "qemu/range.h"
-#include "xen.h"
-#include "pam.h"
+#include "hw/xen.h"
+#include "hw/pam.h"
 #include "sysemu/sysemu.h"
 
 /*

diff --git a/hw/pl011.c b/hw/pl011.c
index 002a50e16a80e80462e7f2905ef822ce818a7d50..332d5b970c4de01a955f5fccec654e1dc4b3609b 100644 (file)
--- a/hw/pl011.c
+++ b/hw/pl011.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "char/char.h"
 
 typedef struct {

diff --git a/hw/pl022.c b/hw/pl022.c
index c160e9061c58bfe2d4dbf1628b07fae9b636784b..536c2166fe137805b20ff8bc59e14fa1aaa4ac2b 100644 (file)
--- a/hw/pl022.c
+++ b/hw/pl022.c
@@ -7,8 +7,8 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "ssi.h"
+#include "hw/sysbus.h"
+#include "hw/ssi.h"
 
 //#define DEBUG_PL022 1
 

diff --git a/hw/pl031.c b/hw/pl031.c
index 757867ff7995b2c2d601042db14a40c7b0e2a5d5..764940be7eb4fcb63d8aac1202189adf966ca664 100644 (file)
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -11,7 +11,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/pl041.c b/hw/pl041.c
index 0b71c45748348a9f7ba4658418e5123b8ba7a7fd..92dddc2923ab527a6524a29d15a8c63f4ae76a19 100644 (file)
--- a/hw/pl041.c
+++ b/hw/pl041.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
-#include "pl041.h"
-#include "lm4549.h"
+#include "hw/pl041.h"
+#include "hw/lm4549.h"
 
 #if 0
 #define PL041_DEBUG_LEVEL 1

diff --git a/hw/pl050.c b/hw/pl050.c
index 5d06bc9a3fa10d1d764c253163d1eaa6d557e34c..bc31ab688585ba1f68541ef3030e091abb14fee7 100644 (file)
--- a/hw/pl050.c
+++ b/hw/pl050.c
@@ -7,8 +7,8 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "ps2.h"
+#include "hw/sysbus.h"
+#include "hw/ps2.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/pl061.c b/hw/pl061.c
index a78e819d967e52880fa7e00a26b2cd321717958a..74bc109488a661de4f517e62d62d5316af45f56a 100644 (file)
--- a/hw/pl061.c
+++ b/hw/pl061.c
@@ -8,7 +8,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 //#define DEBUG_PL061 1
 

diff --git a/hw/pl080.c b/hw/pl080.c
index f6bbf98a7ee2cfb818c2d2b3ee1cb995fb87314a..00b66b45b097ea28193e840d9985573e54b45161 100644 (file)
--- a/hw/pl080.c
+++ b/hw/pl080.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #define PL080_MAX_CHANNELS 8
 #define PL080_CONF_E    0x1

diff --git a/hw/pl110.c b/hw/pl110.c
index 3d0ac00ade83e1d8e10525dc7cfe2a13e291c814..924642d6977596ac2af05668cacc9796b4b9c221 100644 (file)
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -7,9 +7,9 @@
  * This code is licensed under the GNU LGPL
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "ui/console.h"
-#include "framebuffer.h"
+#include "hw/framebuffer.h"
 #include "ui/pixel_ops.h"
 
 #define PL110_CR_EN   0x001
@@ -111,15 +111,15 @@ static const unsigned char *idregs[] = {
 };
 
 #define BITS 8
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define BITS 15
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define BITS 16
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define BITS 24
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define BITS 32
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 
 static int pl110_enabled(pl110_state *s)
 {

diff --git a/hw/pl110_template.h b/hw/pl110_template.h
index e738e4a241bf2eb268db26feb9f1edc7b17f356d..ec4bfd6f8ccf5bdb7481bcddda584429c1678aa2 100644 (file)
--- a/hw/pl110_template.h
+++ b/hw/pl110_template.h
@@ -27,20 +27,20 @@
 #undef RGB
 #define BORDER bgr
 #define ORDER 0
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define ORDER 1
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define ORDER 2
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #undef BORDER
 #define RGB
 #define BORDER rgb
 #define ORDER 0
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define ORDER 1
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #define ORDER 2
-#include "pl110_template.h"
+#include "hw/pl110_template.h"
 #undef BORDER
 
 static drawfn glue(pl110_draw_fn_,BITS)[48] =

diff --git a/hw/pl181.c b/hw/pl181.c
index 98529f78211bfee14f9c767dbd45c1df28854852..2527296776c32bc2dbc945f9100337ea64455cb8 100644 (file)
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -8,8 +8,8 @@
  */
 
 #include "sysemu/blockdev.h"
-#include "sysbus.h"
-#include "sd.h"
+#include "hw/sysbus.h"
+#include "hw/sd.h"
 
 //#define DEBUG_PL181 1
 

diff --git a/hw/pl190.c b/hw/pl190.c
index 76ac159374ca87670938d922b93db157d0563e9a..9610673d946fd2d8240effef3645920b38c99c92 100644 (file)
--- a/hw/pl190.c
+++ b/hw/pl190.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 /* The number of virtual priority levels.  16 user vectors plus the
    unvectored IRQ.  Chained interrupts would require an additional level

diff --git a/hw/pm_smbus.c b/hw/pm_smbus.c
index ea1380ca680d1b4dceae4a923b32ddad5e26bb94..790061065ce59ca6a074072b5c5d9000099499c2 100644 (file)
--- a/hw/pm_smbus.c
+++ b/hw/pm_smbus.c
@@ -17,10 +17,10 @@
  * License along with this library; if not, see
  * <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "pc.h"
-#include "pm_smbus.h"
-#include "smbus.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pm_smbus.h"
+#include "hw/smbus.h"
 
 /* no save/load? */
 

diff --git a/hw/ppc.c b/hw/ppc.c
index 8cfb84fa13fc73d1aa40c61194cbd8cfcaad33c8..c9437fc6a7c35f50463874d5a3c0d89b467eeff7 100644 (file)
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc.h"
+#include "hw/hw.h"
+#include "hw/ppc.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "nvram.h"
+#include "hw/nvram.h"
 #include "qemu/log.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 

diff --git a/hw/ppc405.h b/hw/ppc405.h
index 535cbfb33903b4c0be2968dd9c87afd47ca1f80c..45c2159aa6ce0b4c3de5c31cc50647fec136177c 100644 (file)
--- a/hw/ppc405.h
+++ b/hw/ppc405.h
@@ -25,7 +25,7 @@
 #if !defined(PPC_405_H)
 #define PPC_405_H
 
-#include "ppc4xx.h"
+#include "hw/ppc4xx.h"
 
 /* Bootinfo as set-up by u-boot */
 typedef struct ppc4xx_bd_info_t ppc4xx_bd_info_t;

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index cf371db053abd1a60fedf8b33effb7e6662b6873..ba443cf8ef1063af755f783a77599429227b1311 100644 (file)
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -21,16 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc.h"
-#include "ppc405.h"
-#include "nvram.h"
-#include "flash.h"
+#include "hw/hw.h"
+#include "hw/ppc.h"
+#include "hw/ppc405.h"
+#include "hw/nvram.h"
+#include "hw/flash.h"
 #include "sysemu/sysemu.h"
 #include "block/block.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "qemu/log.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index d8cbe875bdf4446cc68227ed3254992a89c0bf95..8465f6dcd44e4de088fb314de5bae0e46e2bac6d 100644 (file)
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc.h"
-#include "ppc405.h"
-#include "serial.h"
+#include "hw/hw.h"
+#include "hw/ppc.h"
+#include "hw/ppc405.h"
+#include "hw/serial.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"

diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 73b5ac725c1f585ee228313e4e42bd21cdc10f89..66911b58c67c1e09bf7ba75b0aa4a706f5cfe8f9 100644 (file)
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -14,20 +14,20 @@
 #include "config.h"
 #include "qemu-common.h"
 #include "net/net.h"
-#include "hw.h"
-#include "pci/pci.h"
-#include "boards.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/boards.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "sysemu/device_tree.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
-#include "serial.h"
-#include "ppc.h"
-#include "ppc405.h"
+#include "hw/serial.h"
+#include "hw/ppc.h"
+#include "hw/ppc405.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
 

diff --git a/hw/ppc4xx.h b/hw/ppc4xx.h
index 59dba9e29269a1fd4ae6004ddbc22a1faa5d14cf..91d84bad638c9b1d10559183e42c55d911a288d8 100644 (file)
--- a/hw/ppc4xx.h
+++ b/hw/ppc4xx.h
@@ -25,7 +25,7 @@
 #if !defined(PPC_4XX_H)
 #define PPC_4XX_H
 
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 
 /* PowerPC 4xx core initialization */
 PowerPCCPU *ppc4xx_init(const char *cpu_model,

diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index b6bb0e166a0b83e0c8d4528de2b8ce5733e5d1cd..49ec728a7b2e9dff3e9a4768f44d356e73d453cd 100644 (file)
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc.h"
-#include "ppc4xx.h"
+#include "hw/hw.h"
+#include "hw/ppc.h"
+#include "hw/ppc4xx.h"
 #include "qemu/log.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c
index ba2d669b8346306bd159c323bee88e2f083a8a46..f3bbe88529a7bf5a1e3dd758d082e89bef6a3543 100644 (file)
--- a/hw/ppc4xx_pci.c
+++ b/hw/ppc4xx_pci.c
@@ -19,11 +19,11 @@
 /* This file implements emulation of the 32-bit PCI controller found in some
  * 4xx SoCs, such as the 440EP. */
 
-#include "hw.h"
-#include "ppc.h"
-#include "ppc4xx.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
+#include "hw/hw.h"
+#include "hw/ppc.h"
+#include "hw/ppc4xx.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
 #include "exec/address-spaces.h"
 
 #undef DEBUG

diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c
index 25a4e91b6966fd9a5ad12bbc7a41711e66bec15c..30375c0c41b4d2518fed96c99577063d9f654d49 100644 (file)
--- a/hw/ppc_booke.c
+++ b/hw/ppc_booke.c
@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc.h"
+#include "hw/hw.h"
+#include "hw/ppc.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "nvram.h"
+#include "hw/nvram.h"
 #include "qemu/log.h"
-#include "loader.h"
+#include "hw/loader.h"
 
 
 /* Timer Control Register */

diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 1e1ade3d2eaa45002c16ac06667a20ce83d23479..310ae1c03d8961be5d184481acdca5bf226c0071 100644 (file)
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -14,12 +14,12 @@
  * (at your option) any later version.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "hw/ppc/e500-ccsr.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
 #include "qemu/bswap.h"
-#include "ppce500_pci.h"
+#include "hw/ppce500_pci.h"
 
 #ifdef DEBUG_PCI
 #define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)

diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index 5bdce52e24e79fae58c3e66fd662141b8f84dccd..d904fbe17650cac140872b3d43facd6d706c0b01 100644 (file)
--- a/hw/ppce500_spin.c
+++ b/hw/ppce500_spin.c
@@ -27,9 +27,9 @@
  *
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/kvm.h"
 
 #define MAX_CPUS 32

diff --git a/hw/prep_pci.c b/hw/prep_pci.c
index 52ee5d94019c880bd8915fe64f72922e0921f342..d21e87671e858cbb1b594032a082c1a80722de82 100644 (file)
--- a/hw/prep_pci.c
+++ b/hw/prep_pci.c
@@ -23,11 +23,11 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pci/pci.h"
-#include "pci/pci_bus.h"
-#include "pci/pci_host.h"
-#include "pc.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_bus.h"
+#include "hw/pci/pci_host.h"
+#include "hw/pc.h"
 #include "exec/address-spaces.h"
 
 #define TYPE_RAVEN_PCI_DEVICE "raven"

diff --git a/hw/ps2.c b/hw/ps2.c
index 15cfd5bb76e7c7dfbdd068618d37395b494d2d3d..233a087a5ead3b473b8de4c1277db05d5ad780d9 100644 (file)
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ps2.h"
+#include "hw/hw.h"
+#include "hw/ps2.h"
 #include "ui/console.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/ptimer.c b/hw/ptimer.c
index 24af6a2afe30ba3ff7bf5fca0068026210c25be6..4bc96c9fa2e9007cfe4b28b65ab30897aa409510 100644 (file)
--- a/hw/ptimer.c
+++ b/hw/ptimer.c
@@ -5,9 +5,9 @@
  *
  * This code is licensed under the GNU LGPL.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "qemu/host-utils.h"
 
 struct ptimer_state

diff --git a/hw/puv3.c b/hw/puv3.c
index c722510d7e78794ab8a37337469652b6c4c897bc..f9d0c2bab191663e95fb2d4d7d52f4e37b8fc85d 100644 (file)
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -13,13 +13,13 @@
 #include "ui/console.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
-#include "sysbus.h"
-#include "boards.h"
-#include "loader.h"
-#include "pc.h"
+#include "hw/sysbus.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
+#include "hw/pc.h"
 
 #undef DEBUG_PUV3
-#include "puv3.h"
+#include "hw/puv3.h"
 
 #define KERNEL_LOAD_ADDR        0x03000000
 #define KERNEL_MAX_SIZE         0x00800000 /* Just a guess */

diff --git a/hw/puv3_dma.c b/hw/puv3_dma.c
index 9de63b4c3449b8b060969db4870f2aeb943487d6..c05a14ea16ff2a5e1fbd63b589dcceaffd51e5e3 100644 (file)
--- a/hw/puv3_dma.c
+++ b/hw/puv3_dma.c
@@ -8,11 +8,11 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
-#include "puv3.h"
+#include "hw/puv3.h"
 
 #define PUV3_DMA_CH_NR          (6)
 #define PUV3_DMA_CH_MASK        (0xff)

diff --git a/hw/puv3_gpio.c b/hw/puv3_gpio.c
index 152248d2919a50cb483b9f36616c04740f11424e..b2a790b683bfc25459a3f21054c67f6c73f03aad 100644 (file)
--- a/hw/puv3_gpio.c
+++ b/hw/puv3_gpio.c
@@ -8,11 +8,11 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
-#include "puv3.h"
+#include "hw/puv3.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/puv3_intc.c b/hw/puv3_intc.c
index 07f564906565f2323303127401062e33fcbf0513..6bc9e1a752496e4c19106a19872b669882c597bd 100644 (file)
--- a/hw/puv3_intc.c
+++ b/hw/puv3_intc.c
@@ -8,10 +8,10 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
-#include "puv3.h"
+#include "hw/puv3.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/puv3_ost.c b/hw/puv3_ost.c
index 14c6f21a756fd11fc6d60918234a354c46707a45..10a522adbb46d23961a49315f018c7a71b4c7880 100644 (file)
--- a/hw/puv3_ost.c
+++ b/hw/puv3_ost.c
@@ -8,11 +8,11 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
-#include "sysbus.h"
-#include "ptimer.h"
+#include "hw/sysbus.h"
+#include "hw/ptimer.h"
 
 #undef DEBUG_PUV3
-#include "puv3.h"
+#include "hw/puv3.h"
 
 /* puv3 ostimer implementation. */
 typedef struct {

diff --git a/hw/puv3_pm.c b/hw/puv3_pm.c
index 87a687afaead97a318c9e48c161eca491dd27b9d..6b8d94dd07262d75a98aed8b917540215a54872b 100644 (file)
--- a/hw/puv3_pm.c
+++ b/hw/puv3_pm.c
@@ -8,11 +8,11 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
-#include "hw.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
-#include "puv3.h"
+#include "hw/puv3.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index d303320d42892c44abe76142d4773e1d6d77c720..c0f50c90fe4865541df42be05edfe38a753b8018 100644 (file)
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -7,12 +7,12 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "pxa.h"
+#include "hw/sysbus.h"
+#include "hw/pxa.h"
 #include "sysemu/sysemu.h"
-#include "serial.h"
-#include "i2c.h"
-#include "ssi.h"
+#include "hw/serial.h"
+#include "hw/i2c.h"
+#include "hw/ssi.h"
 #include "char/char.h"
 #include "sysemu/blockdev.h"
 

diff --git a/hw/pxa2xx_dma.c b/hw/pxa2xx_dma.c
index c0dba45752c198126659b4ec0d4883bf3de8c69d..1db21c99ab3f45af76ee4d90cf70aca8cb800fb5 100644 (file)
--- a/hw/pxa2xx_dma.c
+++ b/hw/pxa2xx_dma.c
@@ -8,9 +8,9 @@
  * This code is licensed under the GPL.
  */
 
-#include "hw.h"
-#include "pxa.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/sysbus.h"
 
 #define PXA255_DMA_NUM_CHANNELS 16
 #define PXA27X_DMA_NUM_CHANNELS 32

diff --git a/hw/pxa2xx_gpio.c b/hw/pxa2xx_gpio.c
index 05d2ad2add63320cf140a80fd23ef23e221fd896..eef8411e86dd71097fd8ef50c711dbc3ef9157fc 100644 (file)
--- a/hw/pxa2xx_gpio.c
+++ b/hw/pxa2xx_gpio.c
@@ -7,9 +7,9 @@
  * This code is licensed under the GPL.
  */
 
-#include "hw.h"
-#include "sysbus.h"
-#include "pxa.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
+#include "hw/pxa.h"
 
 #define PXA2XX_GPIO_BANKS      4
 

diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c
index 4ff04ad63b3452e707808a3ab9c0e6510ddd08ed..32ea7a5d34c7b7d73b756229a0b73f3af7c51282 100644 (file)
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -11,8 +11,8 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pxa.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
 #include "ui/console.h"
 
 /*

diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index 512a27e702926043214e5de6fd4ccadbb1931468..6484d27de188ed3edaab243a7bbb13cabf113733 100644 (file)
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -10,13 +10,13 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "pxa.h"
+#include "hw/pxa.h"
 #include "ui/pixel_ops.h"
 /* FIXME: For graphic_rotate. Should probably be done in common code.  */
 #include "sysemu/sysemu.h"
-#include "framebuffer.h"
+#include "hw/framebuffer.h"
 
 struct DMAChannel {
     uint32_t branch;
@@ -976,15 +976,15 @@ static const VMStateDescription vmstate_pxa2xx_lcdc = {
 };
 
 #define BITS 8
-#include "pxa2xx_template.h"
+#include "hw/pxa2xx_template.h"
 #define BITS 15
-#include "pxa2xx_template.h"
+#include "hw/pxa2xx_template.h"
 #define BITS 16
-#include "pxa2xx_template.h"
+#include "hw/pxa2xx_template.h"
 #define BITS 24
-#include "pxa2xx_template.h"
+#include "hw/pxa2xx_template.h"
 #define BITS 32
-#include "pxa2xx_template.h"
+#include "hw/pxa2xx_template.h"
 
 PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem,
                                  hwaddr base, qemu_irq irq)

diff --git a/hw/pxa2xx_mmci.c b/hw/pxa2xx_mmci.c
index 3589968712570270f970d56aab169aaa33c9cbfb..0df83cc1df8ad3f4e5a0f358f66be168526dec38 100644 (file)
--- a/hw/pxa2xx_mmci.c
+++ b/hw/pxa2xx_mmci.c
@@ -10,10 +10,10 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pxa.h"
-#include "sd.h"
-#include "qdev.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/sd.h"
+#include "hw/qdev.h"
 
 struct PXA2xxMMCIState {
     MemoryRegion iomem;

diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c
index 3a79c728ab2446e76374b9c4da63eb324032b175..66fefba58cea252444a1d67cdf78eb814fac5e01 100644 (file)
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -10,9 +10,9 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pcmcia.h"
-#include "pxa.h"
+#include "hw/hw.h"
+#include "hw/pcmcia.h"
+#include "hw/pxa.h"
 
 
 struct PXA2xxPCMCIAState {

diff --git a/hw/pxa2xx_pic.c b/hw/pxa2xx_pic.c
index 90b8fef3f9ede37027dda02b9bdf7f61772a3ba8..145fc78c2fc37c19ff5d378e1a7917efce106a1e 100644 (file)
--- a/hw/pxa2xx_pic.c
+++ b/hw/pxa2xx_pic.c
@@ -8,9 +8,9 @@
  * This code is licensed under the GPL.
  */
 
-#include "hw.h"
-#include "pxa.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/sysbus.h"
 
 #define ICIP   0x00    /* Interrupt Controller IRQ Pending register */
 #define ICMR   0x04    /* Interrupt Controller Mask register */

diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c
index 5c9d2e8bc6b77e9aa2ab78ab78928e11620dc6f0..c173fe4c1158b7cf7afe65cb5a3799e6e1d56fa0 100644 (file)
--- a/hw/pxa2xx_timer.c
+++ b/hw/pxa2xx_timer.c
@@ -7,11 +7,11 @@
  * This code is licensed under the GPL.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "pxa.h"
-#include "sysbus.h"
+#include "hw/pxa.h"
+#include "hw/sysbus.h"
 
 #define OSMR0  0x00
 #define OSMR1  0x04

diff --git a/hw/q35.c b/hw/q35.c
index efebc2786ac736642be00a7c296b90cf60487f37..0a25b8bf1fef5fc6fd062c39e1d3d5357d4593d9 100644 (file)
--- a/hw/q35.c
+++ b/hw/q35.c
@@ -27,8 +27,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "q35.h"
+#include "hw/hw.h"
+#include "hw/q35.h"
 
 /****************************************************************************
  * Q35 host

diff --git a/hw/q35.h b/hw/q35.h
index 246c12cb0440ae7f556ab8aabcf9215149193ae4..d766bb7b023498c7354fd142415f41a54f1f6f77 100644 (file)
--- a/hw/q35.h
+++ b/hw/q35.h
@@ -22,18 +22,18 @@
 #ifndef HW_Q35_H
 #define HW_Q35_H
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/range.h"
-#include "isa.h"
-#include "sysbus.h"
-#include "pc.h"
-#include "apm.h"
-#include "apic.h"
-#include "pci/pci.h"
-#include "pci/pcie_host.h"
-#include "acpi.h"
-#include "acpi_ich9.h"
-#include "pam.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
+#include "hw/pc.h"
+#include "hw/apm.h"
+#include "hw/apic.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pcie_host.h"
+#include "hw/acpi.h"
+#include "hw/acpi_ich9.h"
+#include "hw/pam.h"
 
 #define TYPE_Q35_HOST_DEVICE "q35-pcihost"
 #define Q35_HOST_DEVICE(obj) \

diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index fc2c4379115a3b5777738e4199261a63f75d4749..2398b4a37fce7bf5a768a4fb8298da1dee310a64 100644 (file)
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@@ -1,5 +1,5 @@
-#include "qdev.h"
-#include "qdev-addr.h"
+#include "hw/qdev.h"
+#include "hw/qdev-addr.h"
 #include "exec/hwaddr.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"

diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c
index ce3af2219366810140bfe9d81cee1f5a99f18714..87951444a1c53c50bb6cb3acb34572c45c4b4f54 100644 (file)
--- a/hw/qdev-properties-system.c
+++ b/hw/qdev-properties-system.c
@@ -11,7 +11,7 @@
  */
 
 #include "net/net.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/blockdev.h"
 #include "hw/block-common.h"

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index a8a31f56e429b4fb9368a3b96fa6a7c65c3a25a5..0307a7830b029a85b8da323dcb3b0051e471a9a5 100644 (file)
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,5 +1,5 @@
 #include "net/net.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/blockdev.h"
 #include "hw/block-common.h"

diff --git a/hw/qdev-properties.h b/hw/qdev-properties.h
index 20c67f344353d345f591815161b22ec0576fca94..0b0465c9b34e56243f9ad8e9db81e63e56a63b63 100644 (file)
--- a/hw/qdev-properties.h
+++ b/hw/qdev-properties.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_QDEV_PROPERTIES_H
 #define QEMU_QDEV_PROPERTIES_H
 
-#include "qdev-core.h"
+#include "hw/qdev-core.h"
 
 /*** qdev-properties.c ***/
 

diff --git a/hw/qdev.c b/hw/qdev.c
index 62bc8990f08dc6c1782d35d6d60a3eb16074c787..0b20280133ce28ea60edc5407f5b7d4acda12095 100644 (file)
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -25,7 +25,7 @@
    inherit from a particular bus (e.g. PCI or I2C) rather than
    this API directly.  */
 
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"

diff --git a/hw/qdev.h b/hw/qdev.h
index f814656e0af676f366f594a8f9e4f46cf669fc4b..5cb8b080a623202d9fdddc02a0f9443c5aeb5b19 100644 (file)
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -2,7 +2,7 @@
 #define QDEV_H
 
 #include "hw/hw.h"
-#include "qdev-core.h"
-#include "qdev-properties.h"
+#include "hw/qdev-core.h"
+#include "hw/qdev-properties.h"
 
 #endif

diff --git a/hw/qxl-logger.c b/hw/qxl-logger.c
index 3cd85d9b9786fcfa0d6a1e1763848c4b353a890e..84f9aa1eda63773bd3b3952d9428c9b401b0d083 100644 (file)
--- a/hw/qxl-logger.c
+++ b/hw/qxl-logger.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/timer.h"
-#include "qxl.h"
+#include "hw/qxl.h"
 
 static const char *qxl_type[] = {
     [ QXL_CMD_NOP ]     = "nop",

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index 455fb91269b0d95151320523e095e413d2c6045d..d77df42b7ee9e5de61b011eee92ad6a248706559 100644 (file)
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -19,7 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "qxl.h"
+#include "hw/qxl.h"
 
 static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect)
 {

diff --git a/hw/qxl.c b/hw/qxl.c
index 2e1c5e225b6f75018799ae03c38bee5156098ec5..ef693486c296be831c3fe59eb89dcedab3bc3b46 100644 (file)
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -27,7 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "trace.h"
 
-#include "qxl.h"
+#include "hw/qxl.h"
 
 /*
  * NOTE: SPICE_RING_PROD_ITEM accesses memory on the pci bar and as

diff --git a/hw/qxl.h b/hw/qxl.h
index f867a1d0ac699e3ff179111fbf6dfac90ffb6a78..36f1a2502bf115618f34fc0ce00f973ec67e256c 100644 (file)
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -4,9 +4,9 @@
 #include "qemu-common.h"
 
 #include "ui/console.h"
-#include "hw.h"
-#include "pci/pci.h"
-#include "vga_int.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/vga_int.h"
 #include "qemu/thread.h"
 
 #include "ui/qemu-spice.h"

diff --git a/hw/r2d.c b/hw/r2d.c
index 2d0dd1ffba5c008953fbfc4631ede7dab6966f15..faa03d2069357fa8d28f01aa22a01e55396c92c4 100644 (file)
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -23,19 +23,19 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
-#include "sh.h"
-#include "devices.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
+#include "hw/devices.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "pci/pci.h"
+#include "hw/boards.h"
+#include "hw/pci/pci.h"
 #include "net/net.h"
-#include "sh7750_regs.h"
-#include "ide.h"
-#include "loader.h"
-#include "usb.h"
-#include "flash.h"
+#include "hw/sh7750_regs.h"
+#include "hw/ide.h"
+#include "hw/loader.h"
+#include "hw/usb.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/rc4030.c b/hw/rc4030.c
index a0358a319c9936e854cd267287e01dcc62335876..b065515e672a1cf59d94e548511e47b59aa571d5 100644 (file)
--- a/hw/rc4030.c
+++ b/hw/rc4030.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "mips.h"
+#include "hw/hw.h"
+#include "hw/mips.h"
 #include "qemu/timer.h"
 
 /********************************************************/

diff --git a/hw/realview.c b/hw/realview.c
index 78da7676c484c4474b62ed3a5c6fce321ddb038f..5fb490c832a37aa2ae7c16d9e765464670803273 100644 (file)
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -7,15 +7,15 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "primecell.h"
-#include "devices.h"
-#include "pci/pci.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/primecell.h"
+#include "hw/devices.h"
+#include "hw/pci/pci.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "i2c.h"
+#include "hw/boards.h"
+#include "hw/i2c.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/realview_gic.c b/hw/realview_gic.c
index 8f2a7e2f3451d0f96538ab22e10b898284fc0ac1..0ec30caa069d1d26e9e28d03f4d4edbf9ddec87c 100644 (file)
--- a/hw/realview_gic.c
+++ b/hw/realview_gic.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index d7716beb9e689a7dc787c947e330cc061afdd144..786b875c5891939851a0d11c0e5ffc075dc7f0f2 100644 (file)
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -51,12 +51,12 @@
 /* For crc32 */
 #include <zlib.h>
 
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 #include "qemu/timer.h"
 #include "net/net.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "sysemu/sysemu.h"
 #include "qemu/iov.h"
 

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 6b5699518958142d213d945248e2dcdcc4cb0e14..0faade0766160fb49cee00efb9b3efeef6b35f96 100644 (file)
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -18,8 +18,8 @@
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
 
-#include "sclp.h"
-#include "event-facility.h"
+#include "hw/s390x/sclp.h"
+#include "hw/s390x/event-facility.h"
 
 typedef struct EventTypesBus {
     BusState qbus;

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 65492118200ce91bf278e41cf03816a0c0899200..d4364143ea72c5f5ae2110060971353250f36863 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -12,7 +12,7 @@
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
 #include "s390-virtio.h"
-#include "sclp.h"
+#include "hw/s390x/sclp.h"
 #include "ioinst.h"
 #include "css.h"
 #include "virtio-ccw.h"

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index a9d3a6a91d2f22764342a51b2b5b405a3bb8cbaf..86d6ae0023661ec3dc2f1249454b5da78635de6c 100644 (file)
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -16,7 +16,7 @@
 #include "sysemu/kvm.h"
 #include "exec/memory.h"
 
-#include "sclp.h"
+#include "hw/s390x/sclp.h"
 
 static inline S390SCLPDevice *get_event_facility(void)
 {

diff --git a/hw/s390x/sclpconsole.c b/hw/s390x/sclpconsole.c
index 475d7ba85613f5627d8675a23a6b75bad5be842c..5c881e5f3f940e584e85fd9cd8680984d3eb87c5 100644 (file)
--- a/hw/s390x/sclpconsole.c
+++ b/hw/s390x/sclpconsole.c
@@ -16,8 +16,8 @@
 #include "qemu/thread.h"
 #include "qemu/error-report.h"
 
-#include "sclp.h"
-#include "event-facility.h"
+#include "hw/s390x/sclp.h"
+#include "hw/s390x/event-facility.h"
 #include "char/char.h"
 
 typedef struct ASCIIConsoleData {

diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 2538498959efb0b26918ffed5fd543e02dfcf349..5fadc86d42935376e32f337b6be99ba92fb87f60 100644 (file)
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -13,8 +13,8 @@
  */
 #include <hw/qdev.h>
 #include "sysemu/sysemu.h"
-#include "sclp.h"
-#include "event-facility.h"
+#include "hw/s390x/sclp.h"
+#include "hw/s390x/event-facility.h"
 
 typedef struct SignalQuiesce {
     EventBufferHeader ebh;

diff --git a/hw/sb16.c b/hw/sb16.c
index 52dfedf5f1bc5de30861501fe88f7636da7f8cf2..bd51cebfd8a8e4dd3b4d3d4457e61d7647c02543 100644 (file)
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "audiodev.h"
+#include "hw/hw.h"
+#include "hw/audiodev.h"
 #include "audio/audio.h"
-#include "isa.h"
-#include "qdev.h"
+#include "hw/isa.h"
+#include "hw/qdev.h"
 #include "qemu/timer.h"
 #include "qemu/host-utils.h"
 

diff --git a/hw/sbi.c b/hw/sbi.c
index d58184a6aaa77d60313358955ffb13c365e3c803..8795749de87c157d90e8567e3d86e82c8198bda9 100644 (file)
--- a/hw/sbi.c
+++ b/hw/sbi.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 //#define DEBUG_IRQ
 

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index a97f1cdc1c74d7d6ce55dad659be1495eacd64be..163d7a1a48b724e5e56dd35f7791130809a3efea 100644 (file)
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1,8 +1,8 @@
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/error-report.h"
-#include "scsi.h"
-#include "scsi-defs.h"
-#include "qdev.h"
+#include "hw/scsi.h"
+#include "hw/scsi-defs.h"
+#include "hw/qdev.h"
 #include "sysemu/blockdev.h"
 #include "trace.h"
 #include "sysemu/dma.h"

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index d41158693e023fa7e483649c00d8d6f613879de8..1e128182dbb9a825f62cb72e4eba22c1c1afaa86 100644 (file)
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -30,8 +30,8 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"
-#include "scsi.h"
-#include "scsi-defs.h"
+#include "hw/scsi.h"
+#include "hw/scsi-defs.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/blockdev.h"
 #include "hw/block-common.h"

diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 8175474a67c52e1ab0d595255a605824bdad82a5..4d04caccce3004132aa88bf5ecb694c5ceeb6960 100644 (file)
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -13,7 +13,7 @@
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"
-#include "scsi.h"
+#include "hw/scsi.h"
 #include "sysemu/blockdev.h"
 
 #ifdef __linux__
@@ -35,7 +35,7 @@ do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
 #include <sys/stat.h>
 #include <unistd.h>
 #include <scsi/sg.h>
-#include "scsi-defs.h"
+#include "hw/scsi-defs.h"
 
 #define SCSI_SENSE_BUF_SIZE 96
 

diff --git a/hw/scsi.h b/hw/scsi.h
index a5b5b2ec0d4ae43e3c1122bf62980c7390d45513..33e2e0bdf119dcfa56dbd9054a6d79d733ebed3d 100644 (file)
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_SCSI_H
 #define QEMU_HW_SCSI_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "block/block.h"
 #include "hw/block-common.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sd.c b/hw/sd.c
index 428bd78e327fb4958deb06b87108fd7f290938be..a895123867c2d300c1330ee803c9f56f65c690cd 100644 (file)
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -29,9 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "block/block.h"
-#include "sd.h"
+#include "hw/sd.h"
 #include "qemu/bitmap.h"
 
 //#define DEBUG_SD 1

diff --git a/hw/sdhci.c b/hw/sdhci.c
index e535df96719b038013ec042ca28d85d6bf17ecce..93feada049d559daa7158ad868a2a7dfc29b3934 100644 (file)
--- a/hw/sdhci.c
+++ b/hw/sdhci.c
@@ -22,14 +22,14 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/dma.h"
 #include "qemu/timer.h"
 #include "block/block_int.h"
 #include "qemu/bitops.h"
 
-#include "sdhci.h"
+#include "hw/sdhci.h"
 
 /* host controller debug messages */
 #ifndef SDHC_DEBUG

diff --git a/hw/sdhci.h b/hw/sdhci.h
index 931d7406f0d82136224282e755581f2a7c1f3716..a560c3c93fc67b831a9bf21054ed3bff5a65e1be 100644 (file)
--- a/hw/sdhci.h
+++ b/hw/sdhci.h
@@ -26,8 +26,8 @@
 #define SDHCI_H
 
 #include "qemu-common.h"
-#include "sysbus.h"
-#include "sd.h"
+#include "hw/sysbus.h"
+#include "hw/sd.h"
 
 /* R/W SDMA System Address register 0x0 */
 #define SDHC_SYSAD                     0x00

diff --git a/hw/serial-isa.c b/hw/serial-isa.c
index 5a6f51f856ddbf888255c9955c5e3870afdd5adc..a630a7d506a7e6e05b10e2f18c12f9eb046029c4 100644 (file)
--- a/hw/serial-isa.c
+++ b/hw/serial-isa.c
@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  */
 
-#include "serial.h"
-#include "isa.h"
+#include "hw/serial.h"
+#include "hw/isa.h"
 
 typedef struct ISASerialState {
     ISADevice dev;

diff --git a/hw/serial-pci.c b/hw/serial-pci.c
index 1c31353f6df5e8d1bf730bed86322590dcc30457..954657ba326e1569a6ff1de268c2fcafcdc5f77c 100644 (file)
--- a/hw/serial-pci.c
+++ b/hw/serial-pci.c
@@ -25,8 +25,8 @@
 
 /* see docs/specs/pci-serial.txt */
 
-#include "serial.h"
-#include "pci/pci.h"
+#include "hw/serial.h"
+#include "hw/pci/pci.h"
 
 #define PCI_SERIAL_MAX_PORTS 4
 

diff --git a/hw/serial.c b/hw/serial.c
index f0ce9b0c15001d67e7783a9299d09ba34e6c6892..6a83543125fd2b1ac7aa6b99eda3824c18e452d0 100644 (file)
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include "serial.h"
+#include "hw/serial.h"
 #include "char/char.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"

diff --git a/hw/serial.h b/hw/serial.h
index 98ee4241be05eee51918a69cc2c163c28f89ee0c..814b8c666fdd3114847b23a7c3a5107361a389b0 100644 (file)
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -25,7 +25,7 @@
 #ifndef HW_SERIAL_H
 #define HW_SERIAL_H 1
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "exec/memory.h"
 

diff --git a/hw/sga.c b/hw/sga.c
index 29bc3e0246d64ff285aeadaecf17bb109af5cbce..4b1d4e536997ffd50b0ddd1982f7c3e9b2f36d7c 100644 (file)
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -24,9 +24,9 @@
  * sgabios code originally available at code.google.com/p/sgabios
  *
  */
-#include "pci/pci.h"
-#include "pc.h"
-#include "loader.h"
+#include "hw/pci/pci.h"
+#include "hw/pc.h"
+#include "hw/loader.h"
 #include "sysemu/sysemu.h"
 
 #define SGABIOS_FILENAME "sgabios.bin"

diff --git a/hw/sh.h b/hw/sh.h
index 77bf8aad2c0dc925eb0ca6201487b16d47c9c7e8..6230954eac924e64bfc5782b4d181f541dd3cee8 100644 (file)
--- a/hw/sh.h
+++ b/hw/sh.h
@@ -2,7 +2,7 @@
 #define QEMU_SH_H
 /* Definitions for SH board emulation.  */
 
-#include "sh_intc.h"
+#include "hw/sh_intc.h"
 
 #define A7ADDR(x) ((x) & 0x1fffffff)
 #define P4ADDR(x) ((x) | 0xe0000000)

diff --git a/hw/sh7750.c b/hw/sh7750.c
index 666f8655ed62a0157430b913e5de211eee25d764..6778c94f8ed3b2c64986a8fc82fa01f0becfb90a 100644 (file)
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -23,12 +23,12 @@
  * THE SOFTWARE.
  */
 #include <stdio.h>
-#include "hw.h"
-#include "sh.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
 #include "sysemu/sysemu.h"
-#include "sh7750_regs.h"
-#include "sh7750_regnames.h"
-#include "sh_intc.h"
+#include "hw/sh7750_regs.h"
+#include "hw/sh7750_regnames.h"
+#include "hw/sh_intc.h"
 #include "cpu.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/sh7750_regnames.c b/hw/sh7750_regnames.c
index 5a5a2d80de176fded36c7045c14f0f1a24065315..389698d24af170c00efc60c56ddaad1b85550076 100644 (file)
--- a/hw/sh7750_regnames.c
+++ b/hw/sh7750_regnames.c
@@ -1,7 +1,7 @@
-#include "hw.h"
-#include "sh.h"
-#include "sh7750_regs.h"
-#include "sh7750_regnames.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
+#include "hw/sh7750_regs.h"
+#include "hw/sh7750_regnames.h"
 
 #define REGNAME(r) {r, #r},
 

diff --git a/hw/sh_intc.c b/hw/sh_intc.c
index c3f77d5092ca284f9af10cb646b7940c0bcf1d36..9e64e4d353cb4db6e866107ad95f863d933518f9 100644 (file)
--- a/hw/sh_intc.c
+++ b/hw/sh_intc.c
@@ -8,9 +8,9 @@
  * This code is licensed under the GPL.
  */
 
-#include "sh_intc.h"
-#include "hw.h"
-#include "sh.h"
+#include "hw/sh_intc.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
 
 //#define DEBUG_INTC
 //#define DEBUG_INTC_SOURCES

diff --git a/hw/sh_intc.h b/hw/sh_intc.h
index 6f11beedddb1b95ec4bf2eb2b24972bae008d966..b7ddcb096a81b6dc9934023867fce547279c018f 100644 (file)
--- a/hw/sh_intc.h
+++ b/hw/sh_intc.h
@@ -2,7 +2,7 @@
 #define __SH_INTC_H__
 
 #include "qemu-common.h"
-#include "irq.h"
+#include "hw/irq.h"
 #include "exec/address-spaces.h"
 
 typedef unsigned char intc_enum;

diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 077d95700340dde9d423eccc04260243eb9ddb73..96535dbe018cd8647002ff92f94d89f7516a1d09 100644 (file)
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "sysbus.h"
-#include "sh.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
+#include "hw/sysbus.h"
+#include "hw/sh.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
 #include "qemu/bswap.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 21c5b1362d1da305f02166821e8438111ed7d953..40e797c5a234886bb90382df67bf7536efd33a5a 100644 (file)
--- a/hw/sh_serial.c
+++ b/hw/sh_serial.c
@@ -24,8 +24,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "sh.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
 #include "char/char.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index 64ea23fce65ab0e2681b511574c361448a64b188..b4503230a9ed82f1d27de15e8677e9b2b149efb2 100644 (file)
--- a/hw/sh_timer.c
+++ b/hw/sh_timer.c
@@ -8,11 +8,11 @@
  * This code is licensed under the GPL.
  */
 
-#include "hw.h"
-#include "sh.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 
 //#define DEBUG_TIMER
 

diff --git a/hw/shix.c b/hw/shix.c
index 6f2d55a155cd90bcaa347e7f78ac549785989afa..192579d0658ba1b7ae1a3ec053e878424c4ce54e 100644 (file)
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -27,11 +27,11 @@
 
    More information in target-sh4/README.sh4
 */
-#include "hw.h"
-#include "sh.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "exec/address-spaces.h"
 
 #define BIOS_FILENAME "shix_bios.bin"

diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 136ceebc80312c3e108afe56cb1c955e2dfcaede..b60592b35d363c2522654a563c1456dc3c098f35 100644 (file)
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-#include "sun4m.h"
+#include "hw/sun4m.h"
 #include "monitor/monitor.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 //#define DEBUG_IRQ_COUNT

diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index af24cc1ae82d81101d19ec84d56db760dbff6106..a7a93688646c27b0d8b0fe9d913598a05c278892 100644 (file)
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -23,7 +23,7 @@
  */
 
 #include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 /*

diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index 68a4c0cca46d4d7937ca95da422886b7dcdac8db..83f22a03668faea8f8c80e8a7de9d416ccfaa911 100644 (file)
--- a/hw/slavio_timer.c
+++ b/hw/slavio_timer.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-#include "sun4m.h"
+#include "hw/sun4m.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
-#include "sysbus.h"
+#include "hw/ptimer.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 /*

diff --git a/hw/sm501.c b/hw/sm501.c
index b7ac7f9bffc8f0fa34ac51d1584543818b28286f..0e019111bbf9c4f4fd5d710f16ac57027427282e 100644 (file)
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -23,12 +23,12 @@
  */
 
 #include <stdio.h>
-#include "hw.h"
-#include "serial.h"
+#include "hw/hw.h"
+#include "hw/serial.h"
 #include "ui/console.h"
-#include "devices.h"
-#include "sysbus.h"
-#include "qdev-addr.h"
+#include "hw/devices.h"
+#include "hw/sysbus.h"
+#include "hw/qdev-addr.h"
 #include "qemu/range.h"
 #include "ui/pixel_ops.h"
 
@@ -1171,28 +1171,28 @@ typedef void draw_hwc_line_func(SM501State * s, int crt, uint8_t * palette,
                                 int c_y, uint8_t *d, int width);
 
 #define DEPTH 8
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 #define DEPTH 15
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 #define BGR_FORMAT
 #define DEPTH 15
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 #define DEPTH 16
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 #define BGR_FORMAT
 #define DEPTH 16
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 #define DEPTH 32
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 #define BGR_FORMAT
 #define DEPTH 32
-#include "sm501_template.h"
+#include "hw/sm501_template.h"
 
 static draw_line_func * draw_line8_funcs[] = {
     draw_line8_8,

diff --git a/hw/smbios.c b/hw/smbios.c
index a7b8bfc383d2a5497f34fa5427743be7fe1f9f4f..672ee9b0e7b5b5e7b62f5f84daab935e704ee092 100644 (file)
--- a/hw/smbios.c
+++ b/hw/smbios.c
@@ -14,8 +14,8 @@
  */
 
 #include "sysemu/sysemu.h"
-#include "smbios.h"
-#include "loader.h"
+#include "hw/smbios.h"
+#include "hw/loader.h"
 
 /*
  * Structures shared with the BIOS

diff --git a/hw/smbus.c b/hw/smbus.c
index a9085915906f04867316d5e4965fa95df33cec89..9626415bcaab73c781499f2e3adf260590438db9 100644 (file)
--- a/hw/smbus.c
+++ b/hw/smbus.c
@@ -9,9 +9,9 @@
 
 /* TODO: Implement PEC.  */
 
-#include "hw.h"
-#include "i2c.h"
-#include "smbus.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
+#include "hw/smbus.h"
 
 //#define DEBUG_SMBUS 1
 

diff --git a/hw/smbus.h b/hw/smbus.h
index 6ed45bd03d9a2446d29a68b929956ec9ffbcf1f0..c3db620e00cb8f6d69ea70801b743f2e61c5696a 100644 (file)
--- a/hw/smbus.h
+++ b/hw/smbus.h
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include "i2c.h"
+#include "hw/i2c.h"
 
 #define TYPE_SMBUS_DEVICE "smbus-device"
 #define SMBUS_DEVICE(obj) \

diff --git a/hw/smbus_eeprom.c b/hw/smbus_eeprom.c
index d36dc7bbe3e34680c6b1318d6e712a343cfa1d5b..dff8403d6ce90e864db134d4b426ed309b0fc7dd 100644 (file)
--- a/hw/smbus_eeprom.c
+++ b/hw/smbus_eeprom.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "i2c.h"
-#include "smbus.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
+#include "hw/smbus.h"
 
 //#define DEBUG
 

diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c
index 16db3a743cfae92b8a4d7980d3525832bdde54f2..732ebd3bb0a41c3e86be786e014e61582ce828d6 100644 (file)
--- a/hw/smbus_ich9.c
+++ b/hw/smbus_ich9.c
@@ -24,15 +24,15 @@
  * GNU GPL, version 2 or (at your option) any later version.
  *
  */
-#include "hw.h"
-#include "pc.h"
-#include "pm_smbus.h"
-#include "pci/pci.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pm_smbus.h"
+#include "hw/pci/pci.h"
 #include "sysemu/sysemu.h"
-#include "i2c.h"
-#include "smbus.h"
+#include "hw/i2c.h"
+#include "hw/smbus.h"
 
-#include "ich9.h"
+#include "hw/ich9.h"
 
 #define TYPE_ICH9_SMB_DEVICE "ICH9 SMB"
 #define ICH9_SMB_DEVICE(obj) \

diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index 67fd074d85c287f7a9ee2215e7b3fddc145fb1fa..c2feae6eb8e905690d118e17a5a3ad0afb355591 100644 (file)
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -7,9 +7,9 @@
  * This code is licensed under the GPL
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
-#include "devices.h"
+#include "hw/devices.h"
 /* For crc32 */
 #include <zlib.h>
 

diff --git a/hw/soc_dma.c b/hw/soc_dma.c
index 64e8ee1d13517cfa74e75ae4bf65b952a2eecd96..db5d60938898b14fa195d35af8c1b2f38d6e9541 100644 (file)
--- a/hw/soc_dma.c
+++ b/hw/soc_dma.c
@@ -19,7 +19,7 @@
  */
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "soc_dma.h"
+#include "hw/soc_dma.h"
 
 static void transfer_mem2mem(struct soc_dma_ch_s *ch)
 {

diff --git a/hw/spapr.c b/hw/spapr.c
index e88a27aa71f0129e063e51b1c66bffaefcdf9315..2709c660c161fd95e1b4f9cb9653237db4ad1f31 100644 (file)
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -25,7 +25,7 @@
  *
  */
 #include "sysemu/sysemu.h"
-#include "hw.h"
+#include "hw/hw.h"
 #include "elf.h"
 #include "net/net.h"
 #include "sysemu/blockdev.h"
@@ -45,7 +45,7 @@
 
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 
 #include "exec/address-spaces.h"
 #include "hw/usb.h"

diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c
index d8a098cb1b23124b0a826e904aa2947ee17fa6ed..8d500bf6be01ad80aa9fe0fc59e14ac0f0670b1b 100644 (file)
--- a/hw/spapr_iommu.c
+++ b/hw/spapr_iommu.c
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/kvm.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "kvm_ppc.h"
 #include "sysemu/dma.h"
 #include "exec/address-spaces.h"

diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c
index 6ef29362f5b2d44e25d60ad6a6e3cb186403c6e9..5d2565b4846ca5e2fa559dd98b42334769caf098 100644 (file)
--- a/hw/spapr_llan.c
+++ b/hw/spapr_llan.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  *
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "net/net.h"
 #include "hw/qdev.h"
 #include "hw/spapr.h"

diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index 4eacbcfd5815b0e5152e5f272c587da61a235abf..36adbc5592428db42ec9e7524ced3e3925c6ee92 100644 (file)
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -22,11 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pci/pci.h"
-#include "pci/msi.h"
-#include "pci/msix.h"
-#include "pci/pci_host.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/msix.h"
+#include "hw/pci/pci_host.h"
 #include "hw/spapr.h"
 #include "hw/spapr_pci.h"
 #include "exec/address-spaces.h"

diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index 34c9ca6b65e0a85da172c70757afe5b81a170e0e..6eb3ab54824b3de29d9ec42bb7dfb90f1a8ec4ef 100644 (file)
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -19,11 +19,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "monitor/monitor.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index 7fc0e13f9fdfb0d6d6f567672a23402950156bef..27940949ce5c472699a07c540484875fffeb8354 100644 (file)
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -31,10 +31,10 @@
  *  - Add indirect descriptors support
  *  - Maybe do autosense (PAPR seems to mandate it, linux doesn't care)
  */
-#include "hw.h"
-#include "scsi.h"
-#include "scsi-defs.h"
-#include "srp.h"
+#include "hw/hw.h"
+#include "hw/scsi.h"
+#include "hw/scsi-defs.h"
+#include "hw/srp.h"
 #include "hw/qdev.h"
 #include "hw/spapr.h"
 #include "hw/spapr_vio.h"

diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c
index 5c63eaafa97160044d641e539775cc92d23256d8..be08571d230b96c8f15910c5d71989713fab9a47 100644 (file)
--- a/hw/spapr_vty.c
+++ b/hw/spapr_vty.c
@@ -1,4 +1,4 @@
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "char/char.h"
 #include "hw/spapr.h"
 #include "hw/spapr_vio.h"

diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c
index 6d0df51749c7e9505ceebffd78583d5d20faa7fd..18e368ec98cb26a09de8493f1b747b84bb9feb75 100644 (file)
--- a/hw/sparc32_dma.c
+++ b/hw/sparc32_dma.c
@@ -25,10 +25,10 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "sparc32_dma.h"
-#include "sun4m.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sparc32_dma.h"
+#include "hw/sun4m.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 /*

diff --git a/hw/spitz.c b/hw/spitz.c
index 5bc49fcd27395ac0114e332bf44b71613e831553..f5832bea935f10a58f465e00d0539b6a70360d9e 100644 (file)
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -10,23 +10,23 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pxa.h"
-#include "arm-misc.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/arm-misc.h"
 #include "sysemu/sysemu.h"
-#include "pcmcia.h"
-#include "i2c.h"
-#include "ssi.h"
-#include "flash.h"
+#include "hw/pcmcia.h"
+#include "hw/i2c.h"
+#include "hw/ssi.h"
+#include "hw/flash.h"
 #include "qemu/timer.h"
-#include "devices.h"
-#include "sharpsl.h"
+#include "hw/devices.h"
+#include "hw/sharpsl.h"
 #include "ui/console.h"
 #include "block/block.h"
 #include "audio/audio.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "sysemu/blockdev.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 
 #undef REG_FMT

diff --git a/hw/ssd0303.c b/hw/ssd0303.c
index 8777b1681ae69bc6a69d6095e6a5af7722902f7f..db50909734998386eea6ecba8c3aeb07a3c286a0 100644 (file)
--- a/hw/ssd0303.c
+++ b/hw/ssd0303.c
@@ -10,7 +10,7 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
-#include "i2c.h"
+#include "hw/i2c.h"
 #include "ui/console.h"
 
 //#define DEBUG_SSD0303 1

diff --git a/hw/ssd0323.c b/hw/ssd0323.c
index 84c86a52446b83b0126f8db4e0b05b15768230ce..27b415199451496aae82ba61c65ed037c0449982 100644 (file)
--- a/hw/ssd0323.c
+++ b/hw/ssd0323.c
@@ -10,7 +10,7 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
-#include "ssi.h"
+#include "hw/ssi.h"
 #include "ui/console.h"
 
 //#define DEBUG_SSD0323 1

diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c
index dca8906e7db7635f6ec353cf17d2f2c13027e4d4..4d3c4f6445d370cf513ccc03c2544d2c1d122ba0 100644 (file)
--- a/hw/ssi-sd.c
+++ b/hw/ssi-sd.c
@@ -11,8 +11,8 @@
  */
 
 #include "sysemu/blockdev.h"
-#include "ssi.h"
-#include "sd.h"
+#include "hw/ssi.h"
+#include "hw/sd.h"
 
 //#define DEBUG_SSI_SD 1
 

diff --git a/hw/ssi.c b/hw/ssi.c
index 0b18176f7a788b6a5564278eae1e2d057160272c..1264d9da23d1c4adf9037178ddc03befa0e376a4 100644 (file)
--- a/hw/ssi.c
+++ b/hw/ssi.c
@@ -12,7 +12,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "ssi.h"
+#include "hw/ssi.h"
 
 struct SSIBus {
     BusState qbus;

diff --git a/hw/ssi.h b/hw/ssi.h
index a05d60beb4ad6e5a394ff864fd2230bb93da6620..fdae317295af5347a157569bdbcfa16d84d05f01 100644 (file)
--- a/hw/ssi.h
+++ b/hw/ssi.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_SSI_H
 #define QEMU_SSI_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 
 typedef struct SSISlave SSISlave;
 

diff --git a/hw/stellaris.c b/hw/stellaris.c
index 9b8f2034f11f7019a531079e3f5aca74372fd48e..f4ce7945f39a1d9a1cc4ca987867c8f5295286c7 100644 (file)
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -7,14 +7,14 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "ssi.h"
-#include "arm-misc.h"
-#include "devices.h"
+#include "hw/sysbus.h"
+#include "hw/ssi.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
 #include "qemu/timer.h"
-#include "i2c.h"
+#include "hw/i2c.h"
 #include "net/net.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "exec/address-spaces.h"
 
 #define GPIO_A 0

diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c
index 6c701fb67b99ae41e9716920c0812263fde4262c..59b84564a0e2a6025d70126631b3a413258db653 100644 (file)
--- a/hw/stellaris_enet.c
+++ b/hw/stellaris_enet.c
@@ -6,7 +6,7 @@
  *
  * This code is licensed under the GPL.
  */
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
 #include <zlib.h>
 

diff --git a/hw/stellaris_input.c b/hw/stellaris_input.c
index 7a95c3fc8854fe98d8dde87dd20fe59bea686831..4e407922a0679e21806231e2d1ccf3491d4c0896 100644 (file)
--- a/hw/stellaris_input.c
+++ b/hw/stellaris_input.c
@@ -6,8 +6,8 @@
  *
  * This code is licensed under the GPL.
  */
-#include "hw.h"
-#include "devices.h"
+#include "hw/hw.h"
+#include "hw/devices.h"
 #include "ui/console.h"
 
 typedef struct {

diff --git a/hw/stream.c b/hw/stream.c
index d4cf84d4c03183f1fc9d2593910a0e3c9e609f19..a07d6a56d32129f2768f7677293db3a2d53eea29 100644 (file)
--- a/hw/stream.c
+++ b/hw/stream.c
@@ -1,4 +1,4 @@
-#include "stream.h"
+#include "hw/stream.h"
 
 void
 stream_push(StreamSlave *sink, uint8_t *buf, size_t len, uint32_t *app)

diff --git a/hw/strongarm.c b/hw/strongarm.c
index ab736e300e4dec41ced37fbb1f09e9d62856602e..49f9577e32ea2b5fce85837ddfca20a81c524ff3 100644 (file)
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -26,13 +26,13 @@
  *  Contributions after 2012-01-13 are licensed under the terms of the
  *  GNU GPL, version 2 or (at your option) any later version.
  */
-#include "sysbus.h"
-#include "strongarm.h"
+#include "hw/sysbus.h"
+#include "hw/strongarm.h"
 #include "qemu/error-report.h"
-#include "arm-misc.h"
+#include "hw/arm-misc.h"
 #include "char/char.h"
 #include "sysemu/sysemu.h"
-#include "ssi.h"
+#include "hw/ssi.h"
 
 //#define DEBUG
 

diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c
index f8f4d023a35c50dd18c1fd05c2181f16b00acad1..9d443d1b10194c1e885d3c814c1d200c3bcc7ecd 100644 (file)
--- a/hw/sun4c_intctl.c
+++ b/hw/sun4c_intctl.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "sun4m.h"
+#include "hw/hw.h"
+#include "hw/sun4m.h"
 #include "monitor/monitor.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 
 //#define DEBUG_IRQ_COUNT
 //#define DEBUG_IRQ

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 9903f443cba2559989ec5287c85d39ec2282fdf1..37bd04108d6cac1817e1540b56a0a4f662206c0d 100644 (file)
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -21,24 +21,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "sun4m.h"
-#include "nvram.h"
-#include "sparc32_dma.h"
-#include "fdc.h"
+#include "hw/sun4m.h"
+#include "hw/nvram.h"
+#include "hw/sparc32_dma.h"
+#include "hw/fdc.h"
 #include "sysemu/sysemu.h"
 #include "net/net.h"
-#include "boards.h"
-#include "firmware_abi.h"
-#include "esp.h"
-#include "pc.h"
-#include "isa.h"
-#include "fw_cfg.h"
-#include "escc.h"
-#include "empty_slot.h"
-#include "qdev-addr.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/firmware_abi.h"
+#include "hw/esp.h"
+#include "hw/pc.h"
+#include "hw/isa.h"
+#include "hw/fw_cfg.h"
+#include "hw/escc.h"
+#include "hw/empty_slot.h"
+#include "hw/qdev-addr.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "sysemu/blockdev.h"
 #include "trace.h"

diff --git a/hw/sun4m.h b/hw/sun4m.h
index 0361eeed41c4f768b26f324f508d09b41dedc3ef..0d2cfb807b179a79d5b75abc748414ce0edbca29 100644 (file)
--- a/hw/sun4m.h
+++ b/hw/sun4m.h
@@ -31,6 +31,6 @@ void sun4m_pic_info(Monitor *mon, const QDict *qdict);
 void sun4m_irq_info(Monitor *mon, const QDict *qdict);
 
 /* sparc32_dma.c */
-#include "sparc32_dma.h"
+#include "hw/sparc32_dma.h"
 
 #endif

diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c
index 8f9635f3430369b570cefd73eabfa0863b97817c..33e77b02a3decce5a1e39c01cee3c6d655b256bb 100644 (file)
--- a/hw/sun4m_iommu.c
+++ b/hw/sun4m_iommu.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "sun4m.h"
-#include "sysbus.h"
+#include "hw/sun4m.h"
+#include "hw/sysbus.h"
 #include "trace.h"
 
 /*

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 9fbda29ac4e97fb635135891167071289c43bd31..51ffa1c09bc1db67f066ccb788d4172617a669ca 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -21,22 +21,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "pci/pci.h"
-#include "apb_pci.h"
-#include "pc.h"
-#include "serial.h"
-#include "nvram.h"
-#include "fdc.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
+#include "hw/apb_pci.h"
+#include "hw/pc.h"
+#include "hw/serial.h"
+#include "hw/nvram.h"
+#include "hw/fdc.h"
 #include "net/net.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "firmware_abi.h"
-#include "fw_cfg.h"
-#include "sysbus.h"
-#include "ide.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/firmware_abi.h"
+#include "hw/fw_cfg.h"
+#include "hw/sysbus.h"
+#include "hw/ide.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"

diff --git a/hw/sysbus.c b/hw/sysbus.c
index 6d9d1df41927b3390b872801ee006af20430fbb8..74bb4b81dec9219927b7641e8fc9e0d01e8aab8b 100644 (file)
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -17,7 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "monitor/monitor.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/sysbus.h b/hw/sysbus.h
index a7fcded6e7679520dd8017bf4d26ca9dc74586de..17de5063395b0b9fd571fb197422eda3810b3e46 100644 (file)
--- a/hw/sysbus.h
+++ b/hw/sysbus.h
@@ -3,7 +3,7 @@
 
 /* Devices attached directly to the main system bus.  */
 
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "exec/memory.h"
 
 #define QDEV_MAX_MMIO 32

diff --git a/hw/tc58128.c b/hw/tc58128.c
index 4ce80b18f3f6bc7fd618d64434673c52b1a9c825..f76f96d9e7e1aade94f16c647527bac9dacb9db3 100644 (file)
--- a/hw/tc58128.c
+++ b/hw/tc58128.c
@@ -1,6 +1,6 @@
-#include "hw.h"
-#include "sh.h"
-#include "loader.h"
+#include "hw/hw.h"
+#include "hw/sh.h"
+#include "hw/loader.h"
 
 #define CE1  0x0100
 #define CE2  0x0200

diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index e815f83198f3962a1f89e5afe0c212dad83bce0c..0755463a1dd95c52aa6f3b1cd13f393055d64cbe 100644 (file)
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -10,9 +10,9 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
-#include "hw.h"
-#include "devices.h"
-#include "flash.h"
+#include "hw/hw.h"
+#include "hw/devices.h"
+#include "hw/flash.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "sysemu/blockdev.h"
@@ -421,15 +421,15 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value)
 }
 
 #define BITS 8
-#include "tc6393xb_template.h"
+#include "hw/tc6393xb_template.h"
 #define BITS 15
-#include "tc6393xb_template.h"
+#include "hw/tc6393xb_template.h"
 #define BITS 16
-#include "tc6393xb_template.h"
+#include "hw/tc6393xb_template.h"
 #define BITS 24
-#include "tc6393xb_template.h"
+#include "hw/tc6393xb_template.h"
 #define BITS 32
-#include "tc6393xb_template.h"
+#include "hw/tc6393xb_template.h"
 
 static void tc6393xb_draw_graphic(TC6393xbState *s, int full_update)
 {

diff --git a/hw/tcx.c b/hw/tcx.c
index 0ce2952f7393496ed4921529f075206a1902ab21..896407d8650964540cc1716f8eaf29c00596e198 100644 (file)
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -25,8 +25,8 @@
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
-#include "sysbus.h"
-#include "qdev-addr.h"
+#include "hw/sysbus.h"
+#include "hw/qdev-addr.h"
 
 #define MAXX 1024
 #define MAXY 768

diff --git a/hw/tmp105.c b/hw/tmp105.c
index 3ad2d2f04c928f276e89efc43edb44ac89db18f0..47e5437e0dc86cfc14468c2c51ba2712947f6893 100644 (file)
--- a/hw/tmp105.c
+++ b/hw/tmp105.c
@@ -18,9 +18,9 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
-#include "i2c.h"
-#include "tmp105.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
+#include "hw/tmp105.h"
 #include "qapi/visitor.h"
 
 static void tmp105_interrupt_update(TMP105State *s)

diff --git a/hw/tmp105.h b/hw/tmp105.h
index d2189191e2a3ca4d0cc2c417d7d65292bbeea954..9a9632c54b9645b8f34098878b19571351084132 100644 (file)
--- a/hw/tmp105.h
+++ b/hw/tmp105.h
@@ -14,8 +14,8 @@
 #ifndef QEMU_TMP105_H
 #define QEMU_TMP105_H
 
-#include "i2c.h"
-#include "tmp105_regs.h"
+#include "hw/i2c.h"
+#include "hw/tmp105_regs.h"
 
 #define TYPE_TMP105 "tmp105"
 #define TMP105(obj) OBJECT_CHECK(TMP105State, (obj), TYPE_TMP105)

diff --git a/hw/tosa.c b/hw/tosa.c
index efea109795d2994954c331e7ffad36bdd907e949..747888c64e16fecec5e31d3f98285094eab0fbc6 100644 (file)
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -11,18 +11,18 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pxa.h"
-#include "arm-misc.h"
-#include "devices.h"
-#include "sharpsl.h"
-#include "pcmcia.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
+#include "hw/sharpsl.h"
+#include "hw/pcmcia.h"
 #include "block/block.h"
-#include "boards.h"
-#include "i2c.h"
-#include "ssi.h"
+#include "hw/boards.h"
+#include "hw/i2c.h"
+#include "hw/ssi.h"
 #include "sysemu/blockdev.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 
 #define TOSA_RAM    0x04000000

diff --git a/hw/tpci200.c b/hw/tpci200.c
index a4823fb9f2c3efcf844a1f97ced96c79644aadc3..e3408ef4bad584bfd7ccbbd6a6f97ced68c4af44 100644 (file)
--- a/hw/tpci200.c
+++ b/hw/tpci200.c
@@ -8,8 +8,8 @@
  * later version.
  */
 
-#include "ipack.h"
-#include "pci/pci.h"
+#include "hw/ipack.h"
+#include "hw/pci/pci.h"
 #include "qemu/bitops.h"
 #include <stdio.h>
 

diff --git a/hw/tsc2005.c b/hw/tsc2005.c
index 740ff86aa8ad751dd8d51b15049ab02c821eef6e..a771cd5e52a8b731b2ce3dc10699a1699618a90d 100644 (file)
--- a/hw/tsc2005.c
+++ b/hw/tsc2005.c
@@ -18,10 +18,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "ui/console.h"
-#include "devices.h"
+#include "hw/devices.h"
 
 #define TSC_CUT_RESOLUTION(value, p)   ((value) >> (16 - (p ? 12 : 10)))
 

diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 2076c355d2225b303b994185cfedf4571b2ada17..b93e502e0587a39b8df9ab75ef24f0b19f011ae8 100644 (file)
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -19,12 +19,12 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "audio/audio.h"
 #include "qemu/timer.h"
 #include "ui/console.h"
-#include "omap.h"      /* For I2SCodec and uWireSlave */
-#include "devices.h"
+#include "hw/omap.h"   /* For I2SCodec and uWireSlave */
+#include "hw/devices.h"
 
 #define TSC_DATA_REGISTERS_PAGE                0x0
 #define TSC_CONTROL_REGISTERS_PAGE     0x1

diff --git a/hw/tusb6010.c b/hw/tusb6010.c
index 2c7d0336510c31154a1393f528fb5e4c29eb696f..a5251a34ac6fed2451df09cbda310a5a23331676 100644 (file)
--- a/hw/tusb6010.c
+++ b/hw/tusb6010.c
@@ -20,11 +20,11 @@
  */
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "usb.h"
-#include "omap.h"
-#include "irq.h"
-#include "devices.h"
-#include "sysbus.h"
+#include "hw/usb.h"
+#include "hw/omap.h"
+#include "hw/irq.h"
+#include "hw/devices.h"
+#include "hw/sysbus.h"
 
 typedef struct TUSBState {
     SysBusDevice busdev;

diff --git a/hw/twl92230.c b/hw/twl92230.c
index 70d9b03e553162c6b8a8a1222fa4a0344c851873..7d020c4cba04a901c43d31facc62e233b5c86507 100644 (file)
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -19,9 +19,9 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "i2c.h"
+#include "hw/i2c.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
 

diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index f1c3c20f375ed2560167f775c129c9e3d0a8c58c..cb95ad1f5eeacabe53fa44e56e02730e81fcfdf4 100644 (file)
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "ppc/mac.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
+#include "hw/hw.h"
+#include "hw/ppc/mac.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
 
 /* debug UniNorth */
 //#define DEBUG_UNIN

diff --git a/hw/usb.h b/hw/usb.h
index 382496cf8230730ba1cbe37306dfa8932a6d7be1..1b10684ddea942180902cdefd9686b8e3face9cf 100644 (file)
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "qemu/queue.h"
 
 /* Constants related to the USB / PCI interaction */

diff --git a/hw/versatile_i2c.c b/hw/versatile_i2c.c
index ad71e9d92d018d5ff82aebb052f70090b96a64fe..d0444aecac93ab326809e8b9d3152c476974cfa4 100644 (file)
--- a/hw/versatile_i2c.c
+++ b/hw/versatile_i2c.c
@@ -21,8 +21,8 @@
  *
  */
 
-#include "sysbus.h"
-#include "bitbang_i2c.h"
+#include "hw/sysbus.h"
+#include "hw/bitbang_i2c.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index 9d991599cfa9c8425d2616da81d3bb9ebf9d317c..0b97a4073d728b66d364c77e9ee81edaa3551cbb 100644 (file)
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -7,9 +7,9 @@
  * This code is licensed under the LGPL.
  */
 
-#include "sysbus.h"
-#include "pci/pci.h"
-#include "pci/pci_host.h"
+#include "hw/sysbus.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
 #include "exec/address-spaces.h"
 
 typedef struct {

diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index e0a28f08d373eb0ee34e24786a963cdecc818dae..baaa265888a5ba3932dc7fff9a942dc5ee89d83d 100644 (file)
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -7,17 +7,17 @@
  * This code is licensed under the GPL.
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "devices.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "pci/pci.h"
-#include "i2c.h"
-#include "boards.h"
+#include "hw/pci/pci.h"
+#include "hw/i2c.h"
+#include "hw/boards.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
-#include "flash.h"
+#include "hw/flash.h"
 
 #define VERSATILE_FLASH_ADDR 0x34000000
 #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024)

diff --git a/hw/vexpress.c b/hw/vexpress.c
index 741b044f1daed6a06a5ed45aa64f8fe79beed3c7..02922c38b3318eb3e1e367d61cb522624f7882b9 100644 (file)
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -21,16 +21,16 @@
  *  GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
-#include "primecell.h"
-#include "devices.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
+#include "hw/primecell.h"
+#include "hw/devices.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
+#include "hw/boards.h"
 #include "exec/address-spaces.h"
 #include "sysemu/blockdev.h"
-#include "flash.h"
+#include "hw/flash.h"
 
 #define VEXPRESS_BOARD_ID 0x8e0
 #define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024)

diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index ad9ae360b2f6222c37f32592494657d8d2d7401f..288361d0fb9a1115d3ac267989c600716c232522 100644 (file)
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -31,9 +31,9 @@
 #include "exec/address-spaces.h"
 #include "sysemu/kvm.h"
 #include "exec/memory.h"
-#include "pci/msi.h"
-#include "pci/msix.h"
-#include "pci/pci.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/msix.h"
+#include "hw/pci/pci.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"

diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c
index 311c966f77adda164f00dbaed90b93fbc7253315..4aa62bf35efcc97103a3ee468125052450a4ab46 100644 (file)
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "pc.h"
-#include "vga_int.h"
+#include "hw/pc.h"
+#include "hw/vga_int.h"
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
 

diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 762e45aaeb62adf28b6125e9f522b1b5ad03df8f..ffad5226fd445db312c078ae8e2e6b7a9c195faa 100644 (file)
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -23,13 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "pc.h"
-#include "vga_int.h"
+#include "hw/pc.h"
+#include "hw/vga_int.h"
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
-#include "loader.h"
+#include "hw/loader.h"
 
 typedef struct ISAVGAState {
     ISADevice dev;

diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index c491af20e4b5c9e0e82751ca19c7678f4e8e0e7c..18018ff1c318fcd40832a80c213431962ce60505 100644 (file)
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -23,13 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "pci/pci.h"
-#include "vga_int.h"
+#include "hw/pci/pci.h"
+#include "hw/vga_int.h"
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
-#include "loader.h"
+#include "hw/loader.h"
 
 #define PCI_VGA_IOPORT_OFFSET 0x400
 #define PCI_VGA_IOPORT_SIZE   (0x3e0 - 0x3c0)

diff --git a/hw/vga.c b/hw/vga.c
index 1caf23d7b6561ea2d9ad47c064b56cf1b0e7a897..2213bc1a88d160326f4546d87e24a64cc277c662 100644 (file)
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -21,15 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "vga.h"
+#include "hw/hw.h"
+#include "hw/vga.h"
 #include "ui/console.h"
-#include "pc.h"
-#include "pci/pci.h"
-#include "vga_int.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
+#include "hw/vga_int.h"
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
-#include "xen.h"
+#include "hw/xen.h"
 #include "trace.h"
 
 //#define DEBUG_VGA
@@ -986,28 +986,28 @@ typedef void vga_draw_line_func(VGACommonState *s1, uint8_t *d,
                                 const uint8_t *s, int width);
 
 #define DEPTH 8
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 #define DEPTH 15
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 #define BGR_FORMAT
 #define DEPTH 15
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 #define DEPTH 16
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 #define BGR_FORMAT
 #define DEPTH 16
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 #define DEPTH 32
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 #define BGR_FORMAT
 #define DEPTH 32
-#include "vga_template.h"
+#include "hw/vga_template.h"
 
 static unsigned int rgb_to_pixel8_dup(unsigned int r, unsigned int g, unsigned b)
 {

diff --git a/hw/vhost.c b/hw/vhost.c
index 8d41fdb53f25afd8ca67c8787f6931229f2201a0..2d25d7e300a874820fc5fa8c5dbf1ed958825f04 100644 (file)
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/ioctl.h>
-#include "vhost.h"
+#include "hw/vhost.h"
 #include "hw/hw.h"
 #include "qemu/range.h"
 #include <linux/vhost.h>

diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index d1df0e244757a5720714e7e48f1324d45d74f9eb..d3218a07f469469b53459b6887137959b1d197a2 100644 (file)
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -16,8 +16,8 @@
 #include "net/net.h"
 #include "net/tap.h"
 
-#include "virtio-net.h"
-#include "vhost_net.h"
+#include "hw/virtio-net.h"
+#include "hw/vhost_net.h"
 #include "qemu/error-report.h"
 
 #include "config.h"
@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 
-#include "vhost.h"
+#include "hw/vhost.h"
 
 struct vhost_net {
     struct vhost_dev dev;

diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 8c4e8e4313bead0bfdf36f3139832ebca0dcb10d..41eab1697ce3233fdc8999e335cbe1def05663cc 100644 (file)
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -22,25 +22,25 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
-#include "serial.h"
-#include "flash.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+#include "hw/serial.h"
+#include "hw/flash.h"
 #include "sysemu/sysemu.h"
-#include "devices.h"
-#include "boards.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
 #include "sysemu/device_tree.h"
-#include "loader.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "qemu/log.h"
 #include "exec/address-spaces.h"
 
-#include "ppc.h"
-#include "ppc4xx.h"
-#include "ppc405.h"
+#include "hw/ppc.h"
+#include "hw/ppc4xx.h"
+#include "hw/ppc405.h"
 
 #include "sysemu/blockdev.h"
-#include "xilinx.h"
+#include "hw/xilinx.h"
 
 #define EPAPR_MAGIC    (0x45504150)
 #define FLASH_SIZE     (16 * 1024 * 1024)

diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index c0a790264c9742481d141c440c4b0701fa593c36..6bfcddc3799f2224391416e7d2b56f630bb73b5a 100644 (file)
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -16,11 +16,11 @@
 #include "qemu/iov.h"
 #include "qemu/timer.h"
 #include "qemu-common.h"
-#include "virtio.h"
-#include "pc.h"
+#include "hw/virtio.h"
+#include "hw/pc.h"
 #include "cpu.h"
 #include "sysemu/balloon.h"
-#include "virtio-balloon.h"
+#include "hw/virtio-balloon.h"
 #include "sysemu/kvm.h"
 #include "exec/address-spaces.h"
 #include "qapi/visitor.h"

diff --git a/hw/virtio-balloon.h b/hw/virtio-balloon.h
index b1828f4a48587f25273cccaca08ea821669c5542..f37f31b4d76ebb5c20efe0accf81def23b8b3f10 100644 (file)
--- a/hw/virtio-balloon.h
+++ b/hw/virtio-balloon.h
@@ -15,8 +15,8 @@
 #ifndef _QEMU_VIRTIO_BALLOON_H
 #define _QEMU_VIRTIO_BALLOON_H
 
-#include "virtio.h"
-#include "pci/pci.h"
+#include "hw/virtio.h"
+#include "hw/pci/pci.h"
 
 /* from Linux's linux/virtio_balloon.h */
 

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 34913ee40ee1e9478e8a1d10c0b1b92a11499477..248a96635797135839e7abfe5874f6165f651ddf 100644 (file)
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -16,11 +16,11 @@
 #include "trace.h"
 #include "hw/block-common.h"
 #include "sysemu/blockdev.h"
-#include "virtio-blk.h"
+#include "hw/virtio-blk.h"
 #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
-#include "hw/dataplane/virtio-blk.h"
+#include "dataplane/virtio-blk.h"
 #endif
-#include "scsi-defs.h"
+#include "hw/scsi-defs.h"
 #ifdef __linux__
 # include <scsi/sg.h>
 #endif

diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index 43ca4920808e6d09b966e356a8924afae9c50f43..7ef2f35852831e98229122f4c1a9f0dafb9c1356 100644 (file)
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -14,7 +14,7 @@
 #ifndef _QEMU_VIRTIO_BLK_H
 #define _QEMU_VIRTIO_BLK_H
 
-#include "virtio.h"
+#include "hw/virtio.h"
 #include "hw/block-common.h"
 
 /* from Linux's linux/virtio_blk.h */

diff --git a/hw/virtio-bus.c b/hw/virtio-bus.c
index 6045d8ad86a4cb0e9b11bbfc96eeb6b42efda5d0..6c2aab00eb1ca1095263608800f70c5f5182bd5d 100644 (file)
--- a/hw/virtio-bus.c
+++ b/hw/virtio-bus.c
@@ -22,11 +22,11 @@
  *
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/error-report.h"
-#include "qdev.h"
-#include "virtio-bus.h"
-#include "virtio.h"
+#include "hw/qdev.h"
+#include "hw/virtio-bus.h"
+#include "hw/virtio.h"
 
 /* #define DEBUG_VIRTIO_BUS */
 

diff --git a/hw/virtio-bus.h b/hw/virtio-bus.h
index 7584a0e6ae3c7fed9bcb22616fb9a3717b6ea282..ae0f7078b4631e3d87654c413c226e6c062d8c17 100644 (file)
--- a/hw/virtio-bus.h
+++ b/hw/virtio-bus.h
@@ -25,9 +25,9 @@
 #ifndef VIRTIO_BUS_H
 #define VIRTIO_BUS_H
 
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
-#include "virtio.h"
+#include "hw/virtio.h"
 
 #define TYPE_VIRTIO_BUS "virtio-bus"
 #define VIRTIO_BUS_GET_CLASS(obj) \

diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 46072a086fd6153e7546a565524940c02739a1b1..b10f5f08d4f2047119fc408742df68119f7e3985 100644 (file)
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -13,7 +13,7 @@
 #include "char/char.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "virtio-serial.h"
+#include "hw/virtio-serial.h"
 
 typedef struct VirtConsole {
     VirtIOSerialPort port;

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 573c669d15c691eddb21409109cdc0a7b7d2984b..0ad96eefd6546b3af1331667c9e9a84aff7c4c77 100644 (file)
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -12,14 +12,14 @@
  */
 
 #include "qemu/iov.h"
-#include "virtio.h"
+#include "hw/virtio.h"
 #include "net/net.h"
 #include "net/checksum.h"
 #include "net/tap.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
-#include "virtio-net.h"
-#include "vhost_net.h"
+#include "hw/virtio-net.h"
+#include "hw/vhost_net.h"
 
 #define VIRTIO_NET_VM_VERSION    11
 

diff --git a/hw/virtio-net.h b/hw/virtio-net.h
index e654c13a9fced65d63cfdf01244692cd7b79929e..0c83ca5cfe7267a15ccc90479000b6ab2229520a 100644 (file)
--- a/hw/virtio-net.h
+++ b/hw/virtio-net.h
@@ -14,8 +14,8 @@
 #ifndef _QEMU_VIRTIO_NET_H
 #define _QEMU_VIRTIO_NET_H
 
-#include "virtio.h"
-#include "pci/pci.h"
+#include "hw/virtio.h"
+#include "hw/pci/pci.h"
 
 #define ETH_ALEN    6
 

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index df1dd7744c08b9481d6f992ca036dfff7741fdb3..ba4d7d54244245525524144a0dfb668a79d7ffc3 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -17,21 +17,21 @@
 
 #include <inttypes.h>
 
-#include "virtio.h"
-#include "virtio-blk.h"
-#include "virtio-net.h"
-#include "virtio-serial.h"
-#include "virtio-scsi.h"
-#include "pci/pci.h"
+#include "hw/virtio.h"
+#include "hw/virtio-blk.h"
+#include "hw/virtio-net.h"
+#include "hw/virtio-serial.h"
+#include "hw/virtio-scsi.h"
+#include "hw/pci/pci.h"
 #include "qemu/error-report.h"
-#include "pci/msi.h"
-#include "pci/msix.h"
-#include "loader.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/msix.h"
+#include "hw/loader.h"
 #include "sysemu/kvm.h"
 #include "sysemu/blockdev.h"
-#include "virtio-pci.h"
+#include "hw/virtio-pci.h"
 #include "qemu/range.h"
-#include "virtio-bus.h"
+#include "hw/virtio-bus.h"
 
 /* from Linux's linux/virtio_pci.h */
 

diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h
index d01db97e1eddafcfbd20f6e16bb351edc3684b72..2ae96f84d66dda8dbce31e2e338959d9b8fd72b3 100644 (file)
--- a/hw/virtio-pci.h
+++ b/hw/virtio-pci.h
@@ -16,13 +16,13 @@
 #define QEMU_VIRTIO_PCI_H
 
 #include "hw/pci/msi.h"
-#include "virtio-blk.h"
-#include "virtio-net.h"
-#include "virtio-rng.h"
-#include "virtio-serial.h"
-#include "virtio-scsi.h"
-#include "virtio-bus.h"
-#include "9pfs/virtio-9p-device.h"
+#include "hw/virtio-blk.h"
+#include "hw/virtio-net.h"
+#include "hw/virtio-rng.h"
+#include "hw/virtio-serial.h"
+#include "hw/virtio-scsi.h"
+#include "hw/virtio-bus.h"
+#include "hw/9pfs/virtio-9p-device.h"
 
 typedef struct VirtIOPCIProxy VirtIOPCIProxy;
 

diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c
index 2cdf4ec05259082a8b433dc569420dc4f9fb764c..54c1421f86dd712676ebb2fa55ba2ab4bbdebcf6 100644 (file)
--- a/hw/virtio-rng.c
+++ b/hw/virtio-rng.c
@@ -10,10 +10,10 @@
  */
 
 #include "qemu/iov.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "qapi/qmp/qerror.h"
-#include "virtio.h"
-#include "virtio-rng.h"
+#include "hw/virtio.h"
+#include "hw/virtio-rng.h"
 #include "qemu/rng.h"
 
 typedef struct VirtIORNG {

diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index 27070d1eea2fe25d21cbbb0f8b37ca2bb9bc7f63..72cc5198d4b5a4c856b6ebd0fa04877d709eb76e 100644 (file)
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include "virtio-scsi.h"
+#include "hw/virtio-scsi.h"
 #include "qemu/error-report.h"
 #include <hw/scsi.h>
 #include <hw/scsi-defs.h>

diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h
index 8d9d15f0939bb95303e508a3f6863164050f4aa7..81b3279a574555246b98e91e7615f64fd2d90d07 100644 (file)
--- a/hw/virtio-scsi.h
+++ b/hw/virtio-scsi.h
@@ -14,8 +14,8 @@
 #ifndef _QEMU_VIRTIO_SCSI_H
 #define _QEMU_VIRTIO_SCSI_H
 
-#include "virtio.h"
-#include "pci/pci.h"
+#include "hw/virtio.h"
+#include "hw/pci/pci.h"
 
 /* The ID for virtio_scsi */
 #define VIRTIO_ID_SCSI  8

diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index aa7d0d7fc78bac7d99cb4f690ff8d0ae20fe4caa..ada1d0100ba03241fdbdca59f6163db79f7c48f4 100644 (file)
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -21,9 +21,9 @@
 #include "qemu/iov.h"
 #include "monitor/monitor.h"
 #include "qemu/queue.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "trace.h"
-#include "virtio-serial.h"
+#include "hw/virtio-serial.h"
 
 /* The virtio-serial bus on top of which the ports will ride as devices */
 struct VirtIOSerialBus {

diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index 16e39820a237f14b44ff1fd6f0a79a6a86ddb127..d2d9fb773e2296ed87ad28ec3fc4b99c0bd22d06 100644 (file)
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -15,8 +15,8 @@
 #ifndef _QEMU_VIRTIO_SERIAL_H
 #define _QEMU_VIRTIO_SERIAL_H
 
-#include "qdev.h"
-#include "virtio.h"
+#include "hw/qdev.h"
+#include "hw/virtio.h"
 
 /* == Interface shared between the guest kernel and qemu == */
 

diff --git a/hw/virtio.c b/hw/virtio.c
index e2593485187cd9d63a1535a74fdb016b2a5c6aad..26fbc790ecd999842129f25d0d9f824e2d772edc 100644 (file)
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -15,9 +15,9 @@
 
 #include "trace.h"
 #include "qemu/error-report.h"
-#include "virtio.h"
+#include "hw/virtio.h"
 #include "qemu/atomic.h"
-#include "virtio-bus.h"
+#include "hw/virtio-bus.h"
 
 /* The alignment to use between consumer and producer parts of vring.
  * x86 pagesize again. */

diff --git a/hw/virtio.h b/hw/virtio.h
index 8cc71e99b67097fac9219413ce2c8fdef207bf4d..ca43fd70cd931ade51198cc2f1ea6a384d0894f7 100644 (file)
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -14,13 +14,13 @@
 #ifndef _QEMU_VIRTIO_H
 #define _QEMU_VIRTIO_H
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "net/net.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "qemu/event_notifier.h"
 #ifdef CONFIG_VIRTFS
-#include "9pfs/virtio-9p-device.h"
+#include "hw/9pfs/virtio-9p-device.h"
 #endif
 
 /* from Linux's linux/virtio_config.h */

diff --git a/hw/vmmouse.c b/hw/vmmouse.c
index b9afc2c4e8bd03b213ee6d3c655a068708408e32..a9d227e17d42c030960ca360859fdc672e44480d 100644 (file)
--- a/hw/vmmouse.c
+++ b/hw/vmmouse.c
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
-#include "ps2.h"
-#include "pc.h"
-#include "qdev.h"
+#include "hw/ps2.h"
+#include "hw/pc.h"
+#include "hw/qdev.h"
 
 /* debug only vmmouse */
 //#define DEBUG_VMMOUSE

diff --git a/hw/vmport.c b/hw/vmport.c
index faead3a955a43cb67d4cf043c5cf2fc5078857ef..cc1466ae967769e0759bb17f50bf99e2d71e5b7e 100644 (file)
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "isa.h"
-#include "pc.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
+#include "hw/pc.h"
 #include "sysemu/kvm.h"
-#include "qdev.h"
+#include "hw/qdev.h"
 
 //#define VMPORT_DEBUG
 

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 8fc201bfb96ed54f1ff28aa7750f9b44095364db..db2f187e5635f92acf3e32caf05b9cdbd1a5496f 100644 (file)
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -21,17 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "loader.h"
+#include "hw/hw.h"
+#include "hw/loader.h"
 #include "ui/console.h"
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 
 #undef VERBOSE
 #define HW_RECT_ACCEL
 #define HW_FILL_ACCEL
 #define HW_MOUSE_ACCEL
 
-#include "vga_int.h"
+#include "hw/vga_int.h"
 
 /* See http://vmware-svga.sf.net/ for some documentation on VMWare SVGA */
 

diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index c2b1bfce10ad29e67e55b63c6e4ce60c1f88b711..452950826c648e38c835e50545706e0c23aed698 100644 (file)
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -10,18 +10,18 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "vt82c686.h"
-#include "i2c.h"
-#include "smbus.h"
-#include "pci/pci.h"
-#include "isa.h"
-#include "sysbus.h"
-#include "mips.h"
-#include "apm.h"
-#include "acpi.h"
-#include "pm_smbus.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/vt82c686.h"
+#include "hw/i2c.h"
+#include "hw/smbus.h"
+#include "hw/pci/pci.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
+#include "hw/mips.h"
+#include "hw/apm.h"
+#include "hw/acpi.h"
+#include "hw/pm_smbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"

diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
index 37ce362811f294768887dd4ed629489d17e2bfc4..f13e507fcff3d65a74a3d0b08ba4d72270349cd0 100644 (file)
--- a/hw/wdt_i6300esb.c
+++ b/hw/wdt_i6300esb.c
@@ -23,9 +23,9 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "watchdog.h"
-#include "hw.h"
-#include "pci/pci.h"
+#include "hw/watchdog.h"
+#include "hw/hw.h"
+#include "hw/pci/pci.h"
 
 /*#define I6300ESB_DEBUG 1*/
 

diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c
index 599a86f5f63fe00a00e7a4cb7de663ab13a38fa6..6c52808ac0425694ef4154dc5a2a5a8a158557ef 100644 (file)
--- a/hw/wdt_ib700.c
+++ b/hw/wdt_ib700.c
@@ -21,10 +21,10 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "watchdog.h"
-#include "hw.h"
-#include "isa.h"
-#include "pc.h"
+#include "hw/watchdog.h"
+#include "hw/hw.h"
+#include "hw/isa.h"
+#include "hw/pc.h"
 
 /*#define IB700_DEBUG 1*/
 

diff --git a/hw/wm8750.c b/hw/wm8750.c
index d3ea5ba8f5fed427bb2d35414828254b121df449..0904cf496df9dfe8fb59e5ba00752fc7b071341a 100644 (file)
--- a/hw/wm8750.c
+++ b/hw/wm8750.c
@@ -7,8 +7,8 @@
  * This file is licensed under GNU GPL.
  */
 
-#include "hw.h"
-#include "i2c.h"
+#include "hw/hw.h"
+#include "hw/i2c.h"
 #include "audio/audio.h"
 
 #define IN_PORT_N      3

diff --git a/hw/xen-host-pci-device.c b/hw/xen-host-pci-device.c
index 743b37b99109fd7c39e95be7f86abf9b259b5a1c..ff2e876b3d5e0ca6012694c240f98884d310837f 100644 (file)
--- a/hw/xen-host-pci-device.c
+++ b/hw/xen-host-pci-device.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu-common.h"
-#include "xen-host-pci-device.h"
+#include "hw/xen-host-pci-device.h"
 
 #define XEN_HOST_PCI_MAX_EXT_CAP \
     ((PCIE_CONFIG_SPACE_SIZE - PCI_CONFIG_SPACE_SIZE) / (PCI_CAP_SIZEOF + 4))

diff --git a/hw/xen-host-pci-device.h b/hw/xen-host-pci-device.h
index 942b24dccc1098ca10e391cb268ffb08dcab09cb..c2486f0c19a7300fd2b18a26ba71153032dfbee5 100644 (file)
--- a/hw/xen-host-pci-device.h
+++ b/hw/xen-host-pci-device.h
@@ -1,7 +1,7 @@
 #ifndef XEN_HOST_PCI_DEVICE_H
 #define XEN_HOST_PCI_DEVICE_H
 
-#include "pci/pci.h"
+#include "hw/pci/pci.h"
 
 enum {
     XEN_HOST_PCI_REGION_TYPE_IO = 1 << 1,

diff --git a/hw/xen_apic.c b/hw/xen_apic.c
index 1d1d15c289c68baee0e45f7bf18f92562f96630d..8f387b64033fda474184213f51702c2a6a7cc33c 100644 (file)
--- a/hw/xen_apic.c
+++ b/hw/xen_apic.c
@@ -11,7 +11,7 @@
  */
 #include "hw/apic_internal.h"
 #include "hw/pci/msi.h"
-#include "xen.h"
+#include "hw/xen.h"
 
 static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr,
                                   unsigned size)

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 3fa30098ca55379691a23f74170c795543f785da..24381b55e58575644aba56feb0e3159638136fff 100644 (file)
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -34,10 +34,10 @@
 #include <sys/mman.h>
 #include <sys/signal.h>
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "char/char.h"
 #include "qemu/log.h"
-#include "xen_backend.h"
+#include "hw/xen_backend.h"
 
 #include <xen/grant_table.h>
 

diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index f37afb1f05837bfd97f72ee6f4f7a7a7fb11c628..6d5c699c51c564223f05cacb43b362159b7e5d53 100644 (file)
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_XEN_BACKEND_H
 #define QEMU_HW_XEN_BACKEND_H 1
 
-#include "xen_common.h"
+#include "hw/xen_common.h"
 #include "sysemu/sysemu.h"
 #include "net/net.h"
 

diff --git a/hw/xen_common.h b/hw/xen_common.h
index 95bc9a7825b748c2763df82062bd2cf4904a6ae9..c37bde3f7e0bceadb68bae5d9a7222ec588bc014 100644 (file)
--- a/hw/xen_common.h
+++ b/hw/xen_common.h
@@ -14,8 +14,8 @@
 #endif
 #include <xen/io/xenbus.h>
 
-#include "hw.h"
-#include "xen.h"
+#include "hw/hw.h"
+#include "hw/xen.h"
 #include "qemu/queue.h"
 
 /*

diff --git a/hw/xen_console.c b/hw/xen_console.c
index 44141f8692a05b0973d1742093054e8bdbc65060..a8db6f8d8f109d47e4a75314861ceedbe9ec6562 100644 (file)
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -29,9 +29,9 @@
 #include <stdarg.h>
 #include <sys/mman.h>
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "char/char.h"
-#include "xen_backend.h"
+#include "hw/xen_backend.h"
 
 #include <xen/io/console.h>
 

diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c
index e2ba741d54251d9d82ed3675d0d76b4320670c68..cdcaf62f26f81e452c3afd3d060bc60a7f29526b 100644 (file)
--- a/hw/xen_devconfig.c
+++ b/hw/xen_devconfig.c
@@ -1,4 +1,4 @@
-#include "xen_backend.h"
+#include "hw/xen_backend.h"
 #include "sysemu/blockdev.h"
 
 /* ------------------------------------------------------------- */

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 7fea87156d733b41cd51e047e2c41c2fc8ffdd7b..cc09a2f1fa20bbd76d78c7513b5be7a1c52a0995 100644 (file)
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -35,9 +35,9 @@
 #include <sys/mman.h>
 #include <sys/uio.h>
 
-#include "hw.h"
-#include "xen_backend.h"
-#include "xen_blkif.h"
+#include "hw/hw.h"
+#include "hw/xen_backend.h"
+#include "hw/xen_blkif.h"
 #include "sysemu/blockdev.h"
 
 /* ------------------------------------------------------------- */

diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c
index a4272f0680ccbebc3e173fe44336824eeea38cb4..d477061545849f3bab43fbc6b5ebff2038cadbcf 100644 (file)
--- a/hw/xen_domainbuild.c
+++ b/hw/xen_domainbuild.c
@@ -1,6 +1,6 @@
 #include <signal.h>
-#include "xen_backend.h"
-#include "xen_domainbuild.h"
+#include "hw/xen_backend.h"
+#include "hw/xen_domainbuild.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
 

diff --git a/hw/xen_domainbuild.h b/hw/xen_domainbuild.h
index dea0121868c086a4dca7bf7056e7f7ed8f19c44a..681cbe5fd8d8f2b69c3ba3bd51ab0eeea5e8722e 100644 (file)
--- a/hw/xen_domainbuild.h
+++ b/hw/xen_domainbuild.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_XEN_DOMAINBUILD_H
 #define QEMU_HW_XEN_DOMAINBUILD_H 1
 
-#include "xen_common.h"
+#include "hw/xen_common.h"
 
 int xenstore_domain_init1(const char *kernel, const char *ramdisk,
                           const char *cmdline);

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 66e898123ea496fd64e686a462fb29a6152a18bb..a8177b6340f3b4c4e9004d587e38a1399ad0725c 100644 (file)
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -22,11 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "boards.h"
-#include "xen_backend.h"
-#include "xen_domainbuild.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/boards.h"
+#include "hw/xen_backend.h"
+#include "hw/xen_domainbuild.h"
 #include "sysemu/blockdev.h"
 
 static void xen_init_pv(QEMUMachineInitArgs *args)

diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index 34961c287a3a494c6bc6ca932aa9f380864a594f..b6d36793b35e15e8ec01badd195abecee3a3afd4 100644 (file)
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -35,11 +35,11 @@
 #include <sys/mman.h>
 #include <sys/wait.h>
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "net/net.h"
 #include "net/checksum.h"
 #include "net/util.h"
-#include "xen_backend.h"
+#include "hw/xen_backend.h"
 
 #include <xen/io/netif.h>
 

diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 8866468c9948813ec3b55ad6e4c6e12bc684f0f1..5e11c950abf90fa8684b3b7bb12216e7650d70f8 100644 (file)
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -25,12 +25,12 @@
 
 #include <assert.h>
 
-#include "hw.h"
-#include "pc.h"
-#include "pci/pci.h"
-#include "irq.h"
-#include "xen_common.h"
-#include "xen_backend.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
+#include "hw/irq.h"
+#include "hw/xen_common.h"
+#include "hw/xen_backend.h"
 #include "trace.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/xen_pt.c b/hw/xen_pt.c
index 9db5f6e9645461b4c6919458ebbb16539066db54..ce695d0e64db8d22ab8ce8a76a60f4df5db2ec96 100644 (file)
--- a/hw/xen_pt.c
+++ b/hw/xen_pt.c
@@ -54,10 +54,10 @@
 
 #include <sys/ioctl.h>
 
-#include "pci/pci.h"
-#include "xen.h"
-#include "xen_backend.h"
-#include "xen_pt.h"
+#include "hw/pci/pci.h"
+#include "hw/xen.h"
+#include "hw/xen_backend.h"
+#include "hw/xen_pt.h"
 #include "qemu/range.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/xen_pt.h b/hw/xen_pt.h
index e3497302cf41dc5dee8b59e6e2b7b6f68dd50fd6..1cd9f44704134e05ef9cbdd7690cda63a350fe12 100644 (file)
--- a/hw/xen_pt.h
+++ b/hw/xen_pt.h
@@ -2,9 +2,9 @@
 #define XEN_PT_H
 
 #include "qemu-common.h"
-#include "xen_common.h"
-#include "pci/pci.h"
-#include "xen-host-pci-device.h"
+#include "hw/xen_common.h"
+#include "hw/pci/pci.h"
+#include "hw/xen-host-pci-device.h"
 
 void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3);
 

diff --git a/hw/xen_pt_config_init.c b/hw/xen_pt_config_init.c
index 54a179af90ac55cb2868fb8dd46d3cdb022e9c33..55838216d9e81c7e8b050359f8e28167ab0d684c 100644 (file)
--- a/hw/xen_pt_config_init.c
+++ b/hw/xen_pt_config_init.c
@@ -13,8 +13,8 @@
  */
 
 #include "qemu/timer.h"
-#include "xen_backend.h"
-#include "xen_pt.h"
+#include "hw/xen_backend.h"
+#include "hw/xen_pt.h"
 
 #define XEN_PT_MERGE_VALUE(value, data, val_mask) \
     (((value) & (val_mask)) | ((data) & ~(val_mask)))

diff --git a/hw/xen_pt_msi.c b/hw/xen_pt_msi.c
index db757cd1f10e9c653fbb088c5378413956addf30..a54ee2bfd96b4b64a556aa6ae95a4ae89a1a5525 100644 (file)
--- a/hw/xen_pt_msi.c
+++ b/hw/xen_pt_msi.c
@@ -11,9 +11,9 @@
 
 #include <sys/mman.h>
 
-#include "xen_backend.h"
-#include "xen_pt.h"
-#include "apic-msidef.h"
+#include "hw/xen_backend.h"
+#include "hw/xen_pt.h"
+#include "hw/apic-msidef.h"
 
 
 #define XEN_PT_AUTO_ASSIGN -1

diff --git a/hw/xenfb.c b/hw/xenfb.c
index 7f1f6b464324a677949627613ed482789719ebf6..3462ded619a914889cff7f9315c7f4b9bc947ec2 100644 (file)
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -35,10 +35,10 @@
 #include <string.h>
 #include <time.h>
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "ui/console.h"
 #include "char/char.h"
-#include "xen_backend.h"
+#include "hw/xen_backend.h"
 
 #include <xen/event_channel.h>
 #include <xen/io/fbif.h>

diff --git a/hw/xgmac.c b/hw/xgmac.c
index 50722988b9880418717c11170b68a313d4716521..5275f4810dc001a1fa29301ae0f519f4a75f4b87 100644 (file)
--- a/hw/xgmac.c
+++ b/hw/xgmac.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "char/char.h"
 #include "qemu/log.h"
 #include "net/net.h"

diff --git a/hw/xics.c b/hw/xics.c
index 9ef0d61377b0b5cfe29f87170da12eeecd4052f7..c3ef12fff417eb3608b466ca552d220dc25ee82e 100644 (file)
--- a/hw/xics.c
+++ b/hw/xics.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "trace.h"
 #include "hw/spapr.h"
 #include "hw/xics.h"

diff --git a/hw/xilinx.h b/hw/xilinx.h
index a78281f730e8224bea82afa0c9569bf68f344977..6c1ee21c5470289acad9972ebc9179147895b0cb 100644 (file)
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -4,7 +4,7 @@
 
 #include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
-#include "stream.h"
+#include "hw/stream.h"
 #include "net/net.h"
 
 static inline DeviceState *

diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index cc51584dfc791b3c91821ddab50702582019d920..8db1a74acfa8f4f2e52b8a3ac26ca4e2fc61581e 100644 (file)
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "qemu/log.h"
-#include "qdev-addr.h"
+#include "hw/qdev-addr.h"
 
-#include "stream.h"
+#include "hw/stream.h"
 
 #define D(x)
 

diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index 66b9ec1cc53733b65d910c253fc622e3f3c2c4bc..578529022418a8e440698b3f09ed62f8d748304a 100644 (file)
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "qemu/log.h"
 #include "net/net.h"
 #include "net/checksum.h"
 #include "qapi/qmp/qerror.h"
 
-#include "stream.h"
+#include "hw/stream.h"
 
 #define DPHY(x)
 

diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
index 21c6f8c49caa8606735a624675f283d70fa3783e..b2e35237f8678a5077d0177680a619d117f2de82 100644 (file)
--- a/hw/xilinx_ethlite.c
+++ b/hw/xilinx_ethlite.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
 #include "net/net.h"
 
 #define D(x)

diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c
index 0c34149c276efd87fea9a88ee30cd7246405c42b..b106e724ab23423dca2c6e5efcd073baf4a4e06d 100644 (file)
--- a/hw/xilinx_intc.c
+++ b/hw/xilinx_intc.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "hw.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
 
 #define D(x)
 

diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c
index e73c9bd79b8313d6d04666e4ca42e4084b04188e..f6bd3bac231fb8638bf3f8ff6309453d44623f29 100644 (file)
--- a/hw/xilinx_spi.c
+++ b/hw/xilinx_spi.c
@@ -24,12 +24,12 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
 #include "qemu/fifo8.h"
 
-#include "ssi.h"
+#include "hw/ssi.h"
 
 #ifdef XILINX_SPI_ERR_DEBUG
 #define DB_PRINT(...) do { \

diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c
index 915eb96a48936da385f2e20846ef196e54d99b2f..6c21b9668bd0b0f8852b092686fb73f9daf7de1b 100644 (file)
--- a/hw/xilinx_spips.c
+++ b/hw/xilinx_spips.c
@@ -22,12 +22,12 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "qemu/log.h"
 #include "qemu/fifo8.h"
-#include "ssi.h"
+#include "hw/ssi.h"
 #include "qemu/bitops.h"
 
 #ifdef XILINX_SPIPS_ERR_DEBUG

diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index aa162efaadbd29f00b1d70ddd4c038418aad0bad..0c39cff08953b599ee297d0c065552747e84e2a6 100644 (file)
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
-#include "ptimer.h"
+#include "hw/sysbus.h"
+#include "hw/ptimer.h"
 #include "qemu/log.h"
 
 #define D(x)

diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c
index 9963982ef6628f182b1347ba5817e54b69ee98c8..079f4d4e1a86102f1fa2a00af73af09a99018498 100644 (file)
--- a/hw/xilinx_uartlite.c
+++ b/hw/xilinx_uartlite.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "char/char.h"
 
 #define DUART(x)

diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 2f67d90ee1d841691322349d0ad5a23f2c4ca8d4..f78c47e43ef82394745e200d139ddabbee4eb84b 100644 (file)
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -15,16 +15,16 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysbus.h"
-#include "arm-misc.h"
+#include "hw/sysbus.h"
+#include "hw/arm-misc.h"
 #include "net/net.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "flash.h"
+#include "hw/boards.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
-#include "loader.h"
-#include "ssi.h"
+#include "hw/loader.h"
+#include "hw/ssi.h"
 
 #define NUM_SPI_FLASHES 4
 #define NUM_QSPI_FLASHES 2

diff --git a/hw/xio3130_downstream.c b/hw/xio3130_downstream.c
index 7f00bc82564be1853b9272981dc4d96cb9d38c64..4bccd0ddcdce1260cfe76e082a609aec1a2d1892 100644 (file)
--- a/hw/xio3130_downstream.c
+++ b/hw/xio3130_downstream.c
@@ -19,10 +19,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pci/pci_ids.h"
-#include "pci/msi.h"
-#include "pci/pcie.h"
-#include "xio3130_downstream.h"
+#include "hw/pci/pci_ids.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/pcie.h"
+#include "hw/xio3130_downstream.h"
 
 #define PCI_DEVICE_ID_TI_XIO3130D       0x8233  /* downstream port */
 #define XIO3130_REVISION                0x1

diff --git a/hw/xio3130_downstream.h b/hw/xio3130_downstream.h
index 559dff656523a7f135369a6c875e28a835be1221..8426d9ffa675c8719bf6348b3965b58064de75c5 100644 (file)
--- a/hw/xio3130_downstream.h
+++ b/hw/xio3130_downstream.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_XIO3130_DOWNSTREAM_H
 #define QEMU_XIO3130_DOWNSTREAM_H
 
-#include "pci/pcie_port.h"
+#include "hw/pci/pcie_port.h"
 
 PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifunction,
                                   const char *bus_name, pci_map_irq_fn map_irq,

diff --git a/hw/xio3130_upstream.c b/hw/xio3130_upstream.c
index 70b15d37c8f558000d9d05765b1e6c37b4d02dc2..82556aaadcae34242ee803ae3cdb9fee81c4c2bf 100644 (file)
--- a/hw/xio3130_upstream.c
+++ b/hw/xio3130_upstream.c
@@ -19,10 +19,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pci/pci_ids.h"
-#include "pci/msi.h"
-#include "pci/pcie.h"
-#include "xio3130_upstream.h"
+#include "hw/pci/pci_ids.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/pcie.h"
+#include "hw/xio3130_upstream.h"
 
 #define PCI_DEVICE_ID_TI_XIO3130U       0x8232  /* upstream port */
 #define XIO3130_REVISION                0x2

diff --git a/hw/xio3130_upstream.h b/hw/xio3130_upstream.h
index fa09656b3525c57cb4a925cf1f0d752f51c3d489..08c1d5f75b61df0f03706debf764c23709d59589 100644 (file)
--- a/hw/xio3130_upstream.h
+++ b/hw/xio3130_upstream.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_XIO3130_UPSTREAM_H
 #define QEMU_XIO3130_UPSTREAM_H
 
-#include "pci/pcie_port.h"
+#include "hw/pci/pcie_port.h"
 
 PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction,
                                 const char *bus_name, pci_map_irq_fn map_irq,

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index a810b9eae0875309cc8be12b0707005c9fa2ae58..f2a63d82da4b46b34c3aea584a9846818e5205b2 100644 (file)
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -26,18 +26,18 @@
  */
 
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
-#include "serial.h"
+#include "hw/serial.h"
 #include "net/net.h"
-#include "sysbus.h"
-#include "flash.h"
+#include "hw/sysbus.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
 #include "char/char.h"
-#include "xtensa_bootparam.h"
+#include "hw/xtensa_bootparam.h"
 
 typedef struct LxBoardDesc {
     size_t flash_size;

diff --git a/hw/xtensa_pic.c b/hw/xtensa_pic.c
index 97d36be272564992ee83fc12d7931db66a5ba70c..f485a1465cb37754b2de01dc3acf5b1a92644e31 100644 (file)
--- a/hw/xtensa_pic.c
+++ b/hw/xtensa_pic.c
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/log.h"
 #include "qemu/timer.h"
 

diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 864e57c52caab1fdd7a7f9c04df843d813600b27..5241f8d7347089e388d06fbe3fa6cdd39a403437 100644 (file)
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -26,8 +26,8 @@
  */
 
 #include "sysemu/sysemu.h"
-#include "boards.h"
-#include "loader.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
 #include "elf.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"

diff --git a/hw/z2.c b/hw/z2.c
index 731550f2d8652c15d9cb5bd04fc5c7c9c96d64cb..cbb6d8085e10d52ce75dd03551d7a3f821b5bba0 100644 (file)
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -11,15 +11,15 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "hw.h"
-#include "pxa.h"
-#include "arm-misc.h"
-#include "devices.h"
-#include "i2c.h"
-#include "ssi.h"
-#include "boards.h"
+#include "hw/hw.h"
+#include "hw/pxa.h"
+#include "hw/arm-misc.h"
+#include "hw/devices.h"
+#include "hw/i2c.h"
+#include "hw/ssi.h"
+#include "hw/boards.h"
 #include "sysemu/sysemu.h"
-#include "flash.h"
+#include "hw/flash.h"
 #include "sysemu/blockdev.h"
 #include "ui/console.h"
 #include "audio/audio.h"

diff --git a/hw/zaurus.c b/hw/zaurus.c
index 2defe3b48dd63cc4dd0ea8c1b2a5b463b615b91b..7d3258cc663a890801853c84d3834f89c05cfcae 100644 (file)
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "hw.h"
-#include "sharpsl.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/sharpsl.h"
+#include "hw/sysbus.h"
 
 #undef REG_FMT
 #define REG_FMT                        "0x%02lx"

diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c
index 27b00f07d4ad6bbd7e76de0dace3dcacf77d0efe..84183272618406869555ee32a3b156728dabb0b4 100644 (file)
--- a/hw/zynq_slcr.c
+++ b/hw/zynq_slcr.c
@@ -14,9 +14,9 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 
 #ifdef ZYNQ_ARM_SLCR_ERR_DEBUG