Il 05/03/2013 18:17, Paolo Bonzini ha scritto:
> This includes the mechanical changes, as well as moving stuff
> out of hw/. Boards and devices referencing CPU are moved to
> per-arch subdirectories. This part was uncontroversial, and
> I have already posted it separately in this exact shape.
>
> The following changes since commit 288f1e3f87ec24abeac38399f175fe74243f7bc5:
>
> cadence_gem: Add debug msgs for rx desc movement (2013-02-28 18:49:24 +0000)
>
> are available in the git repository at:
>
> git://github.com/bonzini/qemu.git hw-dirs
>
> for you to fetch changes up to 7a2771d1541ec9a0c585e9b853e5f4dc036919ad:
>
> sh: move files referencing CPU to hw/sh4/ (2013-03-01 15:01:20 +0100)
Rebased and repushed to the same location, new top commit is
15e87f983a73f512ac73ae5fc6759157f0a9e0e1.
Changes that conflicted included:
- the ARM KVM merge
- the removal of baum.h and msmouse.h
- the conversion of dataplane to AioContext
Paolo
> ----------------------------------------------------------------
> Paolo Bonzini (18):
> hw: move char backends to backends/
> hw: move fifo.[ch] to libqemuutil
> hw: move qdev-monitor.o to toplevel directory
> hw: move device-hotplug.o to toplevel, compile it once
> virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX
> virtio-9p: remove PCI dependencies from hw/9pfs/
> vt82c686: vt82c686 is not a PCI host bridge
> ppc: do not use ../ in include files
> hw: include hw header files with full paths
> build: always link device_tree.o into emulators if libfdt available
> ppc: express FDT dependency of pSeries and e500 boards via
> default-configs/
> hw: move boards and other isolated files to hw/ARCH
> arm: move files referencing CPU to hw/arm/
> i386: move files referencing CPU to hw/i386/
> m68k: move files referencing CPU to hw/m68k/
> ppc: move files referencing CPU to hw/ppc/
> ppc: move more files to hw/ppc
> sh: move files referencing CPU to hw/sh4/
>
> Makefile.objs | 1 +
> Makefile.target | 1 +
> backends/Makefile.objs | 4 ++
> {hw => backends}/baum.c | 4 +-
> {hw => backends}/msmouse.c | 2 +-
> configure | 10 +---
> default-configs/ppc-softmmu.mak | 1 +
> default-configs/ppc64-softmmu.mak | 2 +
> default-configs/ppcemb-softmmu.mak | 1 +
> hw/device-hotplug.c => device-hotplug.c | 13 +---
> hw/9pfs/virtio-9p-device.c | 53 +----------------
> hw/{9p.h => 9pfs/virtio-9p-device.h} | 4 +-
> hw/9pfs/virtio-9p-proxy.c | 1 +
> hw/9pfs/virtio-9p.c | 3 +-
> hw/9pfs/virtio-9p.h | 1 -
> hw/Makefile.objs | 8 +--
> hw/a15mpcore.c | 2 +-
> hw/a9mpcore.c | 2 +-
> hw/a9scu.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/Makefile.objs | 4 +-
> hw/{alpha_dp264.c => alpha/dp264.c} | 16 ++---
> hw/{alpha_pci.c => alpha/pci.c} | 2 +-
> hw/alpha_sys.h | 10 ++--
> hw/alpha_typhoon.c | 6 +-
> 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/arm/Makefile.objs | 43 +++++++-------
> hw/{ => arm}/armv7m.c | 6 +-
> hw/{arm_boot.c => arm/boot.c} | 8 +--
> hw/{ => arm}/collie.c | 14 ++---
> hw/{ => arm}/exynos4210.c | 12 ++--
> hw/{ => arm}/exynos4_boards.c | 8 +--
> hw/{ => arm}/gumstix.c | 10 ++--
> hw/{ => arm}/highbank.c | 12 ++--
> hw/{ => arm}/integratorcp.c | 8 +--
> hw/{ => arm}/kzm.c | 14 ++---
> hw/{ => arm}/mainstone.c | 14 ++---
> hw/{ => arm}/musicpal.c | 16 ++---
> hw/{ => arm}/nseries.c | 22 +++----
> hw/{ => arm}/omap1.c | 10 ++--
> hw/{ => arm}/omap2.c | 12 ++--
> hw/{ => arm}/omap_sx1.c | 10 ++--
> hw/{ => arm}/palm.c | 12 ++--
> hw/{arm_pic.c => arm/pic_cpu.c} | 4 +-
> hw/{ => arm}/pxa2xx.c | 10 ++--
> hw/{ => arm}/pxa2xx_gpio.c | 6 +-
> hw/{ => arm}/pxa2xx_pic.c | 6 +-
> hw/{ => arm}/realview.c | 14 ++---
> hw/{ => arm}/spitz.c | 22 +++----
> hw/{ => arm}/stellaris.c | 12 ++--
> hw/{ => arm}/tosa.c | 20 +++----
> hw/{ => arm}/versatilepb.c | 14 ++---
> hw/{ => arm}/vexpress.c | 12 ++--
> hw/{ => arm}/xilinx_zynq.c | 12 ++--
> hw/{ => arm}/z2.c | 16 ++---
> hw/arm11mpcore.c | 2 +-
> 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_sysctl.c | 6 +-
> hw/arm_timer.c | 6 +-
> hw/armv7m_nvic.c | 6 +-
> 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/cris/Makefile.objs | 10 ++--
> hw/{ => cris}/axis_dev88.c | 12 ++--
> hw/{cris-boot.c => cris/boot.c} | 6 +-
> hw/{cris_pic_cpu.c => 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 | 4 +-
> hw/dataplane/vring.c | 3 +-
> 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/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_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/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/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/hpet.c | 12 ++--
> hw/hw.h | 2 +-
> hw/i2c.c | 2 +-
> hw/i2c.h | 2 +-
> hw/i386/Makefile.objs | 17 ++++--
> hw/{ => i386}/kvmvapic.c | 2 +-
> hw/{ => i386}/multiboot.c | 8 +--
> hw/{ => i386}/pc.c | 36 ++++++------
> hw/{ => i386}/pc_piix.c | 24 ++++----
> hw/{ => i386}/pc_q35.c | 16 ++---
> hw/{ => i386}/smbios.c | 4 +-
> hw/{ => i386}/xen_domainbuild.c | 4 +-
> hw/{ => i386}/xen_machine_pv.c | 10 ++--
> 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/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/lan9118.c | 6 +-
> hw/lance.c | 6 +-
> hw/lm32/Makefile.objs | 8 +--
> hw/{ => lm32}/lm32_boards.c | 16 ++---
> hw/{ => lm32}/milkymist.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/m68k/Makefile.objs | 8 ++-
> hw/{ => m68k}/an5206.c | 8 +--
> hw/{ => m68k}/dummy_m68k.c | 6 +-
> hw/{ => m68k}/mcf5206.c | 6 +-
> hw/{ => m68k}/mcf5208.c | 10 ++--
> hw/{ => m68k}/mcf_intc.c | 4 +-
> hw/mac_dbdma.c | 6 +-
> hw/mac_nvram.c | 6 +-
> hw/macio.c | 10 ++--
> hw/marvell_88w8618_audio.c | 8 +--
> hw/max111x.c | 2 +-
> hw/max7310.c | 2 +-
> hw/mc146818rtc.c | 6 +-
> hw/mc146818rtc.h | 4 +-
> hw/mcf_fec.c | 4 +-
> hw/mcf_uart.c | 4 +-
> hw/megasas.c | 12 ++--
> hw/microblaze/Makefile.objs | 11 ++--
> hw/{microblaze_boot.c => microblaze/boot.c} | 4 +-
> hw/{ => microblaze}/petalogix_ml605_mmu.c | 22 +++----
> hw/{ => microblaze}/petalogix_s3adsp1800_mmu.c | 16 ++---
> hw/{microblaze_pic_cpu.c => microblaze/pic_cpu.c} | 4 +-
> hw/microblaze_boot.h | 2 +-
> 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/mips/Makefile.objs | 8 ++-
> hw/{mips_addr.c => mips/addr.c} | 4 +-
> hw/{mips_timer.c => mips/cputimer.c} | 4 +-
> hw/{ => mips}/mips_fulong2e.c | 32 +++++-----
> hw/{ => mips}/mips_int.c | 4 +-
> hw/{ => mips}/mips_jazz.c | 30 +++++-----
> hw/{ => mips}/mips_malta.c | 34 +++++------
> hw/{ => mips}/mips_mipssim.c | 18 +++---
> hw/{ => mips}/mips_r4k.c | 26 ++++----
> hw/mipsnet.c | 4 +-
> hw/mst_fpga.c | 4 +-
> hw/nand.c | 6 +-
> hw/ne2000-isa.c | 10 ++--
> hw/ne2000.c | 8 +--
> 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_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/Makefile.objs | 5 +-
> hw/{openrisc_timer.c => openrisc/cputimer.c} | 2 +-
> hw/{ => openrisc}/openrisc_sim.c | 10 ++--
> hw/{openrisc_pic.c => openrisc/pic_cpu.c} | 2 +-
> hw/pam.c | 2 +-
> hw/parallel.c | 6 +-
> hw/pc-testdev.c | 6 +-
> hw/pc.h | 6 +-
> hw/pc87312.c | 3 +-
> hw/pc87312.h | 2 +-
> hw/pc_sysfw.c | 11 ++--
> hw/pci/shpc.c | 3 +-
> hw/pci/slotid_cap.c | 1 +
> 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/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/Makefile.objs | 29 ++++-----
> hw/ppc/e500-ccsr.h | 2 +-
> hw/ppc/e500plat.c | 2 +-
> hw/{ => ppc}/mpc8544_guts.c | 4 +-
> hw/ppc/mpc8544ds.c | 2 +-
> hw/{ => ppc}/ppc.c | 8 +--
> hw/{ => ppc}/ppc405_boards.c | 14 ++---
> hw/{ => ppc}/ppc405_uc.c | 8 +--
> hw/{ => ppc}/ppc440_bamboo.c | 16 ++---
> hw/{ => ppc}/ppc4xx_devs.c | 6 +-
> hw/{ => ppc}/ppc_booke.c | 8 +--
> hw/{ => ppc}/ppce500_spin.c | 4 +-
> hw/{ => ppc}/spapr.c | 4 +-
> hw/{ => ppc}/spapr_events.c | 0
> hw/{ => ppc}/spapr_hcall.c | 0
> hw/{ => ppc}/spapr_iommu.c | 4 +-
> hw/{ => ppc}/spapr_rtas.c | 0
> hw/{ => ppc}/spapr_vio.c | 6 +-
> hw/{ => ppc}/virtex_ml507.c | 22 +++----
> hw/{ => ppc}/xics.c | 2 +-
> hw/ppc405.h | 2 +-
> hw/ppc4xx.h | 2 +-
> hw/ppc4xx_pci.c | 10 ++--
> hw/ppce500_pci.c | 8 +--
> hw/prep_pci.c | 10 ++--
> hw/ps2.c | 4 +-
> hw/ptimer.c | 4 +-
> 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_dma.c | 6 +-
> hw/pxa2xx_keypad.c | 4 +-
> hw/pxa2xx_lcd.c | 16 ++---
> hw/pxa2xx_mmci.c | 8 +--
> hw/pxa2xx_pcmcia.c | 6 +-
> hw/pxa2xx_timer.c | 6 +-
> hw/q35.c | 4 +-
> hw/q35.h | 22 +++----
> hw/qdev-addr.c | 5 +-
> hw/qdev-properties-system.c | 2 +-
> hw/qdev-properties.c | 2 +-
> hw/qdev-properties.h | 2 +-
> hw/qdev.c | 3 +-
> hw/qdev.h | 5 +-
> hw/qxl-logger.c | 2 +-
> hw/qxl-render.c | 2 +-
> hw/qxl.c | 2 +-
> hw/qxl.h | 6 +-
> hw/rc4030.c | 4 +-
> 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 | 5 +-
> 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/sdhci.h | 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/sh4/Makefile.objs | 6 +-
> hw/{ => sh4}/r2d.c | 22 +++----
> hw/{ => sh4}/sh7750.c | 10 ++--
> hw/{ => sh4}/sh7750_regnames.c | 8 +--
> hw/{ => sh4}/shix.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/slavio_intctl.c | 4 +-
> hw/slavio_misc.c | 2 +-
> hw/slavio_timer.c | 6 +-
> hw/sm501.c | 24 ++++----
> 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_llan.c | 2 +-
> hw/spapr_pci.c | 10 ++--
> hw/spapr_vscsi.c | 8 +--
> hw/spapr_vty.c | 2 +-
> hw/sparc/Makefile.objs | 6 +-
> hw/{ => sparc}/leon3.c | 10 ++--
> hw/{ => sparc}/sun4m.c | 30 +++++-----
> hw/sparc32_dma.c | 8 +--
> hw/sparc64/Makefile.objs | 4 +-
> hw/{ => sparc64}/sun4u.c | 26 ++++----
> hw/ssd0303.c | 2 +-
> hw/ssd0323.c | 2 +-
> hw/ssi-sd.c | 4 +-
> hw/ssi.c | 2 +-
> hw/ssi.h | 2 +-
> 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.h | 2 +-
> hw/sun4m_iommu.c | 4 +-
> 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/tpci200.c | 4 +-
> hw/tsc2005.c | 4 +-
> hw/tsc210x.c | 6 +-
> hw/tusb6010.c | 10 ++--
> hw/twl92230.c | 4 +-
> hw/unicore32/Makefile.objs | 2 -
> hw/{ => unicore32}/puv3.c | 10 ++--
> hw/unin_pci.c | 8 +--
> hw/usb.h | 2 +-
> hw/usb/dev-network.c | 1 +
> hw/versatile_i2c.c | 4 +-
> hw/versatile_pci.c | 6 +-
> 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/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 | 72
> +++++++++++++++++++----
> hw/virtio-pci.h | 16 ++---
> hw/virtio-rng.c | 7 ++-
> hw/virtio-scsi.c | 3 +-
> hw/virtio-scsi.h | 4 +-
> hw/virtio-serial-bus.c | 4 +-
> hw/virtio-serial.h | 4 +-
> hw/virtio.c | 4 +-
> hw/virtio.h | 10 ++--
> hw/vmmouse.c | 8 +--
> hw/vmport.c | 8 +--
> hw/vmware_vga.c | 8 +--
> hw/vt82c686.c | 26 ++++----
> 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.h | 2 +-
> 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/xilinx.h | 3 +-
> hw/xilinx_axidma.c | 8 +--
> hw/xilinx_axienet.c | 5 +-
> hw/xilinx_ethlite.c | 4 +-
> hw/xilinx_intc.c | 4 +-
> hw/xilinx_spi.c | 6 +-
> hw/xilinx_spips.c | 8 +--
> hw/xilinx_timer.c | 4 +-
> hw/xilinx_uartlite.c | 2 +-
> hw/xio3130_downstream.c | 8 +--
> hw/xio3130_downstream.h | 2 +-
> hw/xio3130_upstream.c | 8 +--
> hw/xio3130_upstream.h | 2 +-
> hw/xtensa/Makefile.objs | 4 +-
> hw/{xtensa_pic.c => xtensa/pic_cpu.c} | 2 +-
> hw/{ => xtensa}/xtensa_lx60.c | 12 ++--
> hw/{ => xtensa}/xtensa_sim.c | 4 +-
> hw/zaurus.c | 6 +-
> hw/zynq_slcr.c | 4 +-
> {hw => include/char}/baum.h | 0
> {hw => include/char}/msmouse.h | 0
> include/migration/vmstate.h | 2 +
> hw/qdev-monitor.h => include/monitor/qdev.h | 3 +-
> hw/fifo.h => include/qemu/fifo8.h | 2 +-
> monitor.c | 2 +-
> hw/qdev-monitor.c => qdev-monitor.c | 3 +-
> qemu-char.c | 4 +-
> stubs/Makefile.objs | 1 +
> stubs/pci-drive-hot-add.c | 10 ++++
> util/Makefile.objs | 1 +
> hw/fifo.c => util/fifo8.c | 3 +-
> util/qemu-config.c | 1 +
> vl.c | 3 +-
> 541 files changed, 1815 insertions(+), 1788 deletions(-)
> rename {hw => backends}/baum.c (99%)
> rename {hw => backends}/msmouse.c (99%)
> rename hw/device-hotplug.c => device-hotplug.c (88%)
> rename hw/{9p.h => 9pfs/virtio-9p-device.h} (85%)
> rename hw/{alpha_dp264.c => alpha/dp264.c} (96%)
> rename hw/{alpha_pci.c => alpha/pci.c} (98%)
> rename hw/{ => arm}/armv7m.c (99%)
> rename hw/{arm_boot.c => arm/boot.c} (99%)
> rename hw/{ => arm}/collie.c (92%)
> rename hw/{ => arm}/exynos4210.c (98%)
> rename hw/{ => arm}/exynos4_boards.c (98%)
> rename hw/{ => arm}/gumstix.c (97%)
> rename hw/{ => arm}/highbank.c (98%)
> rename hw/{ => arm}/integratorcp.c (99%)
> rename hw/{ => arm}/kzm.c (97%)
> rename hw/{ => arm}/mainstone.c (97%)
> rename hw/{ => arm}/musicpal.c (99%)
> rename hw/{ => arm}/nseries.c (99%)
> rename hw/{ => arm}/omap1.c (99%)
> rename hw/{ => arm}/omap2.c (99%)
> rename hw/{ => arm}/omap_sx1.c (98%)
> rename hw/{ => arm}/palm.c (98%)
> rename hw/{arm_pic.c => arm/pic_cpu.c} (95%)
> rename hw/{ => arm}/pxa2xx.c (99%)
> rename hw/{ => arm}/pxa2xx_gpio.c (99%)
> rename hw/{ => arm}/pxa2xx_pic.c (99%)
> rename hw/{ => arm}/realview.c (98%)
> rename hw/{ => arm}/spitz.c (99%)
> rename hw/{ => arm}/stellaris.c (99%)
> rename hw/{ => arm}/tosa.c (97%)
> rename hw/{ => arm}/versatilepb.c (98%)
> rename hw/{ => arm}/vexpress.c (99%)
> rename hw/{ => arm}/xilinx_zynq.c (98%)
> rename hw/{ => arm}/z2.c (98%)
> rename hw/{ => cris}/axis_dev88.c (98%)
> rename hw/{cris-boot.c => cris/boot.c} (97%)
> rename hw/{cris_pic_cpu.c => cris/pic_cpu.c} (96%)
> rename hw/{ => i386}/kvmvapic.c (99%)
> rename hw/{ => i386}/multiboot.c (99%)
> rename hw/{ => i386}/pc.c (98%)
> rename hw/{ => i386}/pc_piix.c (98%)
> rename hw/{ => i386}/pc_q35.c (97%)
> rename hw/{ => i386}/smbios.c (99%)
> rename hw/{ => i386}/xen_domainbuild.c (99%)
> rename hw/{ => i386}/xen_machine_pv.c (96%)
> rename hw/{ => lm32}/lm32_boards.c (98%)
> rename hw/{ => lm32}/milkymist.c (97%)
> rename hw/{ => m68k}/an5206.c (96%)
> rename hw/{ => m68k}/dummy_m68k.c (97%)
> rename hw/{ => m68k}/mcf5206.c (99%)
> rename hw/{ => m68k}/mcf5208.c (98%)
> rename hw/{ => m68k}/mcf_intc.c (98%)
> rename hw/{microblaze_boot.c => microblaze/boot.c} (99%)
> rename hw/{ => microblaze}/petalogix_ml605_mmu.c (95%)
> rename hw/{ => microblaze}/petalogix_s3adsp1800_mmu.c (95%)
> rename hw/{microblaze_pic_cpu.c => microblaze/pic_cpu.c} (96%)
> rename hw/{mips_addr.c => mips/addr.c} (96%)
> rename hw/{mips_timer.c => mips/cputimer.c} (98%)
> rename hw/{ => mips}/mips_fulong2e.c (97%)
> rename hw/{ => mips}/mips_int.c (97%)
> rename hw/{ => mips}/mips_jazz.c (96%)
> rename hw/{ => mips}/mips_malta.c (98%)
> rename hw/{ => mips}/mips_mipssim.c (97%)
> rename hw/{ => mips}/mips_r4k.c (96%)
> rename hw/{openrisc_timer.c => openrisc/cputimer.c} (99%)
> rename hw/{ => openrisc}/openrisc_sim.c (97%)
> rename hw/{openrisc_pic.c => openrisc/pic_cpu.c} (98%)
> rename hw/{ => ppc}/mpc8544_guts.c (98%)
> rename hw/{ => ppc}/ppc.c (99%)
> rename hw/{ => ppc}/ppc405_boards.c (99%)
> rename hw/{ => ppc}/ppc405_uc.c (99%)
> rename hw/{ => ppc}/ppc440_bamboo.c (98%)
> rename hw/{ => ppc}/ppc4xx_devs.c (99%)
> rename hw/{ => ppc}/ppc_booke.c (99%)
> rename hw/{ => ppc}/ppce500_spin.c (99%)
> rename hw/{ => ppc}/spapr.c (99%)
> rename hw/{ => ppc}/spapr_events.c (100%)
> rename hw/{ => ppc}/spapr_hcall.c (100%)
> rename hw/{ => ppc}/spapr_iommu.c (99%)
> rename hw/{ => ppc}/spapr_rtas.c (100%)
> rename hw/{ => ppc}/spapr_vio.c (99%)
> rename hw/{ => ppc}/virtex_ml507.c (97%)
> rename hw/{ => ppc}/xics.c (99%)
> rename hw/{ => sh4}/r2d.c (97%)
> rename hw/{ => sh4}/sh7750.c (99%)
> rename hw/{ => sh4}/sh7750_regnames.c (95%)
> rename hw/{ => sh4}/shix.c (97%)
> rename hw/{ => sparc}/leon3.c (98%)
> rename hw/{ => sparc}/sun4m.c (99%)
> rename hw/{ => sparc64}/sun4u.c (99%)
> rename hw/{ => unicore32}/puv3.c (97%)
> rename hw/{xtensa_pic.c => xtensa/pic_cpu.c} (99%)
> rename hw/{ => xtensa}/xtensa_lx60.c (98%)
> rename hw/{ => xtensa}/xtensa_sim.c (98%)
> rename {hw => include/char}/baum.h (100%)
> rename {hw => include/char}/msmouse.h (100%)
> rename hw/qdev-monitor.h => include/monitor/qdev.h (80%)
> rename hw/fifo.h => include/qemu/fifo8.h (98%)
> rename hw/qdev-monitor.c => qdev-monitor.c (99%)
> create mode 100644 stubs/pci-drive-hot-add.c
> rename hw/fifo.c => util/fifo8.c (97%)
>
