@@ -10,7 +10,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/sysbus.h"
-#include "hw/primecell.h"
+#include "primecell.h"
#include "sysemu/sysemu.h"
#define LOCK_VALUE 0xa05f
@@ -14,7 +14,7 @@
#include "qemu/timer.h"
#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
-#include "hw/arm_gic_internal.h"
+#include "gic_internal.h"
typedef struct {
GICState gic;
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/arm/devices.h"
-#include "hw/strongarm.h"
+#include "strongarm.h"
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
@@ -19,7 +19,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm_gic_internal.h"
+#include "gic_internal.h"
//#define DEBUG_GIC
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "hw/arm_gic_internal.h"
+#include "gic_internal.h"
static void gic_save(QEMUFile *f, void *opaque)
{
similarity index 100%
rename from hw/arm_gic_internal.h
rename to hw/arm/gic_internal.h
@@ -20,7 +20,7 @@
#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
-#include "hw/soc_dma.h"
+#include "soc_dma.h"
#include "sysemu/blockdev.h"
#include "qemu/range.h"
#include "hw/sysbus.h"
@@ -26,7 +26,7 @@
#include "qemu/timer.h"
#include "char/char.h"
#include "hw/block/flash.h"
-#include "hw/soc_dma.h"
+#include "soc_dma.h"
#include "hw/sysbus.h"
#include "audio/audio.h"
@@ -21,7 +21,7 @@
#include "qemu/timer.h"
#include "hw/arm/omap.h"
#include "hw/irq.h"
-#include "hw/soc_dma.h"
+#include "soc_dma.h"
struct omap_dma_channel_s {
/* transfer data */
similarity index 100%
rename from hw/primecell.h
rename to hw/arm/primecell.h
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
-#include "hw/primecell.h"
+#include "primecell.h"
#include "hw/arm/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
similarity index 100%
rename from hw/sharpsl.h
rename to hw/arm/sharpsl.h
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "hw/soc_dma.h"
+#include "soc_dma.h"
static void transfer_mem2mem(struct soc_dma_ch_s *ch)
{
similarity index 100%
rename from hw/soc_dma.h
rename to hw/arm/soc_dma.h
@@ -20,7 +20,7 @@
#include "hw/block/flash.h"
#include "qemu/timer.h"
#include "hw/arm/devices.h"
-#include "hw/sharpsl.h"
+#include "sharpsl.h"
#include "ui/console.h"
#include "block/block.h"
#include "audio/audio.h"
@@ -27,7 +27,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/sysbus.h"
-#include "hw/strongarm.h"
+#include "strongarm.h"
#include "qemu/error-report.h"
#include "hw/arm/arm.h"
#include "char/char.h"
similarity index 100%
rename from hw/strongarm.h
rename to hw/arm/strongarm.h
@@ -421,15 +421,15 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value)
}
#define BITS 8
-#include "hw/tc6393xb_template.h"
+#include "tc6393xb_template.h"
#define BITS 15
-#include "hw/tc6393xb_template.h"
+#include "tc6393xb_template.h"
#define BITS 16
-#include "hw/tc6393xb_template.h"
+#include "tc6393xb_template.h"
#define BITS 24
-#include "hw/tc6393xb_template.h"
+#include "tc6393xb_template.h"
#define BITS 32
-#include "hw/tc6393xb_template.h"
+#include "tc6393xb_template.h"
static void tc6393xb_draw_graphic(TC6393xbState *s, int full_update)
{
similarity index 100%
rename from hw/tc6393xb_template.h
rename to hw/arm/tc6393xb_template.h
@@ -15,7 +15,7 @@
#include "hw/arm/pxa.h"
#include "hw/arm/arm.h"
#include "hw/arm/devices.h"
-#include "hw/sharpsl.h"
+#include "sharpsl.h"
#include "hw/misc/pcmcia.h"
#include "block/block.h"
#include "hw/boards.h"
@@ -23,7 +23,7 @@
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
-#include "hw/primecell.h"
+#include "primecell.h"
#include "hw/arm/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
@@ -16,7 +16,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
-#include "hw/sharpsl.h"
+#include "sharpsl.h"
#include "hw/sysbus.h"
#undef REG_FMT
@@ -47,7 +47,7 @@
void YMF262UpdateOneQEMU (int which, INT16 *dst, int length);
#define SHIFT 2
#else
-#include "hw/fmopl.h"
+#include "fmopl.h"
#define SHIFT 1
#endif
@@ -39,7 +39,7 @@
#include <stdarg.h>
#include <math.h>
//#include "driver.h" /* use M.A.M.E. */
-#include "hw/fmopl.h"
+#include "fmopl.h"
#ifndef PI
#define PI 3.14159265358979323846
similarity index 100%
rename from hw/fmopl.h
rename to hw/audio/fmopl.h
@@ -25,8 +25,8 @@
#include "hw/audio/audio.h"
#include "audio/audio.h"
#include "hw/isa/isa.h"
-#include "hw/gusemu.h"
-#include "hw/gustate.h"
+#include "gusemu.h"
+#include "gustate.h"
#define dolog(...) AUD_log ("audio", __VA_ARGS__)
#ifdef DEBUG
similarity index 100%
rename from hw/gusemu.h
rename to hw/audio/gusemu.h
@@ -26,8 +26,8 @@
* TODO: check mixer: see 7.20 of sdk for panning pos (applies to all gus models?)?
*/
-#include "hw/gustate.h"
-#include "hw/gusemu.h"
+#include "gustate.h"
+#include "gusemu.h"
#define GUSregb(position) (* (gusptr+(position)))
#define GUSregw(position) (*(GUSword *) (gusptr+(position)))
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#include "hw/gusemu.h"
-#include "hw/gustate.h"
+#include "gusemu.h"
+#include "gustate.h"
#define GUSregb(position) (* (gusptr+(position)))
#define GUSregw(position) (*(GUSword *) (gusptr+(position)))
similarity index 100%
rename from hw/gustate.h
rename to hw/audio/gustate.h
@@ -19,8 +19,8 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
-#include "hw/intel-hda.h"
-#include "hw/intel-hda-defs.h"
+#include "intel-hda.h"
+#include "intel-hda-defs.h"
#include "audio/audio.h"
/* -------------------------------------------------------------------------- */
similarity index 100%
rename from hw/intel-hda-defs.h
rename to hw/audio/intel-hda-defs.h
@@ -22,8 +22,8 @@
#include "hw/pci/msi.h"
#include "qemu/timer.h"
#include "hw/audio/audio.h"
-#include "hw/intel-hda.h"
-#include "hw/intel-hda-defs.h"
+#include "intel-hda.h"
+#include "intel-hda-defs.h"
#include "sysemu/dma.h"
/* --------------------------------------------------------------------- */
similarity index 100%
rename from hw/intel-hda.h
rename to hw/audio/intel-hda.h
@@ -15,7 +15,7 @@
#include "hw/hw.h"
#include "audio/audio.h"
-#include "hw/lm4549.h"
+#include "lm4549.h"
#if 0
#define LM4549_DEBUG 1
similarity index 100%
rename from hw/lm4549.h
rename to hw/audio/lm4549.h
@@ -22,8 +22,8 @@
#include "hw/sysbus.h"
-#include "hw/pl041.h"
-#include "hw/lm4549.h"
+#include "pl041.h"
+#include "lm4549.h"
#if 0
#define PL041_DEBUG_LEVEL 1
similarity index 100%
rename from hw/pl041.h
rename to hw/audio/pl041.h
similarity index 100%
rename from hw/xen_blkif.h
rename to hw/block/xen_blkif.h
@@ -8,7 +8,7 @@
* later version.
*/
-#include "hw/ipack.h"
+#include "ipack.h"
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
{
similarity index 100%
rename from hw/ipack.h
rename to hw/char/ipack.h
@@ -8,7 +8,7 @@
* later version.
*/
-#include "hw/ipack.h"
+#include "ipack.h"
#include "qemu/bitops.h"
#include "char/char.h"
@@ -8,7 +8,7 @@
* later version.
*/
-#include "hw/ipack.h"
+#include "ipack.h"
#include "hw/pci/pci.h"
#include "qemu/bitops.h"
#include <stdio.h>
@@ -46,7 +46,7 @@
#include "disas/disas.h"
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
-#include "hw/uboot_image.h"
+#include "uboot_image.h"
#include "hw/loader.h"
#include "hw/misc/fw_cfg.h"
#include "exec/memory.h"
similarity index 100%
rename from hw/uboot_image.h
rename to hw/core/uboot_image.h
@@ -29,7 +29,7 @@
#include "hw/cris/etraxfs.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/cris-boot.h"
+#include "boot.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/cris-boot.h"
+#include "boot.h"
static void main_cpu_reset(void *opaque)
{
similarity index 100%
rename from hw/cris-boot.h
rename to hw/cris/boot.h
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
-#include "hw/vga_int.h"
+#include "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 "hw/blizzard_template.h"
+#include "blizzard_template.h"
#define DEPTH 15
-#include "hw/blizzard_template.h"
+#include "blizzard_template.h"
#define DEPTH 16
-#include "hw/blizzard_template.h"
+#include "blizzard_template.h"
#define DEPTH 24
-#include "hw/blizzard_template.h"
+#include "blizzard_template.h"
#define DEPTH 32
-#include "hw/blizzard_template.h"
+#include "blizzard_template.h"
void *s1d13745_init(qemu_irq gpio_int)
{
similarity index 100%
rename from hw/blizzard_template.h
rename to hw/display/blizzard_template.h
@@ -29,7 +29,7 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "ui/console.h"
-#include "hw/vga_int.h"
+#include "vga_int.h"
#include "hw/loader.h"
/*
@@ -288,63 +288,63 @@ static void cirrus_bitblt_fill_nop(CirrusVGAState *s,
#define ROP_NAME 0
#define ROP_FN(d, s) 0
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src_and_dst
#define ROP_FN(d, s) (s) & (d)
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src_and_notdst
#define ROP_FN(d, s) (s) & (~(d))
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME notdst
#define ROP_FN(d, s) ~(d)
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src
#define ROP_FN(d, s) s
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME 1
#define ROP_FN(d, s) ~0
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME notsrc_and_dst
#define ROP_FN(d, s) (~(s)) & (d)
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src_xor_dst
#define ROP_FN(d, s) (s) ^ (d)
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src_or_dst
#define ROP_FN(d, s) (s) | (d)
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME notsrc_or_notdst
#define ROP_FN(d, s) (~(s)) | (~(d))
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src_notxor_dst
#define ROP_FN(d, s) ~((s) ^ (d))
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME src_or_notdst
#define ROP_FN(d, s) (s) | (~(d))
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME notsrc
#define ROP_FN(d, s) (~(s))
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME notsrc_or_dst
#define ROP_FN(d, s) (~(s)) | (d)
-#include "hw/cirrus_vga_rop.h"
+#include "cirrus_vga_rop.h"
#define ROP_NAME notsrc_and_notdst
#define ROP_FN(d, s) (~(s)) & (~(d))
-#include "hw/cirrus_vga_rop.h"
+#include "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 "hw/cirrus_vga_template.h"
+#include "cirrus_vga_template.h"
#define DEPTH 16
-#include "hw/cirrus_vga_template.h"
+#include "cirrus_vga_template.h"
#define DEPTH 32
-#include "hw/cirrus_vga_template.h"
+#include "cirrus_vga_template.h"
static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y)
{
similarity index 97%
rename from hw/cirrus_vga_rop.h
rename to hw/display/cirrus_vga_rop.h
@@ -191,16 +191,16 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_16)(CirrusVGAState *s,
}
#define DEPTH 8
-#include "hw/cirrus_vga_rop2.h"
+#include "cirrus_vga_rop2.h"
#define DEPTH 16
-#include "hw/cirrus_vga_rop2.h"
+#include "cirrus_vga_rop2.h"
#define DEPTH 24
-#include "hw/cirrus_vga_rop2.h"
+#include "cirrus_vga_rop2.h"
#define DEPTH 32
-#include "hw/cirrus_vga_rop2.h"
+#include "cirrus_vga_rop2.h"
#undef ROP_NAME
#undef ROP_OP
similarity index 100%
rename from hw/cirrus_vga_rop2.h
rename to hw/display/cirrus_vga_rop2.h
similarity index 100%
rename from hw/cirrus_vga_template.h
rename to hw/display/cirrus_vga_template.h
@@ -19,7 +19,7 @@
#include "hw/hw.h"
#include "ui/console.h"
-#include "hw/framebuffer.h"
+#include "framebuffer.h"
/* Render an image from a shared memory framebuffer. */
similarity index 100%
rename from hw/framebuffer.h
rename to hw/display/framebuffer.h
@@ -26,20 +26,20 @@
#include "hw/sysbus.h"
#include "trace.h"
#include "ui/console.h"
-#include "hw/framebuffer.h"
+#include "framebuffer.h"
#include "ui/pixel_ops.h"
#include "qemu/error-report.h"
#define BITS 8
-#include "hw/milkymist-vgafb_template.h"
+#include "milkymist-vgafb_template.h"
#define BITS 15
-#include "hw/milkymist-vgafb_template.h"
+#include "milkymist-vgafb_template.h"
#define BITS 16
-#include "hw/milkymist-vgafb_template.h"
+#include "milkymist-vgafb_template.h"
#define BITS 24
-#include "hw/milkymist-vgafb_template.h"
+#include "milkymist-vgafb_template.h"
#define BITS 32
-#include "hw/milkymist-vgafb_template.h"
+#include "milkymist-vgafb_template.h"
enum {
R_CTRL = 0,
similarity index 100%
rename from hw/milkymist-vgafb_template.h
rename to hw/display/milkymist-vgafb_template.h
similarity index 100%
rename from hw/omap_lcd_template.h
rename to hw/display/omap_lcd_template.h
@@ -19,7 +19,7 @@
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/arm/omap.h"
-#include "hw/framebuffer.h"
+#include "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 "hw/omap_lcd_template.h"
+#include "omap_lcd_template.h"
#define DEPTH 15
-#include "hw/omap_lcd_template.h"
+#include "omap_lcd_template.h"
#define DEPTH 16
-#include "hw/omap_lcd_template.h"
+#include "omap_lcd_template.h"
#define DEPTH 32
-#include "hw/omap_lcd_template.h"
+#include "omap_lcd_template.h"
static draw_line_func draw_line_table2[33] = {
[0 ... 32] = NULL,
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "ui/console.h"
-#include "hw/framebuffer.h"
+#include "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 "hw/pl110_template.h"
+#include "pl110_template.h"
#define BITS 15
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define BITS 16
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define BITS 24
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define BITS 32
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
static int pl110_enabled(pl110_state *s)
{
similarity index 98%
rename from hw/pl110_template.h
rename to hw/display/pl110_template.h
@@ -27,20 +27,20 @@
#undef RGB
#define BORDER bgr
#define ORDER 0
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define ORDER 1
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define ORDER 2
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#undef BORDER
#define RGB
#define BORDER rgb
#define ORDER 0
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define ORDER 1
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#define ORDER 2
-#include "hw/pl110_template.h"
+#include "pl110_template.h"
#undef BORDER
static drawfn glue(pl110_draw_fn_,BITS)[48] =
@@ -16,7 +16,7 @@
#include "ui/pixel_ops.h"
/* FIXME: For graphic_rotate. Should probably be done in common code. */
#include "sysemu/sysemu.h"
-#include "hw/framebuffer.h"
+#include "framebuffer.h"
struct DMAChannel {
uint32_t branch;
@@ -976,15 +976,15 @@ static const VMStateDescription vmstate_pxa2xx_lcdc = {
};
#define BITS 8
-#include "hw/pxa2xx_template.h"
+#include "pxa2xx_template.h"
#define BITS 15
-#include "hw/pxa2xx_template.h"
+#include "pxa2xx_template.h"
#define BITS 16
-#include "hw/pxa2xx_template.h"
+#include "pxa2xx_template.h"
#define BITS 24
-#include "hw/pxa2xx_template.h"
+#include "pxa2xx_template.h"
#define BITS 32
-#include "hw/pxa2xx_template.h"
+#include "pxa2xx_template.h"
PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem,
hwaddr base, qemu_irq irq)
similarity index 100%
rename from hw/pxa2xx_template.h
rename to hw/display/pxa2xx_template.h
@@ -20,7 +20,7 @@
*/
#include "qemu/timer.h"
-#include "hw/qxl.h"
+#include "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 "hw/qxl.h"
+#include "qxl.h"
static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect)
{
@@ -27,7 +27,7 @@
#include "sysemu/sysemu.h"
#include "trace.h"
-#include "hw/qxl.h"
+#include "qxl.h"
/*
* NOTE: SPICE_RING_PROD_ITEM accesses memory on the pci bar and as
similarity index 99%
rename from hw/qxl.h
rename to hw/display/qxl.h
@@ -6,7 +6,7 @@
#include "ui/console.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
-#include "hw/vga_int.h"
+#include "vga_int.h"
#include "qemu/thread.h"
#include "ui/qemu-spice.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 "hw/sm501_template.h"
+#include "sm501_template.h"
#define DEPTH 15
-#include "hw/sm501_template.h"
+#include "sm501_template.h"
#define BGR_FORMAT
#define DEPTH 15
-#include "hw/sm501_template.h"
+#include "sm501_template.h"
#define DEPTH 16
-#include "hw/sm501_template.h"
+#include "sm501_template.h"
#define BGR_FORMAT
#define DEPTH 16
-#include "hw/sm501_template.h"
+#include "sm501_template.h"
#define DEPTH 32
-#include "hw/sm501_template.h"
+#include "sm501_template.h"
#define BGR_FORMAT
#define DEPTH 32
-#include "hw/sm501_template.h"
+#include "sm501_template.h"
static draw_line_func * draw_line8_funcs[] = {
draw_line8_8,
similarity index 100%
rename from hw/sm501_template.h
rename to hw/display/sm501_template.h
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/pc.h"
-#include "hw/vga_int.h"
+#include "vga_int.h"
#include "ui/pixel_ops.h"
#include "qemu/timer.h"
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/pc.h"
-#include "hw/vga_int.h"
+#include "vga_int.h"
#include "ui/pixel_ops.h"
#include "qemu/timer.h"
#include "hw/loader.h"
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/pci/pci.h"
-#include "hw/vga_int.h"
+#include "vga_int.h"
#include "ui/pixel_ops.h"
#include "qemu/timer.h"
#include "hw/loader.h"
@@ -22,11 +22,11 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "hw/vga.h"
+#include "vga.h"
#include "ui/console.h"
#include "hw/pc.h"
#include "hw/pci/pci.h"
-#include "hw/vga_int.h"
+#include "vga_int.h"
#include "ui/pixel_ops.h"
#include "qemu/timer.h"
#include "sysemu/xen.h"
@@ -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 "hw/vga_template.h"
+#include "vga_template.h"
#define DEPTH 15
-#include "hw/vga_template.h"
+#include "vga_template.h"
#define BGR_FORMAT
#define DEPTH 15
-#include "hw/vga_template.h"
+#include "vga_template.h"
#define DEPTH 16
-#include "hw/vga_template.h"
+#include "vga_template.h"
#define BGR_FORMAT
#define DEPTH 16
-#include "hw/vga_template.h"
+#include "vga_template.h"
#define DEPTH 32
-#include "hw/vga_template.h"
+#include "vga_template.h"
#define BGR_FORMAT
#define DEPTH 32
-#include "hw/vga_template.h"
+#include "vga_template.h"
static unsigned int rgb_to_pixel8_dup(unsigned int r, unsigned int g, unsigned b)
{
similarity index 100%
rename from hw/vga.h
rename to hw/display/vga.h
similarity index 100%
rename from hw/vga_int.h
rename to hw/display/vga_int.h
similarity index 100%
rename from hw/vga_template.h
rename to hw/display/vga_template.h
@@ -31,7 +31,7 @@
#define HW_FILL_ACCEL
#define HW_MOUSE_ACCEL
-#include "hw/vga_int.h"
+#include "vga_int.h"
/* See http://vmware-svga.sf.net/ for some documentation on VMWare SVGA */
@@ -10,7 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
-#include "hw/bitbang_i2c.h"
+#include "bitbang_i2c.h"
#include "hw/sysbus.h"
//#define DEBUG_BITBANG_I2C
similarity index 100%
rename from hw/bitbang_i2c.h
rename to hw/i2c/bitbang_i2c.h
@@ -22,7 +22,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/bitbang_i2c.h"
+#include "bitbang_i2c.h"
typedef struct {
SysBusDevice busdev;
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "hw/misc/fw_cfg.h"
-#include "hw/multiboot.h"
+#include "multiboot.h"
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/sysemu.h"
similarity index 100%
rename from hw/multiboot.h
rename to hw/i386/multiboot.h
@@ -34,7 +34,7 @@
#include "hw/i386/smbios.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/multiboot.h"
+#include "multiboot.h"
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "hw/audio/pcspk.h"
@@ -26,7 +26,7 @@
#include "hw/pc.h"
#include "hw/boards.h"
#include "hw/xen/xen_backend.h"
-#include "hw/xen_domainbuild.h"
+#include "xen_domainbuild.h"
#include "sysemu/blockdev.h"
static void xen_init_pv(QEMUMachineInitArgs *args)
similarity index 100%
rename from hw/lm32.h
rename to hw/lm32/lm32.h
@@ -25,8 +25,8 @@
#include "hw/loader.h"
#include "sysemu/blockdev.h"
#include "elf.h"
-#include "hw/lm32_hwsetup.h"
-#include "hw/lm32.h"
+#include "lm32_hwsetup.h"
+#include "lm32.h"
#include "exec/address-spaces.h"
typedef struct {
similarity index 100%
rename from hw/lm32_hwsetup.h
rename to hw/lm32/lm32_hwsetup.h
similarity index 100%
rename from hw/milkymist-hw.h
rename to hw/lm32/milkymist-hw.h
@@ -26,8 +26,8 @@
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/blockdev.h"
-#include "hw/milkymist-hw.h"
-#include "hw/lm32.h"
+#include "milkymist-hw.h"
+#include "lm32.h"
#include "exec/address-spaces.h"
#define BIOS_FILENAME "mmone-bios.bin"
@@ -31,7 +31,7 @@
#include "hw/loader.h"
#include "elf.h"
-#include "hw/microblaze_boot.h"
+#include "boot.h"
static struct
{
similarity index 100%
rename from hw/microblaze_boot.h
rename to hw/microblaze/boot.h
@@ -38,8 +38,8 @@
#include "exec/address-spaces.h"
#include "hw/ssi.h"
-#include "hw/microblaze_boot.h"
-#include "hw/microblaze_pic_cpu.h"
+#include "boot.h"
+#include "pic_cpu.h"
#include "hw/stream.h"
@@ -34,8 +34,8 @@
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
-#include "hw/microblaze_boot.h"
-#include "hw/microblaze_pic_cpu.h"
+#include "boot.h"
+#include "pic_cpu.h"
#define LMB_BRAM_SIZE (128 * 1024)
#define FLASH_SIZE (16 * 1024 * 1024)
@@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
-#include "hw/microblaze_pic_cpu.h"
+#include "pic_cpu.h"
#define D(x)
similarity index 100%
rename from hw/microblaze_pic_cpu.h
rename to hw/microblaze/pic_cpu.h
@@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
-#include "hw/tmp105.h"
+#include "tmp105.h"
#include "qapi/visitor.h"
static void tmp105_interrupt_update(TMP105State *s)
similarity index 97%
rename from hw/tmp105.h
rename to hw/misc/tmp105.h
@@ -15,7 +15,7 @@
#define QEMU_TMP105_H
#include "hw/i2c/i2c.h"
-#include "hw/tmp105_regs.h"
+#include "tmp105_regs.h"
#define TYPE_TMP105 "tmp105"
#define TMP105(obj) OBJECT_CHECK(TMP105State, (obj), TYPE_TMP105)
similarity index 100%
rename from hw/tmp105_regs.h
rename to hw/misc/tmp105_regs.h
@@ -33,7 +33,7 @@
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
-#include "hw/e1000_hw.h"
+#include "e1000_regs.h"
#define E1000_DEBUG
similarity index 100%
rename from hw/e1000_hw.h
rename to hw/net/e1000_regs.h
@@ -40,7 +40,7 @@
#include "qemu/timer.h"
#include "qemu/sockets.h"
#include "hw/sparc/sun4m.h"
-#include "hw/pcnet.h"
+#include "pcnet.h"
#include "trace.h"
typedef struct {
@@ -26,7 +26,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev.h"
#include "net/net.h"
-#include "hw/ne2000.h"
+#include "ne2000.h"
#include "exec/address-spaces.h"
typedef struct ISANE2000State {
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
-#include "hw/ne2000.h"
+#include "ne2000.h"
#include "hw/loader.h"
#include "sysemu/sysemu.h"
similarity index 100%
rename from hw/ne2000.h
rename to hw/net/ne2000.h
@@ -33,7 +33,7 @@
#include "qemu/timer.h"
#include "sysemu/dma.h"
-#include "hw/pcnet.h"
+#include "pcnet.h"
//#define PCNET_DEBUG
//#define PCNET_DEBUG_IO
@@ -41,7 +41,7 @@
#include "qemu/sockets.h"
#include "sysemu/sysemu.h"
-#include "hw/pcnet.h"
+#include "pcnet.h"
//#define PCNET_DEBUG
//#define PCNET_DEBUG_IO
similarity index 100%
rename from hw/pcnet.h
rename to hw/net/pcnet.h
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
-#include "hw/dec_pci.h"
+#include "host-dec.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
similarity index 100%
rename from hw/dec_pci.h
rename to hw/pci/host-dec.h
@@ -19,7 +19,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "qemu/bswap.h"
-#include "hw/ppce500_pci.h"
+#include "host-ppce500.h"
#ifdef DEBUG_PCI
#define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
similarity index 100%
rename from hw/ppce500_pci.h
rename to hw/pci/host-ppce500.h
@@ -23,7 +23,7 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
-#include "hw/ioh3420.h"
+#include "ioh3420.h"
#define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */
#define PCI_DEVICE_ID_IOH_REV 0x2
similarity index 100%
rename from hw/ioh3420.h
rename to hw/pci/ioh3420.h
@@ -22,7 +22,7 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
-#include "hw/xio3130_downstream.h"
+#include "xio3130_downstream.h"
#define PCI_DEVICE_ID_TI_XIO3130D 0x8233 /* downstream port */
#define XIO3130_REVISION 0x1
similarity index 100%
rename from hw/xio3130_downstream.h
rename to hw/pci/xio3130_downstream.h
@@ -22,7 +22,7 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
-#include "hw/xio3130_upstream.h"
+#include "xio3130_upstream.h"
#define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */
#define XIO3130_REVISION 0x2
similarity index 100%
rename from hw/xio3130_upstream.h
rename to hw/pci/xio3130_upstream.h
@@ -28,14 +28,14 @@
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "sysemu/device_tree.h"
-#include "hw/openpic.h"
+#include "openpic.h"
#include "hw/ppc/ppc.h"
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "qemu/host-utils.h"
-#include "hw/ppce500_pci.h"
+#include "ppce500_pci.h"
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
#define UIMAGE_LOAD_BASE 0
@@ -15,7 +15,7 @@
#include "hw/boards.h"
#include "sysemu/device_tree.h"
#include "hw/pci/pci.h"
-#include "hw/openpic.h"
+#include "openpic.h"
static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
{
@@ -58,7 +58,7 @@
#include "hw/boards.h"
#include "hw/misc/fw_cfg.h"
#include "hw/char/escc.h"
-#include "hw/openpic.h"
+#include "openpic.h"
#include "hw/ide.h"
#include "hw/loader.h"
#include "elf.h"
@@ -14,7 +14,7 @@
#include "e500.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
-#include "hw/openpic.h"
+#include "openpic.h"
static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
{
@@ -36,7 +36,7 @@
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
-#include "hw/openpic.h"
+#include "openpic.h"
#include "hw/sysbus.h"
#include "hw/pci/msi.h"
#include "qemu/bitops.h"
similarity index 100%
rename from hw/openpic.h
rename to hw/ppc/openpic.h
similarity index 100%
rename from hw/ppc405.h
rename to hw/ppc/ppc405.h
@@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
-#include "hw/ppc405.h"
+#include "ppc405.h"
#include "hw/timer/m48t59.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
@@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
-#include "hw/ppc405.h"
+#include "ppc405.h"
#include "hw/char/serial.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
@@ -25,7 +25,7 @@
#include "exec/address-spaces.h"
#include "hw/char/serial.h"
#include "hw/ppc/ppc.h"
-#include "hw/ppc405.h"
+#include "ppc405.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
@@ -37,7 +37,7 @@
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
-#include "hw/ppc405.h"
+#include "ppc405.h"
#include "sysemu/blockdev.h"
#include "hw/xilinx.h"
@@ -27,7 +27,7 @@
#include "hw/scsi/scsi-defs.h"
#include "trace.h"
-#include "hw/mfi.h"
+#include "mfi.h"
#define MEGASAS_VERSION "1.70"
#define MEGASAS_MAX_FRAMES 2048 /* Firmware limit at 65535 */
similarity index 100%
rename from hw/mfi.h
rename to hw/scsi/mfi.h
@@ -34,11 +34,11 @@
#include "hw/hw.h"
#include "hw/scsi/scsi.h"
#include "hw/scsi/scsi-defs.h"
-#include "hw/srp.h"
+#include "srp.h"
#include "hw/qdev.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
-#include "hw/ppc-viosrp.h"
+#include "ppc-viosrp.h"
#include <libfdt.h>
similarity index 100%
rename from hw/srp.h
rename to hw/scsi/srp.h
similarity index 100%
rename from hw/ppc-viosrp.h
rename to hw/scsi/viosrp.h
@@ -31,7 +31,7 @@
#include "hw/boards.h"
#include "hw/pci/pci.h"
#include "net/net.h"
-#include "hw/sh7750_regs.h"
+#include "sh7750_regs.h"
#include "hw/ide.h"
#include "hw/loader.h"
#include "hw/usb.h"
@@ -26,8 +26,8 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/sysemu.h"
-#include "hw/sh7750_regs.h"
-#include "hw/sh7750_regnames.h"
+#include "sh7750_regs.h"
+#include "sh7750_regnames.h"
#include "hw/sh4/sh_intc.h"
#include "cpu.h"
#include "exec/address-spaces.h"
@@ -1,7 +1,7 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "hw/sh7750_regs.h"
-#include "hw/sh7750_regnames.h"
+#include "sh7750_regs.h"
+#include "sh7750_regnames.h"
#define REGNAME(r) {r, #r},
similarity index 100%
rename from hw/sh7750_regnames.h
rename to hw/sh4/sh7750_regnames.h
similarity index 100%
rename from hw/sh7750_regs.h
rename to hw/sh4/sh7750_regs.h
similarity index 100%
rename from hw/grlib.h
rename to hw/sparc/grlib.h
@@ -27,7 +27,7 @@
#include "hw/sysbus.h"
#include "cpu.h"
-#include "hw/grlib.h"
+#include "grlib.h"
#include "trace.h"
@@ -32,7 +32,7 @@
#include "trace.h"
#include "exec/address-spaces.h"
-#include "hw/grlib.h"
+#include "grlib.h"
/* Default system clock. */
#define CPU_CLK (40 * 1000 * 1000)
@@ -34,7 +34,7 @@
#include "qemu/thread.h"
#include "char/char.h"
#include "monitor/monitor.h"
-#include "hw/ccid.h"
+#include "ccid.h"
#define DPRINTF(card, lvl, fmt, ...) \
do {\
@@ -11,7 +11,7 @@
#include "char/char.h"
#include "qemu/sockets.h"
#include "monitor/monitor.h"
-#include "hw/ccid.h"
+#include "ccid.h"
#include "libcacard/vscard_common.h"
#define DPRINTF(card, lvl, fmt, ...) \
similarity index 100%
rename from hw/ccid.h
rename to hw/usb/ccid.h
@@ -40,7 +40,7 @@
#include "hw/usb/desc.h"
#include "monitor/monitor.h"
-#include "hw/ccid.h"
+#include "ccid.h"
#define DPRINTF(s, lvl, fmt, ...) \
do { \
@@ -29,7 +29,7 @@
#include "hw/loader.h"
#include "sysemu/kvm.h"
#include "sysemu/blockdev.h"
-#include "hw/virtio-pci.h"
+#include "virtio-pci.h"
#include "qemu/range.h"
#include "hw/virtio/virtio-bus.h"
similarity index 100%
rename from hw/virtio-pci.h
rename to hw/virtio/virtio-pci.h
@@ -7,7 +7,7 @@
*/
#include "qemu-common.h"
-#include "hw/xen-host-pci-device.h"
+#include "xen-host-pci-device.h"
#define XEN_HOST_PCI_MAX_EXT_CAP \
((PCIE_CONFIG_SPACE_SIZE - PCI_CONFIG_SPACE_SIZE) / (PCI_CAP_SIZEOF + 4))
similarity index 100%
rename from hw/xen-host-pci-device.h
rename to hw/xen/xen-host-pci-device.h
@@ -37,7 +37,7 @@
#include "hw/hw.h"
#include "hw/xen/xen_backend.h"
-#include "hw/xen_blkif.h"
+#include "xen_blkif.h"
#include "sysemu/blockdev.h"
/* ------------------------------------------------------------- */
@@ -1,6 +1,6 @@
#include <signal.h>
#include "hw/xen/xen_backend.h"
-#include "hw/xen_domainbuild.h"
+#include "xen_domainbuild.h"
#include "qemu/timer.h"
#include "qemu/log.h"
similarity index 100%
rename from hw/xen_domainbuild.h
rename to hw/xen/xen_domainbuild.h
@@ -57,7 +57,7 @@
#include "hw/pci/pci.h"
#include "sysemu/xen.h"
#include "hw/xen/xen_backend.h"
-#include "hw/xen_pt.h"
+#include "xen_pt.h"
#include "qemu/range.h"
#include "exec/address-spaces.h"
similarity index 99%
rename from hw/xen_pt.h
rename to hw/xen/xen_pt.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "hw/xen/xen_common.h"
#include "hw/pci/pci.h"
-#include "hw/xen-host-pci-device.h"
+#include "xen-host-pci-device.h"
void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3);
@@ -14,7 +14,7 @@
#include "qemu/timer.h"
#include "hw/xen/xen_backend.h"
-#include "hw/xen_pt.h"
+#include "xen_pt.h"
#define XEN_PT_MERGE_VALUE(value, data, val_mask) \
(((value) & (val_mask)) | ((data) & ~(val_mask)))
@@ -12,7 +12,7 @@
#include <sys/mman.h>
#include "hw/xen/xen_backend.h"
-#include "hw/xen_pt.h"
+#include "xen_pt.h"
#include "hw/i386/apic-msidef.h"
similarity index 100%
rename from hw/xtensa_bootparam.h
rename to hw/xtensa/xtensa_bootparam.h
@@ -37,7 +37,7 @@
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "char/char.h"
-#include "hw/xtensa_bootparam.h"
+#include "xtensa_bootparam.h"
typedef struct LxBoardDesc {
size_t flash_size;
Now that all files reached their final home, we know which headers are used in a single subdirectory of hw/. This patch finally empties the hw/ directory. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/arm/arm_sysctl.c | 2 +- hw/arm/armv7m_nvic.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/gic.c | 2 +- hw/arm/gic_common.c | 2 +- hw/{arm_gic_internal.h => arm/gic_internal.h} | 0 hw/arm/omap1.c | 2 +- hw/arm/omap2.c | 2 +- hw/arm/omap_dma.c | 2 +- hw/{ => arm}/primecell.h | 0 hw/arm/realview.c | 2 +- hw/{ => arm}/sharpsl.h | 0 hw/arm/soc_dma.c | 2 +- hw/{ => arm}/soc_dma.h | 0 hw/arm/spitz.c | 2 +- hw/arm/strongarm.c | 2 +- hw/{ => arm}/strongarm.h | 0 hw/arm/tc6393xb.c | 10 +++--- hw/{ => arm}/tc6393xb_template.h | 0 hw/arm/tosa.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/zaurus.c | 2 +- hw/audio/adlib.c | 2 +- hw/audio/fmopl.c | 2 +- hw/{ => audio}/fmopl.h | 0 hw/audio/gus.c | 4 +- hw/{ => audio}/gusemu.h | 0 hw/audio/gusemu_hal.c | 4 +- hw/audio/gusemu_mixer.c | 4 +- hw/{ => audio}/gustate.h | 0 hw/audio/hda-codec.c | 4 +- hw/{ => audio}/intel-hda-defs.h | 0 hw/audio/intel-hda.c | 4 +- hw/{ => audio}/intel-hda.h | 0 hw/audio/lm4549.c | 2 +- hw/{ => audio}/lm4549.h | 0 hw/audio/pl041.c | 4 +- hw/{ => audio}/pl041.h | 0 hw/{ => block}/xen_blkif.h | 0 hw/char/ipack.c | 2 +- hw/{ => char}/ipack.h | 0 hw/char/ipoctal232.c | 2 +- hw/char/tpci200.c | 2 +- hw/core/loader.c | 2 +- hw/{ => core}/uboot_image.h | 0 hw/cris/axis_dev88.c | 2 +- hw/cris/boot.c | 2 +- hw/{cris-boot.h => cris/boot.h} | 0 hw/display/blizzard.c | 12 +++--- hw/{ => display}/blizzard_template.h | 0 hw/display/cirrus_vga.c | 38 ++++++++++---------- hw/{ => display}/cirrus_vga_rop.h | 8 ++-- hw/{ => display}/cirrus_vga_rop2.h | 0 hw/{ => display}/cirrus_vga_template.h | 0 hw/display/framebuffer.c | 2 +- hw/{ => display}/framebuffer.h | 0 hw/display/milkymist-vgafb.c | 12 +++--- hw/{ => display}/milkymist-vgafb_template.h | 0 hw/{ => display}/omap_lcd_template.h | 0 hw/display/omap_lcdc.c | 10 +++--- hw/display/pl110.c | 12 +++--- hw/{ => display}/pl110_template.h | 12 +++--- hw/display/pxa2xx_lcd.c | 12 +++--- hw/{ => display}/pxa2xx_template.h | 0 hw/display/qxl-logger.c | 2 +- hw/display/qxl-render.c | 2 +- hw/display/qxl.c | 2 +- hw/{ => display}/qxl.h | 2 +- hw/display/sm501.c | 14 ++++---- hw/{ => display}/sm501_template.h | 0 hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vga.c | 18 +++++----- hw/{ => display}/vga.h | 0 hw/{ => display}/vga_int.h | 0 hw/{ => display}/vga_template.h | 0 hw/display/vmware_vga.c | 2 +- hw/i2c/bitbang-i2c.c | 2 +- hw/{ => i2c}/bitbang_i2c.h | 0 hw/i2c/versatile_i2c.c | 2 +- hw/i386/multiboot.c | 2 +- hw/{ => i386}/multiboot.h | 0 hw/i386/pc.c | 2 +- hw/i386/xen_machine_pv.c | 2 +- hw/{ => lm32}/lm32.h | 0 hw/lm32/lm32_boards.c | 4 +- hw/{ => lm32}/lm32_hwsetup.h | 0 hw/{ => lm32}/milkymist-hw.h | 0 hw/lm32/milkymist.c | 4 +- hw/microblaze/boot.c | 2 +- hw/{microblaze_boot.h => microblaze/boot.h} | 0 hw/microblaze/petalogix_ml605_mmu.c | 4 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 +- hw/microblaze/pic_cpu.c | 2 +- hw/{microblaze_pic_cpu.h => microblaze/pic_cpu.h} | 0 hw/misc/tmp105.c | 2 +- hw/{ => misc}/tmp105.h | 2 +- hw/{ => misc}/tmp105_regs.h | 0 hw/net/e1000.c | 2 +- hw/{e1000_hw.h => net/e1000_regs.h} | 0 hw/net/lance.c | 2 +- hw/net/ne2000-isa.c | 2 +- hw/net/ne2000.c | 2 +- hw/{ => net}/ne2000.h | 0 hw/net/pcnet-pci.c | 2 +- hw/net/pcnet.c | 2 +- hw/{ => net}/pcnet.h | 0 hw/pci/host-dec.c | 2 +- hw/{dec_pci.h => pci/host-dec.h} | 0 hw/pci/host-ppce500.c | 2 +- hw/{ppce500_pci.h => pci/host-ppce500.h} | 0 hw/pci/ioh3420.c | 2 +- hw/{ => pci}/ioh3420.h | 0 hw/pci/xio3130_downstream.c | 2 +- hw/{ => pci}/xio3130_downstream.h | 0 hw/pci/xio3130_upstream.c | 2 +- hw/{ => pci}/xio3130_upstream.h | 0 hw/ppc/e500.c | 4 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mpc8544ds.c | 2 +- hw/ppc/openpic.c | 2 +- hw/{ => ppc}/openpic.h | 0 hw/{ => ppc}/ppc405.h | 0 hw/ppc/ppc405_boards.c | 2 +- hw/ppc/ppc405_uc.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/scsi/megasas.c | 2 +- hw/{ => scsi}/mfi.h | 0 hw/scsi/spapr_vscsi.c | 4 +- hw/{ => scsi}/srp.h | 0 hw/{ppc-viosrp.h => scsi/viosrp.h} | 0 hw/sh4/r2d.c | 2 +- hw/sh4/sh7750.c | 4 +- hw/sh4/sh7750_regnames.c | 4 +- hw/{ => sh4}/sh7750_regnames.h | 0 hw/{ => sh4}/sh7750_regs.h | 0 hw/{ => sparc}/grlib.h | 0 hw/sparc/grlib_irqmp.c | 2 +- hw/sparc/leon3.c | 2 +- hw/usb/ccid-card-emulated.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/{ => usb}/ccid.h | 0 hw/usb/dev-smartcard-reader.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/{ => virtio}/virtio-pci.h | 0 hw/xen/xen-host-pci-device.c | 2 +- hw/{ => xen}/xen-host-pci-device.h | 0 hw/xen/xen_disk.c | 2 +- hw/xen/xen_domainbuild.c | 2 +- hw/{ => xen}/xen_domainbuild.h | 0 hw/xen/xen_pt.c | 2 +- hw/{ => xen}/xen_pt.h | 2 +- hw/xen/xen_pt_config_init.c | 2 +- hw/xen/xen_pt_msi.c | 2 +- hw/{ => xtensa}/xtensa_bootparam.h | 0 hw/xtensa/xtensa_lx60.c | 2 +- 159 files changed, 184 insertions(+), 184 deletions(-) rename hw/{arm_gic_internal.h => arm/gic_internal.h} (100%) rename hw/{ => arm}/primecell.h (100%) rename hw/{ => arm}/sharpsl.h (100%) rename hw/{ => arm}/soc_dma.h (100%) rename hw/{ => arm}/strongarm.h (100%) rename hw/{ => arm}/tc6393xb_template.h (100%) rename hw/{ => audio}/fmopl.h (100%) rename hw/{ => audio}/gusemu.h (100%) rename hw/{ => audio}/gustate.h (100%) rename hw/{ => audio}/intel-hda-defs.h (100%) rename hw/{ => audio}/intel-hda.h (100%) rename hw/{ => audio}/lm4549.h (100%) rename hw/{ => audio}/pl041.h (100%) rename hw/{ => block}/xen_blkif.h (100%) rename hw/{ => char}/ipack.h (100%) rename hw/{ => core}/uboot_image.h (100%) rename hw/{cris-boot.h => cris/boot.h} (100%) rename hw/{ => display}/blizzard_template.h (100%) rename hw/{ => display}/cirrus_vga_rop.h (97%) rename hw/{ => display}/cirrus_vga_rop2.h (100%) rename hw/{ => display}/cirrus_vga_template.h (100%) rename hw/{ => display}/framebuffer.h (100%) rename hw/{ => display}/milkymist-vgafb_template.h (100%) rename hw/{ => display}/omap_lcd_template.h (100%) rename hw/{ => display}/pl110_template.h (98%) rename hw/{ => display}/pxa2xx_template.h (100%) rename hw/{ => display}/qxl.h (99%) rename hw/{ => display}/sm501_template.h (100%) rename hw/{ => display}/vga.h (100%) rename hw/{ => display}/vga_int.h (100%) rename hw/{ => display}/vga_template.h (100%) rename hw/{ => i2c}/bitbang_i2c.h (100%) rename hw/{ => i386}/multiboot.h (100%) rename hw/{ => lm32}/lm32.h (100%) rename hw/{ => lm32}/lm32_hwsetup.h (100%) rename hw/{ => lm32}/milkymist-hw.h (100%) rename hw/{microblaze_boot.h => microblaze/boot.h} (100%) rename hw/{microblaze_pic_cpu.h => microblaze/pic_cpu.h} (100%) rename hw/{ => misc}/tmp105.h (97%) rename hw/{ => misc}/tmp105_regs.h (100%) rename hw/{e1000_hw.h => net/e1000_regs.h} (100%) rename hw/{ => net}/ne2000.h (100%) rename hw/{ => net}/pcnet.h (100%) rename hw/{dec_pci.h => pci/host-dec.h} (100%) rename hw/{ppce500_pci.h => pci/host-ppce500.h} (100%) rename hw/{ => pci}/ioh3420.h (100%) rename hw/{ => pci}/xio3130_downstream.h (100%) rename hw/{ => pci}/xio3130_upstream.h (100%) rename hw/{ => ppc}/openpic.h (100%) rename hw/{ => ppc}/ppc405.h (100%) rename hw/{ => scsi}/mfi.h (100%) rename hw/{ => scsi}/srp.h (100%) rename hw/{ppc-viosrp.h => scsi/viosrp.h} (100%) rename hw/{ => sh4}/sh7750_regnames.h (100%) rename hw/{ => sh4}/sh7750_regs.h (100%) rename hw/{ => sparc}/grlib.h (100%) rename hw/{ => usb}/ccid.h (100%) rename hw/{ => virtio}/virtio-pci.h (100%) rename hw/{ => xen}/xen-host-pci-device.h (100%) rename hw/{ => xen}/xen_domainbuild.h (100%) rename hw/{ => xen}/xen_pt.h (99%) rename hw/{ => xtensa}/xtensa_bootparam.h (100%)