@@ -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. */
@@ -8,7 +8,7 @@
* This code is licensed under the GPL.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
typedef struct A9MPPrivState {
SysBusDevice busdev;
@@ -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 {
@@ -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 {
@@ -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
@@ -21,7 +21,7 @@
#ifndef HW_ACPI_ICH9_H
#define HW_ACPI_ICH9_H
-#include "acpi.h"
+#include "hw/acpi.h"
typedef struct ICH9LPCPMRegs {
/*
@@ -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
@@ -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 */
@@ -26,7 +26,7 @@
#if !defined(__ADB_H__)
#define __ADB_H__
-#include "qdev.h"
+#include "hw/qdev.h"
#define MAX_ADB_DEVICES 16
@@ -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
@@ -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 {
@@ -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
@@ -7,7 +7,7 @@
*/
#include "config.h"
-#include "alpha_sys.h"
+#include "hw/alpha_sys.h"
#include "qemu/log.h"
#include "sysemu/sysemu.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],
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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 */
@@ -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
@@ -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);
@@ -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"
@@ -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. */
@@ -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"
@@ -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
@@ -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)
{
@@ -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
@@ -18,7 +18,7 @@
*
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
/* L2C-310 r3p2 */
#define CACHE_ID 0x410000c8
@@ -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
@@ -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)
@@ -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
@@ -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. */
@@ -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. */
@@ -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;
@@ -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"
@@ -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
@@ -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;
@@ -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)
{
@@ -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"
@@ -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"
@@ -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;
@@ -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);
@@ -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,
@@ -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 */
@@ -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;
@@ -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)
@@ -24,7 +24,7 @@
#include <zlib.h> /* For crc32 */
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "net/net.h"
#include "net/checksum.h"
@@ -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
@@ -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"
@@ -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
@@ -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;
@@ -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)
{
@@ -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)
{
@@ -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
@@ -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"
@@ -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)
{
@@ -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)
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "trace.h"
/*
@@ -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"
/*
@@ -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"
@@ -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,
@@ -12,7 +12,7 @@
*
*/
-#include "hw/dataplane/ioq.h"
+#include "ioq.h"
void ioq_init(IOQueue *ioq, int fd, unsigned int max_reqs)
{
@@ -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 */
@@ -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 */
@@ -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 {
@@ -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) \
@@ -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) \
@@ -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
@@ -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 */
@@ -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
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "trace.h"
typedef struct {
@@ -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.
@@ -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"
@@ -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
@@ -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.
@@ -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:
@@ -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"
@@ -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
@@ -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
@@ -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:
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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);
@@ -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)
@@ -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)
@@ -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"
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "char/char.h"
#include "qemu/log.h"
@@ -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)
@@ -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
@@ -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
@@ -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"
@@ -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,
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -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. */
@@ -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"
@@ -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 */
@@ -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
@@ -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
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "char/char.h"
#include "trace.h"
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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
@@ -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)))
@@ -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)))
@@ -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"
/* -------------------------------------------------------------------------- */
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -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"
@@ -7,7 +7,7 @@
* This code is licensed under the LGPL.
*/
-#include "i2c.h"
+#include "hw/i2c.h"
struct i2c_bus
{
@@ -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
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "isa.h"
+#include "hw/isa.h"
//#define DEBUG_I82374
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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 */
@@ -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
@@ -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)
{
@@ -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;
@@ -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"
/*****************************************************************************/
@@ -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);
@@ -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
@@ -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
@@ -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 */
@@ -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
@@ -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
@@ -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"
@@ -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"
/* --------------------------------------------------------------------- */
@@ -1,7 +1,7 @@
#ifndef HW_INTEL_HDA_H
#define HW_INTEL_HDA_H
-#include "qdev.h"
+#include "hw/qdev.h"
/* --------------------------------------------------------------------- */
/* hda bus */
@@ -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
@@ -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)
{
@@ -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
@@ -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
@@ -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,
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack.h"
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
{
@@ -11,7 +11,7 @@
#ifndef QEMU_IPACK_H
#define QEMU_IPACK_H
-#include "qdev.h"
+#include "hw/qdev.h"
typedef struct IPackBus IPackBus;
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack.h"
#include "qemu/bitops.h"
#include "char/char.h"
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "irq.h"
+#include "hw/irq.h"
struct IRQState {
qemu_irq_handler handler;
@@ -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;
@@ -5,7 +5,7 @@
#include "exec/ioport.h"
#include "exec/memory.h"
-#include "qdev.h"
+#include "hw/qdev.h"
#define ISA_NUM_IRQS 16
@@ -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,
@@ -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"
@@ -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,
@@ -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
@@ -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
@@ -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>
@@ -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 {
@@ -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)
@@ -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 {
@@ -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;
@@ -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,
@@ -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;
@@ -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"
@@ -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)
@@ -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"
@@ -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
@@ -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"
@@ -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),
@@ -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"
@@ -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
@@ -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 { \
@@ -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
@@ -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 */
@@ -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
@@ -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)
@@ -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 */
@@ -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
@@ -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;
@@ -7,7 +7,7 @@
* This file is licensed under GNU GPL.
*/
-#include "i2c.h"
+#include "hw/i2c.h"
typedef struct {
I2CSlave i2c;
@@ -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
@@ -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);
@@ -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"
@@ -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"
@@ -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"
@@ -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 {
@@ -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"
@@ -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 */
@@ -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
{
@@ -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,
@@ -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)
@@ -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"
@@ -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"
@@ -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,
@@ -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),
@@ -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>
@@ -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"
@@ -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 {
@@ -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 {
@@ -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"
@@ -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"
@@ -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,
@@ -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"
@@ -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)
{
@@ -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"
@@ -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)
@@ -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
@@ -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
@@ -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 {
@@ -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"
@@ -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
@@ -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 */
@@ -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
@@ -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
@@ -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"
@@ -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"
@@ -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
@@ -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 {
@@ -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 */
@@ -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 */
@@ -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)
@@ -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) */
@@ -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;
@@ -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 */
@@ -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;
@@ -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;
@@ -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"
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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;
@@ -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,
@@ -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;
@@ -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 {
@@ -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 {
@@ -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"
@@ -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;
@@ -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,
@@ -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 */
@@ -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 */
@@ -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"
@@ -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
@@ -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 */
@@ -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
@@ -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 */
@@ -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)
@@ -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)
@@ -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
@@ -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
@@ -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"
@@ -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). */
@@ -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"
@@ -25,7 +25,7 @@
#ifndef QEMU_PC87312_H
#define QEMU_PC87312_H
-#include "isa.h"
+#include "hw/isa.h"
#define TYPE_PC87312 "pc87312"
@@ -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"
@@ -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"
@@ -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"
@@ -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;
@@ -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 */
@@ -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
@@ -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
@@ -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
@@ -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)
{
@@ -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)
@@ -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)
@@ -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 { \
@@ -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
@@ -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;
@@ -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"
/*
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "char/char.h"
typedef struct {
@@ -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
@@ -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"
@@ -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
@@ -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;
@@ -8,7 +8,7 @@
* This code is licensed under the GPL.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
//#define DEBUG_PL061 1
@@ -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
@@ -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)
{
@@ -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] =
@@ -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
@@ -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
@@ -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? */
@@ -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"
@@ -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;
@@ -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"
@@ -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"
@@ -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"
@@ -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,
@@ -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"
@@ -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
@@ -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 */
@@ -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__)
@@ -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
@@ -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"
@@ -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"
@@ -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
@@ -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 */
@@ -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)
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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"
@@ -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
@@ -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
@@ -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"
/*
@@ -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)
@@ -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;
@@ -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 {
@@ -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 */
@@ -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
@@ -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
@@ -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) \
@@ -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"
@@ -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"
@@ -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"
@@ -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 ***/
@@ -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"
@@ -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
@@ -20,7 +20,7 @@
*/
#include "qemu/timer.h"
-#include "qxl.h"
+#include "hw/qxl.h"
static const char *qxl_type[] = {
[ QXL_CMD_NOP ] = "nop",
@@ -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)
{
@@ -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
@@ -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"
@@ -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"
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#include "hw.h"
-#include "mips.h"
+#include "hw/hw.h"
+#include "hw/mips.h"
#include "qemu/timer.h"
/********************************************************/
@@ -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"
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
typedef struct {
SysBusDevice busdev;
@@ -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"
@@ -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;
@@ -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"
@@ -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)
{
@@ -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 {
@@ -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;
@@ -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"
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
//#define DEBUG_IRQ
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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
@@ -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
@@ -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;
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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)
@@ -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"
@@ -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},
@@ -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
@@ -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;
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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
@@ -23,7 +23,7 @@
*/
#include "sysemu/sysemu.h"
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "trace.h"
/*
@@ -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"
/*
@@ -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,
@@ -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
@@ -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
@@ -25,7 +25,7 @@
* THE SOFTWARE.
*/
-#include "i2c.h"
+#include "hw/i2c.h"
#define TYPE_SMBUS_DEVICE "smbus-device"
#define SMBUS_DEVICE(obj) \
@@ -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
@@ -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) \
@@ -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>
@@ -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)
{
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -1,4 +1,4 @@
-#include "qdev.h"
+#include "hw/qdev.h"
#include "char/char.h"
#include "hw/spapr.h"
#include "hw/spapr_vio.h"
@@ -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"
/*
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
@@ -11,7 +11,7 @@
#ifndef QEMU_SSI_H
#define QEMU_SSI_H
-#include "qdev.h"
+#include "hw/qdev.h"
typedef struct SSISlave SSISlave;
@@ -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
@@ -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>
@@ -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 {
@@ -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)
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#include "sun4m.h"
-#include "sysbus.h"
+#include "hw/sun4m.h"
+#include "hw/sysbus.h"
#include "trace.h"
/*
@@ -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"
@@ -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"
@@ -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
@@ -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
@@ -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)
{
@@ -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
@@ -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)
@@ -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)
@@ -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
@@ -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>
@@ -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)))
@@ -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
@@ -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;
@@ -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"
@@ -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
@@ -25,7 +25,7 @@
* THE SOFTWARE.
*/
-#include "qdev.h"
+#include "hw/qdev.h"
#include "qemu/queue.h"
/* Constants related to the USB / PCI interaction */
@@ -21,8 +21,8 @@
*
*/
-#include "sysbus.h"
-#include "bitbang_i2c.h"
+#include "hw/sysbus.h"
+#include "hw/bitbang_i2c.h"
typedef struct {
SysBusDevice busdev;
@@ -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 {
@@ -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)
@@ -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)
@@ -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"
@@ -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"
@@ -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;
@@ -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)
@@ -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)
{
@@ -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>
@@ -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;
@@ -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)
@@ -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"
@@ -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 */
@@ -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
@@ -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 */
@@ -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 */
@@ -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) \
@@ -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;
@@ -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
@@ -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
@@ -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 */
@@ -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;
@@ -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 {
@@ -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>
@@ -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
@@ -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 {
@@ -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 == */
@@ -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. */
@@ -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 */
@@ -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
@@ -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
@@ -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 */
@@ -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"
@@ -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*/
@@ -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*/
@@ -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
@@ -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))
@@ -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,
@@ -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)
@@ -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>
@@ -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"
@@ -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"
/*
@@ -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>
@@ -1,4 +1,4 @@
-#include "xen_backend.h"
+#include "hw/xen_backend.h"
#include "sysemu/blockdev.h"
/* ------------------------------------------------------------- */
@@ -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"
/* ------------------------------------------------------------- */
@@ -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"
@@ -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);
@@ -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)
@@ -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>
@@ -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"
@@ -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"
@@ -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);
@@ -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)))
@@ -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
@@ -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>
@@ -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"
@@ -25,7 +25,7 @@
*
*/
-#include "hw.h"
+#include "hw/hw.h"
#include "trace.h"
#include "hw/spapr.h"
#include "hw/xics.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 *
@@ -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)
@@ -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)
@@ -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)
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
-#include "hw.h"
+#include "hw/sysbus.h"
+#include "hw/hw.h"
#define D(x)
@@ -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 { \
@@ -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
@@ -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)
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysbus.h"
+#include "hw/sysbus.h"
#include "char/char.h"
#define DUART(x)
@@ -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
@@ -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
@@ -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,
@@ -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
@@ -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,
@@ -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;
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
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> --- hw/a15mpcore.c | 2 +- hw/a9mpcore.c | 2 +- hw/ac97.c | 6 +++--- hw/acpi.c | 6 +++--- hw/acpi_ich9.c | 10 +++++----- hw/acpi_ich9.h | 2 +- hw/acpi_piix4.c | 14 +++++++------- hw/adb.c | 4 ++-- hw/adb.h | 2 +- hw/adlib.c | 8 ++++---- hw/ads7846.c | 2 +- hw/alpha_dp264.c | 16 ++++++++-------- hw/alpha_pci.c | 2 +- hw/alpha_sys.h | 10 +++++----- hw/alpha_typhoon.c | 6 +++--- hw/an5206.c | 8 ++++---- hw/apb_pci.c | 12 ++++++------ hw/apic.c | 12 ++++++------ hw/apic_common.c | 4 ++-- hw/apic_internal.h | 2 +- hw/apm.c | 6 +++--- hw/apm.h | 2 +- hw/applesmc.c | 4 ++-- hw/arm11mpcore.c | 2 +- hw/arm_boot.c | 8 ++++---- hw/arm_gic.c | 4 ++-- hw/arm_gic_common.c | 2 +- hw/arm_gic_internal.h | 2 +- hw/arm_l2x0.c | 2 +- hw/arm_mptimer.c | 2 +- hw/arm_pic.c | 4 ++-- hw/arm_sysctl.c | 6 +++--- hw/arm_timer.c | 6 +++--- hw/armv7m.c | 6 +++--- hw/armv7m_nvic.c | 6 +++--- hw/axis_dev88.c | 12 ++++++------ hw/bitbang_i2c.c | 6 +++--- hw/bitbang_i2c.h | 2 +- hw/blizzard.c | 14 +++++++------- hw/boards.h | 2 +- hw/bonito.c | 10 +++++----- hw/bt-hci-csr.c | 4 ++-- hw/bt-hci.c | 4 ++-- hw/bt-hid.c | 4 ++-- hw/bt-l2cap.c | 2 +- hw/bt-sdp.c | 2 +- hw/bt.c | 2 +- hw/cadence_gem.c | 2 +- hw/cadence_ttc.c | 2 +- hw/cadence_uart.c | 2 +- hw/cbus.c | 4 ++-- hw/ccid.h | 2 +- hw/cdrom.c | 2 +- hw/cirrus_vga.c | 44 +++++++++++++++++++++---------------------- hw/cirrus_vga_rop.h | 8 ++++---- hw/collie.c | 14 +++++++------- hw/cris-boot.c | 6 +++--- hw/cris_pic_cpu.c | 6 +++--- hw/cs4231.c | 2 +- hw/cs4231a.c | 8 ++++---- hw/cuda.c | 6 +++--- hw/dataplane/event-poll.c | 2 +- hw/dataplane/ioq.c | 2 +- hw/dataplane/virtio-blk.c | 2 +- hw/dataplane/vring.c | 2 +- hw/dataplane/vring.h | 2 +- hw/debugcon.c | 6 +++--- hw/debugexit.c | 4 ++-- hw/dec_pci.c | 12 ++++++------ hw/dma.c | 4 ++-- hw/dp8393x.c | 4 ++-- hw/ds1225y.c | 2 +- hw/ds1338.c | 2 +- hw/dummy_m68k.c | 6 +++--- hw/e1000.c | 8 ++++---- hw/ecc.c | 4 ++-- hw/eccmemctl.c | 2 +- hw/eepro100.c | 6 +++--- hw/eeprom93xx.c | 4 ++-- hw/empty_slot.c | 6 +++--- hw/es1370.c | 6 +++--- hw/escc.c | 6 +++--- hw/esp-pci.c | 6 +++--- hw/esp.c | 4 ++-- hw/esp.h | 2 +- hw/etraxfs.h | 2 +- hw/etraxfs_dma.c | 4 ++-- hw/etraxfs_eth.c | 4 ++-- hw/etraxfs_pic.c | 4 ++-- hw/etraxfs_ser.c | 2 +- hw/etraxfs_timer.c | 4 ++-- hw/exynos4210.c | 12 ++++++------ hw/exynos4210_combiner.c | 4 ++-- hw/exynos4210_fimd.c | 2 +- hw/exynos4210_gic.c | 6 +++--- hw/exynos4210_i2c.c | 4 ++-- hw/exynos4210_mct.c | 6 +++--- hw/exynos4210_pmu.c | 2 +- hw/exynos4210_pwm.c | 6 +++--- hw/exynos4210_rtc.c | 8 ++++---- hw/exynos4210_uart.c | 4 ++-- hw/exynos4_boards.c | 8 ++++---- hw/fdc.c | 10 +++++----- hw/fmopl.c | 2 +- hw/framebuffer.c | 4 ++-- hw/fw_cfg.c | 8 ++++---- hw/g364fb.c | 4 ++-- hw/grackle_pci.c | 6 +++--- hw/grlib.h | 4 ++-- hw/grlib_apbuart.c | 2 +- hw/grlib_gptimer.c | 4 ++-- hw/grlib_irqmp.c | 4 ++-- hw/gt64xxx.c | 10 +++++----- hw/gumstix.c | 10 +++++----- hw/gus.c | 10 +++++----- hw/gusemu_hal.c | 4 ++-- hw/gusemu_mixer.c | 4 ++-- hw/hda-audio.c | 8 ++++---- hw/heathrow_pic.c | 4 ++-- hw/hid.c | 4 ++-- hw/highbank.c | 12 ++++++------ hw/hpet.c | 12 ++++++------ hw/hw.h | 2 +- hw/i2c.c | 2 +- hw/i2c.h | 2 +- hw/i82374.c | 2 +- hw/i82378.c | 8 ++++---- hw/i8254.c | 10 +++++----- hw/i8254.h | 4 ++-- hw/i8254_common.c | 10 +++++----- hw/i8254_internal.h | 6 +++--- hw/i8259.c | 8 ++++---- hw/i8259_common.c | 4 ++-- hw/i8259_internal.h | 6 +++--- hw/i82801b11.c | 4 ++-- hw/ich9.h | 26 ++++++++++++------------- hw/ide.h | 4 ++-- hw/imx_avic.c | 4 ++-- hw/imx_ccm.c | 6 +++--- hw/imx_serial.c | 6 +++--- hw/imx_timer.c | 8 ++++---- hw/integratorcp.c | 8 ++++---- hw/intel-hda.c | 12 ++++++------ hw/intel-hda.h | 2 +- hw/ioapic.c | 10 +++++----- hw/ioapic_common.c | 6 +++--- hw/ioapic_internal.h | 4 ++-- hw/ioh3420.c | 8 ++++---- hw/ioh3420.h | 2 +- hw/ipack.c | 2 +- hw/ipack.h | 2 +- hw/ipoctal232.c | 2 +- hw/irq.c | 2 +- hw/isa-bus.c | 6 +++--- hw/isa.h | 2 +- hw/isa_mmio.c | 4 ++-- hw/ivshmem.c | 8 ++++---- hw/jazz_led.c | 2 +- hw/kvmvapic.c | 2 +- hw/kzm.c | 14 +++++++------- hw/lan9118.c | 6 +++--- hw/lance.c | 6 +++--- hw/leon3.c | 10 +++++----- hw/lm32_boards.c | 16 ++++++++-------- hw/lm32_hwsetup.h | 2 +- hw/lm32_juart.c | 6 +++--- hw/lm32_pic.c | 8 ++++---- hw/lm32_sys.c | 4 ++-- hw/lm32_timer.c | 6 +++--- hw/lm32_uart.c | 4 ++-- hw/lm4549.c | 4 ++-- hw/lm832x.c | 4 ++-- hw/loader.c | 12 ++++++------ hw/lpc_ich9.c | 28 +++++++++++++-------------- hw/lsi53c895a.c | 6 +++--- hw/m25p80.c | 6 +++--- hw/m48t59.c | 8 ++++---- hw/mac_dbdma.c | 6 +++--- hw/mac_nvram.c | 6 +++--- hw/macio.c | 10 +++++----- hw/mainstone.c | 14 +++++++------- hw/marvell_88w8618_audio.c | 8 ++++---- hw/max111x.c | 2 +- hw/max7310.c | 2 +- hw/mc146818rtc.c | 6 +++--- hw/mc146818rtc.h | 4 ++-- hw/mcf5206.c | 6 +++--- hw/mcf5208.c | 10 +++++----- hw/mcf_fec.c | 4 ++-- hw/mcf_intc.c | 4 ++-- hw/mcf_uart.c | 4 ++-- hw/megasas.c | 12 ++++++------ hw/microblaze_boot.c | 4 ++-- hw/microblaze_boot.h | 2 +- hw/microblaze_pic_cpu.c | 4 ++-- hw/milkymist-ac97.c | 4 ++-- hw/milkymist-hpdmc.c | 4 ++-- hw/milkymist-hw.h | 4 ++-- hw/milkymist-memcard.c | 6 +++--- hw/milkymist-minimac2.c | 6 +++--- hw/milkymist-pfpu.c | 4 ++-- hw/milkymist-softusb.c | 6 +++--- hw/milkymist-sysctl.c | 6 +++--- hw/milkymist-tmu2.c | 4 ++-- hw/milkymist-uart.c | 4 ++-- hw/milkymist-vgafb.c | 16 ++++++++-------- hw/milkymist.c | 16 ++++++++-------- hw/mips_addr.c | 4 ++-- hw/mips_fulong2e.c | 32 +++++++++++++++---------------- hw/mips_int.c | 4 ++-- hw/mips_jazz.c | 30 ++++++++++++++--------------- hw/mips_malta.c | 34 ++++++++++++++++----------------- hw/mips_mipssim.c | 18 +++++++++--------- hw/mips_r4k.c | 26 ++++++++++++------------- hw/mips_timer.c | 4 ++-- hw/mipsnet.c | 4 ++-- hw/mpc8544_guts.c | 4 ++-- hw/mst_fpga.c | 4 ++-- hw/multiboot.c | 8 ++++---- hw/musicpal.c | 16 ++++++++-------- hw/nand.c | 6 +++--- hw/ne2000-isa.c | 10 +++++----- hw/ne2000.c | 8 ++++---- hw/nseries.c | 22 +++++++++++----------- hw/omap1.c | 10 +++++----- hw/omap2.c | 12 ++++++------ hw/omap_clk.c | 4 ++-- hw/omap_dma.c | 6 +++--- hw/omap_dss.c | 4 ++-- hw/omap_gpio.c | 6 +++--- hw/omap_gpmc.c | 6 +++--- hw/omap_gptimer.c | 4 ++-- hw/omap_i2c.c | 8 ++++---- hw/omap_intc.c | 6 +++--- hw/omap_l4.c | 4 ++-- hw/omap_lcdc.c | 14 +++++++------- hw/omap_mmc.c | 6 +++--- hw/omap_sdrc.c | 4 ++-- hw/omap_spi.c | 4 ++-- hw/omap_sx1.c | 10 +++++----- hw/omap_synctimer.c | 4 ++-- hw/omap_tap.c | 4 ++-- hw/omap_uart.c | 6 +++--- hw/onenand.c | 8 ++++---- hw/opencores_eth.c | 4 ++-- hw/openpic.c | 14 +++++++------- hw/openrisc_pic.c | 2 +- hw/openrisc_sim.c | 10 +++++----- hw/openrisc_timer.c | 2 +- hw/palm.c | 12 ++++++------ hw/pam.c | 2 +- hw/parallel.c | 6 +++--- hw/pc-testdev.c | 6 +++--- hw/pc.c | 36 +++++++++++++++++------------------ hw/pc.h | 6 +++--- hw/pc87312.c | 2 +- hw/pc87312.h | 2 +- hw/pc_piix.c | 24 +++++++++++------------ hw/pc_q35.c | 16 ++++++++-------- hw/pc_sysfw.c | 10 +++++----- hw/pci_bridge_dev.c | 12 ++++++------ hw/pckbd.c | 8 ++++---- hw/pcnet-pci.c | 6 +++--- hw/pcnet.c | 4 ++-- hw/pcspk.c | 10 +++++----- hw/pcspk.h | 4 ++-- hw/petalogix_ml605_mmu.c | 22 +++++++++++----------- hw/petalogix_s3adsp1800_mmu.c | 16 ++++++++-------- hw/pflash_cfi01.c | 6 +++--- hw/pflash_cfi02.c | 6 +++--- hw/piix4.c | 10 +++++----- hw/piix_pci.c | 16 ++++++++-------- hw/pl011.c | 2 +- hw/pl022.c | 4 ++-- hw/pl031.c | 2 +- hw/pl041.c | 6 +++--- hw/pl050.c | 4 ++-- hw/pl061.c | 2 +- hw/pl080.c | 2 +- hw/pl110.c | 14 +++++++------- hw/pl110_template.h | 12 ++++++------ hw/pl181.c | 4 ++-- hw/pl190.c | 2 +- hw/pm_smbus.c | 8 ++++---- hw/ppc.c | 8 ++++---- hw/ppc405.h | 2 +- hw/ppc405_boards.c | 14 +++++++------- hw/ppc405_uc.c | 8 ++++---- hw/ppc440_bamboo.c | 16 ++++++++-------- hw/ppc4xx.h | 2 +- hw/ppc4xx_devs.c | 6 +++--- hw/ppc4xx_pci.c | 10 +++++----- hw/ppc_booke.c | 8 ++++---- hw/ppce500_pci.c | 8 ++++---- hw/ppce500_spin.c | 4 ++-- hw/prep_pci.c | 10 +++++----- hw/ps2.c | 4 ++-- hw/ptimer.c | 4 ++-- hw/puv3.c | 10 +++++----- hw/puv3_dma.c | 6 +++--- hw/puv3_gpio.c | 6 +++--- hw/puv3_intc.c | 4 ++-- hw/puv3_ost.c | 6 +++--- hw/puv3_pm.c | 6 +++--- hw/pxa2xx.c | 10 +++++----- hw/pxa2xx_dma.c | 6 +++--- hw/pxa2xx_gpio.c | 6 +++--- hw/pxa2xx_keypad.c | 4 ++-- hw/pxa2xx_lcd.c | 16 ++++++++-------- hw/pxa2xx_mmci.c | 8 ++++---- hw/pxa2xx_pcmcia.c | 6 +++--- hw/pxa2xx_pic.c | 6 +++--- hw/pxa2xx_timer.c | 6 +++--- hw/q35.c | 4 ++-- hw/q35.h | 22 +++++++++++----------- hw/qdev-addr.c | 4 ++-- hw/qdev-properties-system.c | 2 +- hw/qdev-properties.c | 2 +- hw/qdev-properties.h | 2 +- hw/qdev.c | 2 +- hw/qdev.h | 4 ++-- hw/qxl-logger.c | 2 +- hw/qxl-render.c | 2 +- hw/qxl.c | 2 +- hw/qxl.h | 6 +++--- hw/r2d.c | 22 +++++++++++----------- hw/rc4030.c | 4 ++-- hw/realview.c | 14 +++++++------- hw/realview_gic.c | 2 +- hw/rtl8139.c | 6 +++--- hw/s390x/event-facility.c | 4 ++-- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/sclpconsole.c | 4 ++-- hw/s390x/sclpquiesce.c | 4 ++-- hw/sb16.c | 8 ++++---- hw/sbi.c | 2 +- hw/scsi-bus.c | 8 ++++---- hw/scsi-disk.c | 4 ++-- hw/scsi-generic.c | 4 ++-- hw/scsi.h | 2 +- hw/sd.c | 4 ++-- hw/sdhci.c | 4 ++-- hw/serial-isa.c | 4 ++-- hw/serial-pci.c | 4 ++-- hw/serial.c | 2 +- hw/serial.h | 2 +- hw/sga.c | 6 +++--- hw/sh.h | 2 +- hw/sh7750.c | 10 +++++----- hw/sh7750_regnames.c | 8 ++++---- hw/sh_intc.c | 6 +++--- hw/sh_intc.h | 2 +- hw/sh_pci.c | 8 ++++---- hw/sh_serial.c | 4 ++-- hw/sh_timer.c | 6 +++--- hw/shix.c | 8 ++++---- hw/slavio_intctl.c | 4 ++-- hw/slavio_misc.c | 2 +- hw/slavio_timer.c | 6 +++--- hw/sm501.c | 24 +++++++++++------------ hw/smbios.c | 4 ++-- hw/smbus.c | 6 +++--- hw/smbus.h | 2 +- hw/smbus_eeprom.c | 6 +++--- hw/smbus_ich9.c | 14 +++++++------- hw/smc91c111.c | 4 ++-- hw/soc_dma.c | 2 +- hw/spapr.c | 4 ++-- hw/spapr_iommu.c | 4 ++-- hw/spapr_llan.c | 2 +- hw/spapr_pci.c | 10 +++++----- hw/spapr_vio.c | 6 +++--- hw/spapr_vscsi.c | 8 ++++---- hw/spapr_vty.c | 2 +- hw/sparc32_dma.c | 8 ++++---- hw/spitz.c | 22 +++++++++++----------- hw/ssd0303.c | 2 +- hw/ssd0323.c | 2 +- hw/ssi-sd.c | 4 ++-- hw/ssi.c | 2 +- hw/ssi.h | 2 +- hw/stellaris.c | 12 ++++++------ hw/stellaris_enet.c | 2 +- hw/stellaris_input.c | 4 ++-- hw/stream.c | 2 +- hw/strongarm.c | 8 ++++---- hw/sun4c_intctl.c | 6 +++--- hw/sun4m.c | 30 ++++++++++++++--------------- hw/sun4m.h | 2 +- hw/sun4m_iommu.c | 4 ++-- hw/sun4u.c | 26 ++++++++++++------------- hw/sysbus.c | 2 +- hw/sysbus.h | 2 +- hw/tc58128.c | 6 +++--- hw/tc6393xb.c | 16 ++++++++-------- hw/tcx.c | 4 ++-- hw/tmp105.c | 6 +++--- hw/tmp105.h | 4 ++-- hw/tosa.c | 20 ++++++++++---------- hw/tpci200.c | 4 ++-- hw/tsc2005.c | 4 ++-- hw/tsc210x.c | 6 +++--- hw/tusb6010.c | 10 +++++----- hw/twl92230.c | 4 ++-- hw/unin_pci.c | 8 ++++---- hw/usb.h | 2 +- hw/versatile_i2c.c | 4 ++-- hw/versatile_pci.c | 6 +++--- hw/versatilepb.c | 14 +++++++------- hw/vexpress.c | 12 ++++++------ hw/vfio_pci.c | 6 +++--- hw/vga-isa-mm.c | 6 +++--- hw/vga-isa.c | 8 ++++---- hw/vga-pci.c | 8 ++++---- hw/vga.c | 26 ++++++++++++------------- hw/vhost.c | 2 +- hw/vhost_net.c | 6 +++--- hw/virtex_ml507.c | 22 +++++++++++----------- hw/virtio-balloon.c | 6 +++--- hw/virtio-balloon.h | 4 ++-- hw/virtio-blk.c | 6 +++--- hw/virtio-blk.h | 2 +- hw/virtio-bus.c | 8 ++++---- hw/virtio-bus.h | 4 ++-- hw/virtio-console.c | 2 +- hw/virtio-net.c | 6 +++--- hw/virtio-net.h | 4 ++-- hw/virtio-pci.c | 22 +++++++++++----------- hw/virtio-pci.h | 14 +++++++------- hw/virtio-rng.c | 6 +++--- hw/virtio-scsi.c | 2 +- hw/virtio-scsi.h | 4 ++-- hw/virtio-serial-bus.c | 4 ++-- hw/virtio-serial.h | 4 ++-- hw/virtio.c | 4 ++-- hw/virtio.h | 6 +++--- hw/vmmouse.c | 8 ++++---- hw/vmport.c | 8 ++++---- hw/vmware_vga.c | 8 ++++---- hw/vt82c686.c | 24 +++++++++++------------ hw/wdt_i6300esb.c | 6 +++--- hw/wdt_ib700.c | 8 ++++---- hw/wm8750.c | 4 ++-- hw/xen-host-pci-device.c | 2 +- hw/xen-host-pci-device.h | 2 +- hw/xen_apic.c | 2 +- hw/xen_backend.c | 4 ++-- hw/xen_backend.h | 2 +- hw/xen_common.h | 4 ++-- hw/xen_console.c | 4 ++-- hw/xen_devconfig.c | 2 +- hw/xen_disk.c | 6 +++--- hw/xen_domainbuild.c | 4 ++-- hw/xen_domainbuild.h | 2 +- hw/xen_machine_pv.c | 10 +++++----- hw/xen_nic.c | 4 ++-- hw/xen_platform.c | 12 ++++++------ hw/xen_pt.c | 8 ++++---- hw/xen_pt.h | 6 +++--- hw/xen_pt_config_init.c | 4 ++-- hw/xen_pt_msi.c | 6 +++--- hw/xenfb.c | 4 ++-- hw/xgmac.c | 2 +- hw/xics.c | 2 +- hw/xilinx.h | 2 +- hw/xilinx_axidma.c | 8 ++++---- hw/xilinx_axienet.c | 4 ++-- hw/xilinx_ethlite.c | 4 ++-- hw/xilinx_intc.c | 4 ++-- hw/xilinx_spi.c | 4 ++-- hw/xilinx_spips.c | 6 +++--- hw/xilinx_timer.c | 4 ++-- hw/xilinx_uartlite.c | 2 +- hw/xilinx_zynq.c | 12 ++++++------ hw/xio3130_downstream.c | 8 ++++---- hw/xio3130_downstream.h | 2 +- hw/xio3130_upstream.c | 8 ++++---- hw/xio3130_upstream.h | 2 +- hw/xtensa_lx60.c | 12 ++++++------ hw/xtensa_pic.c | 2 +- hw/xtensa_sim.c | 4 ++-- hw/z2.c | 16 ++++++++-------- hw/zaurus.c | 6 +++--- hw/zynq_slcr.c | 4 ++-- 485 files changed, 1601 insertions(+), 1601 deletions(-)