Commit 83c9f4ca authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw: include hw header files with full paths



Done with this script:

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

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

Instead, files in hw/dataplane are referenced with the relative path.
We know they are not going to move to include/, and they are the only
include files that are in subdirectories _and_ move.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7948b4b0
......@@ -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;
......
......@@ -8,7 +8,7 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
#include "hw/sysbus.h"
/* A9MP private memory region. */
......
......@@ -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
......
#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"