diff options
-rw-r--r-- | Makefile.objs | 1 | ||||
-rw-r--r-- | Makefile.target | 1 | ||||
-rw-r--r-- | backends/Makefile.objs | 4 | ||||
-rw-r--r-- | backends/baum.c (renamed from hw/baum.c) | 3 | ||||
-rw-r--r-- | backends/msmouse.c (renamed from hw/msmouse.c) | 0 | ||||
-rw-r--r-- | backends/rng-random.c | 4 | ||||
-rw-r--r-- | block/iscsi.c | 426 | ||||
-rwxr-xr-x | configure | 21 | ||||
-rw-r--r-- | default-configs/ppc-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppc64-softmmu.mak | 2 | ||||
-rw-r--r-- | default-configs/ppcemb-softmmu.mak | 1 | ||||
-rw-r--r-- | device-hotplug.c (renamed from hw/device-hotplug.c) | 13 | ||||
-rw-r--r-- | hw/9pfs/virtio-9p-device.c | 53 | ||||
-rw-r--r-- | hw/9pfs/virtio-9p-device.h (renamed from hw/9p.h) | 4 | ||||
-rw-r--r-- | hw/9pfs/virtio-9p-proxy.c | 1 | ||||
-rw-r--r-- | hw/9pfs/virtio-9p.c | 3 | ||||
-rw-r--r-- | hw/9pfs/virtio-9p.h | 1 | ||||
-rw-r--r-- | hw/Makefile.objs | 8 | ||||
-rw-r--r-- | hw/a15mpcore.c | 2 | ||||
-rw-r--r-- | hw/a9mpcore.c | 2 | ||||
-rw-r--r-- | hw/a9scu.c | 2 | ||||
-rw-r--r-- | hw/ac97.c | 6 | ||||
-rw-r--r-- | hw/acpi.c | 6 | ||||
-rw-r--r-- | hw/acpi_ich9.c | 10 | ||||
-rw-r--r-- | hw/acpi_ich9.h | 2 | ||||
-rw-r--r-- | hw/acpi_piix4.c | 14 | ||||
-rw-r--r-- | hw/adb.c | 4 | ||||
-rw-r--r-- | hw/adb.h | 2 | ||||
-rw-r--r-- | hw/adlib.c | 8 | ||||
-rw-r--r-- | hw/ads7846.c | 2 | ||||
-rw-r--r-- | hw/alpha/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/alpha/dp264.c (renamed from hw/alpha_dp264.c) | 16 | ||||
-rw-r--r-- | hw/alpha/pci.c (renamed from hw/alpha_pci.c) | 2 | ||||
-rw-r--r-- | hw/alpha_sys.h | 10 | ||||
-rw-r--r-- | hw/alpha_typhoon.c | 6 | ||||
-rw-r--r-- | hw/apb_pci.c | 12 | ||||
-rw-r--r-- | hw/apic.c | 12 | ||||
-rw-r--r-- | hw/apic_common.c | 4 | ||||
-rw-r--r-- | hw/apic_internal.h | 2 | ||||
-rw-r--r-- | hw/apm.c | 6 | ||||
-rw-r--r-- | hw/apm.h | 2 | ||||
-rw-r--r-- | hw/applesmc.c | 4 | ||||
-rw-r--r-- | hw/arm/Makefile.objs | 42 | ||||
-rw-r--r-- | hw/arm/armv7m.c (renamed from hw/armv7m.c) | 6 | ||||
-rw-r--r-- | hw/arm/boot.c (renamed from hw/arm_boot.c) | 8 | ||||
-rw-r--r-- | hw/arm/collie.c (renamed from hw/collie.c) | 14 | ||||
-rw-r--r-- | hw/arm/exynos4210.c (renamed from hw/exynos4210.c) | 12 | ||||
-rw-r--r-- | hw/arm/exynos4_boards.c (renamed from hw/exynos4_boards.c) | 8 | ||||
-rw-r--r-- | hw/arm/gumstix.c (renamed from hw/gumstix.c) | 10 | ||||
-rw-r--r-- | hw/arm/highbank.c (renamed from hw/highbank.c) | 12 | ||||
-rw-r--r-- | hw/arm/integratorcp.c (renamed from hw/integratorcp.c) | 8 | ||||
-rw-r--r-- | hw/arm/kzm.c (renamed from hw/kzm.c) | 14 | ||||
-rw-r--r-- | hw/arm/mainstone.c (renamed from hw/mainstone.c) | 14 | ||||
-rw-r--r-- | hw/arm/musicpal.c (renamed from hw/musicpal.c) | 16 | ||||
-rw-r--r-- | hw/arm/nseries.c (renamed from hw/nseries.c) | 22 | ||||
-rw-r--r-- | hw/arm/omap1.c (renamed from hw/omap1.c) | 10 | ||||
-rw-r--r-- | hw/arm/omap2.c (renamed from hw/omap2.c) | 12 | ||||
-rw-r--r-- | hw/arm/omap_sx1.c (renamed from hw/omap_sx1.c) | 10 | ||||
-rw-r--r-- | hw/arm/palm.c (renamed from hw/palm.c) | 12 | ||||
-rw-r--r-- | hw/arm/pic_cpu.c (renamed from hw/arm_pic.c) | 4 | ||||
-rw-r--r-- | hw/arm/pxa2xx.c (renamed from hw/pxa2xx.c) | 10 | ||||
-rw-r--r-- | hw/arm/pxa2xx_gpio.c (renamed from hw/pxa2xx_gpio.c) | 6 | ||||
-rw-r--r-- | hw/arm/pxa2xx_pic.c (renamed from hw/pxa2xx_pic.c) | 6 | ||||
-rw-r--r-- | hw/arm/realview.c (renamed from hw/realview.c) | 14 | ||||
-rw-r--r-- | hw/arm/spitz.c (renamed from hw/spitz.c) | 22 | ||||
-rw-r--r-- | hw/arm/stellaris.c (renamed from hw/stellaris.c) | 12 | ||||
-rw-r--r-- | hw/arm/tosa.c (renamed from hw/tosa.c) | 20 | ||||
-rw-r--r-- | hw/arm/versatilepb.c (renamed from hw/versatilepb.c) | 14 | ||||
-rw-r--r-- | hw/arm/vexpress.c (renamed from hw/vexpress.c) | 12 | ||||
-rw-r--r-- | hw/arm/xilinx_zynq.c (renamed from hw/xilinx_zynq.c) | 12 | ||||
-rw-r--r-- | hw/arm/z2.c (renamed from hw/z2.c) | 16 | ||||
-rw-r--r-- | hw/arm11mpcore.c | 2 | ||||
-rw-r--r-- | hw/arm_gic.c | 4 | ||||
-rw-r--r-- | hw/arm_gic_common.c | 2 | ||||
-rw-r--r-- | hw/arm_gic_internal.h | 2 | ||||
-rw-r--r-- | hw/arm_l2x0.c | 2 | ||||
-rw-r--r-- | hw/arm_mptimer.c | 2 | ||||
-rw-r--r-- | hw/arm_sysctl.c | 6 | ||||
-rw-r--r-- | hw/arm_timer.c | 6 | ||||
-rw-r--r-- | hw/armv7m_nvic.c | 6 | ||||
-rw-r--r-- | hw/bitbang_i2c.c | 6 | ||||
-rw-r--r-- | hw/bitbang_i2c.h | 2 | ||||
-rw-r--r-- | hw/blizzard.c | 14 | ||||
-rw-r--r-- | hw/boards.h | 2 | ||||
-rw-r--r-- | hw/bonito.c | 10 | ||||
-rw-r--r-- | hw/bt-hci-csr.c | 4 | ||||
-rw-r--r-- | hw/bt-hci.c | 4 | ||||
-rw-r--r-- | hw/bt-hid.c | 4 | ||||
-rw-r--r-- | hw/bt-l2cap.c | 2 | ||||
-rw-r--r-- | hw/bt-sdp.c | 2 | ||||
-rw-r--r-- | hw/bt.c | 2 | ||||
-rw-r--r-- | hw/cadence_gem.c | 2 | ||||
-rw-r--r-- | hw/cadence_ttc.c | 2 | ||||
-rw-r--r-- | hw/cadence_uart.c | 2 | ||||
-rw-r--r-- | hw/cbus.c | 4 | ||||
-rw-r--r-- | hw/ccid.h | 2 | ||||
-rw-r--r-- | hw/cdrom.c | 2 | ||||
-rw-r--r-- | hw/cirrus_vga.c | 44 | ||||
-rw-r--r-- | hw/cirrus_vga_rop.h | 8 | ||||
-rw-r--r-- | hw/cris/Makefile.objs | 10 | ||||
-rw-r--r-- | hw/cris/axis_dev88.c (renamed from hw/axis_dev88.c) | 12 | ||||
-rw-r--r-- | hw/cris/boot.c (renamed from hw/cris-boot.c) | 6 | ||||
-rw-r--r-- | hw/cris/pic_cpu.c (renamed from hw/cris_pic_cpu.c) | 6 | ||||
-rw-r--r-- | hw/cs4231.c | 2 | ||||
-rw-r--r-- | hw/cs4231a.c | 8 | ||||
-rw-r--r-- | hw/cuda.c | 6 | ||||
-rw-r--r-- | hw/dataplane/ioq.c | 2 | ||||
-rw-r--r-- | hw/dataplane/virtio-blk.c | 2 | ||||
-rw-r--r-- | hw/dataplane/vring.c | 3 | ||||
-rw-r--r-- | hw/dataplane/vring.h | 2 | ||||
-rw-r--r-- | hw/debugcon.c | 6 | ||||
-rw-r--r-- | hw/debugexit.c | 4 | ||||
-rw-r--r-- | hw/dec_pci.c | 12 | ||||
-rw-r--r-- | hw/dma.c | 4 | ||||
-rw-r--r-- | hw/dp8393x.c | 4 | ||||
-rw-r--r-- | hw/ds1225y.c | 2 | ||||
-rw-r--r-- | hw/ds1338.c | 2 | ||||
-rw-r--r-- | hw/e1000.c | 8 | ||||
-rw-r--r-- | hw/ecc.c | 4 | ||||
-rw-r--r-- | hw/eccmemctl.c | 2 | ||||
-rw-r--r-- | hw/eepro100.c | 6 | ||||
-rw-r--r-- | hw/eeprom93xx.c | 4 | ||||
-rw-r--r-- | hw/empty_slot.c | 6 | ||||
-rw-r--r-- | hw/es1370.c | 6 | ||||
-rw-r--r-- | hw/escc.c | 6 | ||||
-rw-r--r-- | hw/esp-pci.c | 6 | ||||
-rw-r--r-- | hw/esp.c | 4 | ||||
-rw-r--r-- | hw/esp.h | 2 | ||||
-rw-r--r-- | hw/etraxfs.h | 2 | ||||
-rw-r--r-- | hw/etraxfs_dma.c | 4 | ||||
-rw-r--r-- | hw/etraxfs_eth.c | 4 | ||||
-rw-r--r-- | hw/etraxfs_pic.c | 4 | ||||
-rw-r--r-- | hw/etraxfs_ser.c | 2 | ||||
-rw-r--r-- | hw/etraxfs_timer.c | 4 | ||||
-rw-r--r-- | hw/exynos4210_combiner.c | 4 | ||||
-rw-r--r-- | hw/exynos4210_fimd.c | 2 | ||||
-rw-r--r-- | hw/exynos4210_gic.c | 6 | ||||
-rw-r--r-- | hw/exynos4210_i2c.c | 4 | ||||
-rw-r--r-- | hw/exynos4210_mct.c | 6 | ||||
-rw-r--r-- | hw/exynos4210_pmu.c | 2 | ||||
-rw-r--r-- | hw/exynos4210_pwm.c | 6 | ||||
-rw-r--r-- | hw/exynos4210_rtc.c | 8 | ||||
-rw-r--r-- | hw/exynos4210_uart.c | 4 | ||||
-rw-r--r-- | hw/fdc.c | 10 | ||||
-rw-r--r-- | hw/fmopl.c | 2 | ||||
-rw-r--r-- | hw/framebuffer.c | 4 | ||||
-rw-r--r-- | hw/fw_cfg.c | 8 | ||||
-rw-r--r-- | hw/g364fb.c | 4 | ||||
-rw-r--r-- | hw/grackle_pci.c | 6 | ||||
-rw-r--r-- | hw/grlib.h | 4 | ||||
-rw-r--r-- | hw/grlib_apbuart.c | 2 | ||||
-rw-r--r-- | hw/grlib_gptimer.c | 4 | ||||
-rw-r--r-- | hw/grlib_irqmp.c | 4 | ||||
-rw-r--r-- | hw/gt64xxx.c | 10 | ||||
-rw-r--r-- | hw/gus.c | 10 | ||||
-rw-r--r-- | hw/gusemu_hal.c | 4 | ||||
-rw-r--r-- | hw/gusemu_mixer.c | 4 | ||||
-rw-r--r-- | hw/hda-audio.c | 8 | ||||
-rw-r--r-- | hw/heathrow_pic.c | 4 | ||||
-rw-r--r-- | hw/hid.c | 4 | ||||
-rw-r--r-- | hw/hpet.c | 12 | ||||
-rw-r--r-- | hw/hw.h | 2 | ||||
-rw-r--r-- | hw/i2c.c | 2 | ||||
-rw-r--r-- | hw/i2c.h | 2 | ||||
-rw-r--r-- | hw/i386/Makefile.objs | 17 | ||||
-rw-r--r-- | hw/i386/kvmvapic.c (renamed from hw/kvmvapic.c) | 2 | ||||
-rw-r--r-- | hw/i386/multiboot.c (renamed from hw/multiboot.c) | 8 | ||||
-rw-r--r-- | hw/i386/pc.c (renamed from hw/pc.c) | 36 | ||||
-rw-r--r-- | hw/i386/pc_piix.c (renamed from hw/pc_piix.c) | 24 | ||||
-rw-r--r-- | hw/i386/pc_q35.c (renamed from hw/pc_q35.c) | 16 | ||||
-rw-r--r-- | hw/i386/smbios.c (renamed from hw/smbios.c) | 4 | ||||
-rw-r--r-- | hw/i386/xen_domainbuild.c (renamed from hw/xen_domainbuild.c) | 4 | ||||
-rw-r--r-- | hw/i386/xen_machine_pv.c (renamed from hw/xen_machine_pv.c) | 10 | ||||
-rw-r--r-- | hw/i82374.c | 2 | ||||
-rw-r--r-- | hw/i82378.c | 8 | ||||
-rw-r--r-- | hw/i8254.c | 10 | ||||
-rw-r--r-- | hw/i8254.h | 4 | ||||
-rw-r--r-- | hw/i8254_common.c | 10 | ||||
-rw-r--r-- | hw/i8254_internal.h | 6 | ||||
-rw-r--r-- | hw/i8259.c | 8 | ||||
-rw-r--r-- | hw/i8259_common.c | 4 | ||||
-rw-r--r-- | hw/i8259_internal.h | 6 | ||||
-rw-r--r-- | hw/i82801b11.c | 4 | ||||
-rw-r--r-- | hw/ich9.h | 26 | ||||
-rw-r--r-- | hw/ide.h | 4 | ||||
-rw-r--r-- | hw/imx_avic.c | 4 | ||||
-rw-r--r-- | hw/imx_ccm.c | 6 | ||||
-rw-r--r-- | hw/imx_serial.c | 6 | ||||
-rw-r--r-- | hw/imx_timer.c | 8 | ||||
-rw-r--r-- | hw/intel-hda.c | 12 | ||||
-rw-r--r-- | hw/intel-hda.h | 2 | ||||
-rw-r--r-- | hw/ioapic.c | 10 | ||||
-rw-r--r-- | hw/ioapic_common.c | 6 | ||||
-rw-r--r-- | hw/ioapic_internal.h | 4 | ||||
-rw-r--r-- | hw/ioh3420.c | 8 | ||||
-rw-r--r-- | hw/ioh3420.h | 2 | ||||
-rw-r--r-- | hw/ipack.c | 2 | ||||
-rw-r--r-- | hw/ipack.h | 2 | ||||
-rw-r--r-- | hw/ipoctal232.c | 2 | ||||
-rw-r--r-- | hw/irq.c | 2 | ||||
-rw-r--r-- | hw/isa-bus.c | 6 | ||||
-rw-r--r-- | hw/isa.h | 2 | ||||
-rw-r--r-- | hw/isa_mmio.c | 4 | ||||
-rw-r--r-- | hw/ivshmem.c | 8 | ||||
-rw-r--r-- | hw/jazz_led.c | 2 | ||||
-rw-r--r-- | hw/lan9118.c | 6 | ||||
-rw-r--r-- | hw/lance.c | 6 | ||||
-rw-r--r-- | hw/lm32/Makefile.objs | 8 | ||||
-rw-r--r-- | hw/lm32/lm32_boards.c (renamed from hw/lm32_boards.c) | 16 | ||||
-rw-r--r-- | hw/lm32/milkymist.c (renamed from hw/milkymist.c) | 16 | ||||
-rw-r--r-- | hw/lm32_hwsetup.h | 2 | ||||
-rw-r--r-- | hw/lm32_juart.c | 6 | ||||
-rw-r--r-- | hw/lm32_pic.c | 8 | ||||
-rw-r--r-- | hw/lm32_sys.c | 4 | ||||
-rw-r--r-- | hw/lm32_timer.c | 6 | ||||
-rw-r--r-- | hw/lm32_uart.c | 4 | ||||
-rw-r--r-- | hw/lm4549.c | 4 | ||||
-rw-r--r-- | hw/lm832x.c | 4 | ||||
-rw-r--r-- | hw/loader.c | 12 | ||||
-rw-r--r-- | hw/lpc_ich9.c | 28 | ||||
-rw-r--r-- | hw/lsi53c895a.c | 6 | ||||
-rw-r--r-- | hw/m25p80.c | 6 | ||||
-rw-r--r-- | hw/m48t59.c | 8 | ||||
-rw-r--r-- | hw/m68k/Makefile.objs | 8 | ||||
-rw-r--r-- | hw/m68k/an5206.c (renamed from hw/an5206.c) | 8 | ||||
-rw-r--r-- | hw/m68k/dummy_m68k.c (renamed from hw/dummy_m68k.c) | 6 | ||||
-rw-r--r-- | hw/m68k/mcf5206.c (renamed from hw/mcf5206.c) | 6 | ||||
-rw-r--r-- | hw/m68k/mcf5208.c (renamed from hw/mcf5208.c) | 10 | ||||
-rw-r--r-- | hw/m68k/mcf_intc.c (renamed from hw/mcf_intc.c) | 4 | ||||
-rw-r--r-- | hw/mac_dbdma.c | 6 | ||||
-rw-r--r-- | hw/mac_nvram.c | 6 | ||||
-rw-r--r-- | hw/macio.c | 10 | ||||
-rw-r--r-- | hw/marvell_88w8618_audio.c | 8 | ||||
-rw-r--r-- | hw/max111x.c | 2 | ||||
-rw-r--r-- | hw/max7310.c | 2 | ||||
-rw-r--r-- | hw/mc146818rtc.c | 6 | ||||
-rw-r--r-- | hw/mc146818rtc.h | 4 | ||||
-rw-r--r-- | hw/mcf_fec.c | 4 | ||||
-rw-r--r-- | hw/mcf_uart.c | 4 | ||||
-rw-r--r-- | hw/megasas.c | 12 | ||||
-rw-r--r-- | hw/microblaze/Makefile.objs | 11 | ||||
-rw-r--r-- | hw/microblaze/boot.c (renamed from hw/microblaze_boot.c) | 4 | ||||
-rw-r--r-- | hw/microblaze/petalogix_ml605_mmu.c (renamed from hw/petalogix_ml605_mmu.c) | 22 | ||||
-rw-r--r-- | hw/microblaze/petalogix_s3adsp1800_mmu.c (renamed from hw/petalogix_s3adsp1800_mmu.c) | 16 | ||||
-rw-r--r-- | hw/microblaze/pic_cpu.c (renamed from hw/microblaze_pic_cpu.c) | 4 | ||||
-rw-r--r-- | hw/microblaze_boot.h | 2 | ||||
-rw-r--r-- | hw/milkymist-ac97.c | 4 | ||||
-rw-r--r-- | hw/milkymist-hpdmc.c | 4 | ||||
-rw-r--r-- | hw/milkymist-hw.h | 20 | ||||
-rw-r--r-- | hw/milkymist-memcard.c | 6 | ||||
-rw-r--r-- | hw/milkymist-minimac2.c | 6 | ||||
-rw-r--r-- | hw/milkymist-pfpu.c | 4 | ||||
-rw-r--r-- | hw/milkymist-softusb.c | 6 | ||||
-rw-r--r-- | hw/milkymist-sysctl.c | 6 | ||||
-rw-r--r-- | hw/milkymist-tmu2.c | 4 | ||||
-rw-r--r-- | hw/milkymist-uart.c | 4 | ||||
-rw-r--r-- | hw/milkymist-vgafb.c | 16 | ||||
-rw-r--r-- | hw/mips/Makefile.objs | 8 | ||||
-rw-r--r-- | hw/mips/addr.c (renamed from hw/mips_addr.c) | 4 | ||||
-rw-r--r-- | hw/mips/cputimer.c (renamed from hw/mips_timer.c) | 4 | ||||
-rw-r--r-- | hw/mips/mips_fulong2e.c (renamed from hw/mips_fulong2e.c) | 32 | ||||
-rw-r--r-- | hw/mips/mips_int.c (renamed from hw/mips_int.c) | 4 | ||||
-rw-r--r-- | hw/mips/mips_jazz.c (renamed from hw/mips_jazz.c) | 30 | ||||
-rw-r--r-- | hw/mips/mips_malta.c (renamed from hw/mips_malta.c) | 34 | ||||
-rw-r--r-- | hw/mips/mips_mipssim.c (renamed from hw/mips_mipssim.c) | 18 | ||||
-rw-r--r-- | hw/mips/mips_r4k.c (renamed from hw/mips_r4k.c) | 26 | ||||
-rw-r--r-- | hw/mipsnet.c | 4 | ||||
-rw-r--r-- | hw/mst_fpga.c | 4 | ||||
-rw-r--r-- | hw/nand.c | 6 | ||||
-rw-r--r-- | hw/ne2000-isa.c | 10 | ||||
-rw-r--r-- | hw/ne2000.c | 8 | ||||
-rw-r--r-- | hw/omap_clk.c | 4 | ||||
-rw-r--r-- | hw/omap_dma.c | 6 | ||||
-rw-r--r-- | hw/omap_dss.c | 4 | ||||
-rw-r--r-- | hw/omap_gpio.c | 6 | ||||
-rw-r--r-- | hw/omap_gpmc.c | 6 | ||||
-rw-r--r-- | hw/omap_gptimer.c | 4 | ||||
-rw-r--r-- | hw/omap_i2c.c | 8 | ||||
-rw-r--r-- | hw/omap_intc.c | 6 | ||||
-rw-r--r-- | hw/omap_l4.c | 4 | ||||
-rw-r--r-- | hw/omap_lcdc.c | 14 | ||||
-rw-r--r-- | hw/omap_mmc.c | 6 | ||||
-rw-r--r-- | hw/omap_sdrc.c | 4 | ||||
-rw-r--r-- | hw/omap_spi.c | 4 | ||||
-rw-r--r-- | hw/omap_synctimer.c | 4 | ||||
-rw-r--r-- | hw/omap_tap.c | 4 | ||||
-rw-r--r-- | hw/omap_uart.c | 6 | ||||
-rw-r--r-- | hw/onenand.c | 8 | ||||
-rw-r--r-- | hw/opencores_eth.c | 4 | ||||
-rw-r--r-- | hw/openpic.c | 14 | ||||
-rw-r--r-- | hw/openrisc/Makefile.objs | 5 | ||||
-rw-r--r-- | hw/openrisc/cputimer.c (renamed from hw/openrisc_timer.c) | 2 | ||||
-rw-r--r-- | hw/openrisc/openrisc_sim.c (renamed from hw/openrisc_sim.c) | 10 | ||||
-rw-r--r-- | hw/openrisc/pic_cpu.c (renamed from hw/openrisc_pic.c) | 2 | ||||
-rw-r--r-- | hw/pam.c | 2 | ||||
-rw-r--r-- | hw/parallel.c | 6 | ||||
-rw-r--r-- | hw/pc-testdev.c | 6 | ||||
-rw-r--r-- | hw/pc.h | 6 | ||||
-rw-r--r-- | hw/pc87312.c | 3 | ||||
-rw-r--r-- | hw/pc87312.h | 2 | ||||
-rw-r--r-- | hw/pc_sysfw.c | 11 | ||||
-rw-r--r-- | hw/pci/pci_host.h | 1 | ||||
-rw-r--r-- | hw/pci/shpc.c | 3 | ||||
-rw-r--r-- | hw/pci/slotid_cap.c | 1 | ||||
-rw-r--r-- | hw/pci_bridge_dev.c | 12 | ||||
-rw-r--r-- | hw/pckbd.c | 8 | ||||
-rw-r--r-- | hw/pcnet-pci.c | 6 | ||||
-rw-r--r-- | hw/pcnet.c | 4 | ||||
-rw-r--r-- | hw/pcspk.c | 10 | ||||
-rw-r--r-- | hw/pcspk.h | 4 | ||||
-rw-r--r-- | hw/pflash_cfi01.c | 6 | ||||
-rw-r--r-- | hw/pflash_cfi02.c | 6 | ||||
-rw-r--r-- | hw/piix4.c | 10 | ||||
-rw-r--r-- | hw/piix_pci.c | 17 | ||||
-rw-r--r-- | hw/pl011.c | 2 | ||||
-rw-r--r-- | hw/pl022.c | 4 | ||||
-rw-r--r-- | hw/pl031.c | 2 | ||||
-rw-r--r-- | hw/pl041.c | 6 | ||||
-rw-r--r-- | hw/pl050.c | 4 | ||||
-rw-r--r-- | hw/pl061.c | 2 | ||||
-rw-r--r-- | hw/pl080.c | 2 | ||||
-rw-r--r-- | hw/pl110.c | 14 | ||||
-rw-r--r-- | hw/pl110_template.h | 12 | ||||
-rw-r--r-- | hw/pl181.c | 4 | ||||
-rw-r--r-- | hw/pl190.c | 2 | ||||
-rw-r--r-- | hw/pm_smbus.c | 8 | ||||
-rw-r--r-- | hw/ppc/Makefile.objs | 29 | ||||
-rw-r--r-- | hw/ppc/e500-ccsr.h | 2 | ||||
-rw-r--r-- | hw/ppc/e500plat.c | 2 | ||||
-rw-r--r-- | hw/ppc/mpc8544_guts.c (renamed from hw/mpc8544_guts.c) | 4 | ||||
-rw-r--r-- | hw/ppc/mpc8544ds.c | 2 | ||||
-rw-r--r-- | hw/ppc/ppc.c (renamed from hw/ppc.c) | 8 | ||||
-rw-r--r-- | hw/ppc/ppc405_boards.c (renamed from hw/ppc405_boards.c) | 14 | ||||
-rw-r--r-- | hw/ppc/ppc405_uc.c (renamed from hw/ppc405_uc.c) | 8 | ||||
-rw-r--r-- | hw/ppc/ppc440_bamboo.c (renamed from hw/ppc440_bamboo.c) | 16 | ||||
-rw-r--r-- | hw/ppc/ppc4xx_devs.c (renamed from hw/ppc4xx_devs.c) | 6 | ||||
-rw-r--r-- | hw/ppc/ppc_booke.c (renamed from hw/ppc_booke.c) | 8 | ||||
-rw-r--r-- | hw/ppc/ppce500_spin.c (renamed from hw/ppce500_spin.c) | 4 | ||||
-rw-r--r-- | hw/ppc/prep.c | 1 | ||||
-rw-r--r-- | hw/ppc/spapr.c (renamed from hw/spapr.c) | 4 | ||||
-rw-r--r-- | hw/ppc/spapr_events.c (renamed from hw/spapr_events.c) | 0 | ||||
-rw-r--r-- | hw/ppc/spapr_hcall.c (renamed from hw/spapr_hcall.c) | 0 | ||||
-rw-r--r-- | hw/ppc/spapr_iommu.c (renamed from hw/spapr_iommu.c) | 4 | ||||
-rw-r--r-- | hw/ppc/spapr_rtas.c (renamed from hw/spapr_rtas.c) | 0 | ||||
-rw-r--r-- | hw/ppc/spapr_vio.c (renamed from hw/spapr_vio.c) | 6 | ||||
-rw-r--r-- | hw/ppc/virtex_ml507.c (renamed from hw/virtex_ml507.c) | 22 | ||||
-rw-r--r-- | hw/ppc/xics.c (renamed from hw/xics.c) | 2 | ||||
-rw-r--r-- | hw/ppc405.h | 2 | ||||
-rw-r--r-- | hw/ppc4xx.h | 2 | ||||
-rw-r--r-- | hw/ppc4xx_pci.c | 10 | ||||
-rw-r--r-- | hw/ppce500_pci.c | 8 | ||||
-rw-r--r-- | hw/prep_pci.c | 10 | ||||
-rw-r--r-- | hw/ps2.c | 4 | ||||
-rw-r--r-- | hw/ptimer.c | 4 | ||||
-rw-r--r-- | hw/puv3_dma.c | 6 | ||||
-rw-r--r-- | hw/puv3_gpio.c | 6 | ||||
-rw-r--r-- | hw/puv3_intc.c | 4 | ||||
-rw-r--r-- | hw/puv3_ost.c | 6 | ||||
-rw-r--r-- | hw/puv3_pm.c | 6 | ||||
-rw-r--r-- | hw/pxa2xx_dma.c | 6 | ||||
-rw-r--r-- | hw/pxa2xx_keypad.c | 4 | ||||
-rw-r--r-- | hw/pxa2xx_lcd.c | 16 | ||||
-rw-r--r-- | hw/pxa2xx_mmci.c | 8 | ||||
-rw-r--r-- | hw/pxa2xx_pcmcia.c | 6 | ||||
-rw-r--r-- | hw/pxa2xx_timer.c | 6 | ||||
-rw-r--r-- | hw/q35.c | 4 | ||||
-rw-r--r-- | hw/q35.h | 22 | ||||
-rw-r--r-- | hw/qdev-addr.c | 5 | ||||
-rw-r--r-- | hw/qdev-properties-system.c | 2 | ||||
-rw-r--r-- | hw/qdev-properties.c | 2 | ||||
-rw-r--r-- | hw/qdev-properties.h | 2 | ||||
-rw-r--r-- | hw/qdev.c | 3 | ||||
-rw-r--r-- | hw/qdev.h | 5 | ||||
-rw-r--r-- | hw/qxl-logger.c | 2 | ||||
-rw-r--r-- | hw/qxl-render.c | 2 | ||||
-rw-r--r-- | hw/qxl.c | 2 | ||||
-rw-r--r-- | hw/qxl.h | 6 | ||||
-rw-r--r-- | hw/rc4030.c | 4 | ||||
-rw-r--r-- | hw/realview_gic.c | 2 | ||||
-rw-r--r-- | hw/rtl8139.c | 6 | ||||
-rw-r--r-- | hw/s390x/event-facility.c | 4 | ||||
-rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 2 | ||||
-rw-r--r-- | hw/s390x/sclp.c | 2 | ||||
-rw-r--r-- | hw/s390x/sclpconsole.c | 5 | ||||
-rw-r--r-- | hw/s390x/sclpquiesce.c | 4 | ||||
-rw-r--r-- | hw/sb16.c | 8 | ||||
-rw-r--r-- | hw/sbi.c | 2 | ||||
-rw-r--r-- | hw/scsi-bus.c | 12 | ||||
-rw-r--r-- | hw/scsi-disk.c | 40 | ||||
-rw-r--r-- | hw/scsi-generic.c | 4 | ||||
-rw-r--r-- | hw/scsi.h | 2 | ||||
-rw-r--r-- | hw/sd.c | 4 | ||||
-rw-r--r-- | hw/sdhci.c | 4 | ||||
-rw-r--r-- | hw/sdhci.h | 4 | ||||
-rw-r--r-- | hw/serial-isa.c | 4 | ||||
-rw-r--r-- | hw/serial-pci.c | 4 | ||||
-rw-r--r-- | hw/serial.c | 2 | ||||
-rw-r--r-- | hw/serial.h | 2 | ||||
-rw-r--r-- | hw/sga.c | 6 | ||||
-rw-r--r-- | hw/sh.h | 2 | ||||
-rw-r--r-- | hw/sh4/Makefile.objs | 6 | ||||
-rw-r--r-- | hw/sh4/r2d.c (renamed from hw/r2d.c) | 22 | ||||
-rw-r--r-- | hw/sh4/sh7750.c (renamed from hw/sh7750.c) | 10 | ||||
-rw-r--r-- | hw/sh4/sh7750_regnames.c (renamed from hw/sh7750_regnames.c) | 8 | ||||
-rw-r--r-- | hw/sh4/shix.c (renamed from hw/shix.c) | 8 | ||||
-rw-r--r-- | hw/sh_intc.c | 6 | ||||
-rw-r--r-- | hw/sh_intc.h | 2 | ||||
-rw-r--r-- | hw/sh_pci.c | 8 | ||||
-rw-r--r-- | hw/sh_serial.c | 4 | ||||
-rw-r--r-- | hw/sh_timer.c | 6 | ||||
-rw-r--r-- | hw/slavio_intctl.c | 4 | ||||
-rw-r--r-- | hw/slavio_misc.c | 2 | ||||
-rw-r--r-- | hw/slavio_timer.c | 6 | ||||
-rw-r--r-- | hw/sm501.c | 24 | ||||
-rw-r--r-- | hw/smbus.c | 6 | ||||
-rw-r--r-- | hw/smbus.h | 2 | ||||
-rw-r--r-- | hw/smbus_eeprom.c | 6 | ||||
-rw-r--r-- | hw/smbus_ich9.c | 14 | ||||
-rw-r--r-- | hw/smc91c111.c | 4 | ||||
-rw-r--r-- | hw/soc_dma.c | 2 | ||||
-rw-r--r-- | hw/spapr_llan.c | 2 | ||||
-rw-r--r-- | hw/spapr_pci.c | 10 | ||||
-rw-r--r-- | hw/spapr_vscsi.c | 8 | ||||
-rw-r--r-- | hw/spapr_vty.c | 2 | ||||
-rw-r--r-- | hw/sparc/Makefile.objs | 6 | ||||
-rw-r--r-- | hw/sparc/leon3.c (renamed from hw/leon3.c) | 10 | ||||
-rw-r--r-- | hw/sparc/sun4m.c (renamed from hw/sun4m.c) | 30 | ||||
-rw-r--r-- | hw/sparc32_dma.c | 8 | ||||
-rw-r--r-- | hw/sparc64/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/sparc64/sun4u.c (renamed from hw/sun4u.c) | 26 | ||||
-rw-r--r-- | hw/ssd0303.c | 2 | ||||
-rw-r--r-- | hw/ssd0323.c | 2 | ||||
-rw-r--r-- | hw/ssi-sd.c | 4 | ||||
-rw-r--r-- | hw/ssi.c | 2 | ||||
-rw-r--r-- | hw/ssi.h | 2 | ||||
-rw-r--r-- | hw/stellaris_enet.c | 2 | ||||
-rw-r--r-- | hw/stellaris_input.c | 4 | ||||
-rw-r--r-- | hw/stream.c | 2 | ||||
-rw-r--r-- | hw/strongarm.c | 8 | ||||
-rw-r--r-- | hw/sun4c_intctl.c | 6 | ||||
-rw-r--r-- | hw/sun4m.h | 2 | ||||
-rw-r--r-- | hw/sun4m_iommu.c | 4 | ||||
-rw-r--r-- | hw/sysbus.c | 2 | ||||
-rw-r--r-- | hw/sysbus.h | 2 | ||||
-rw-r--r-- | hw/tc58128.c | 6 | ||||
-rw-r--r-- | hw/tc6393xb.c | 16 | ||||
-rw-r--r-- | hw/tcx.c | 4 | ||||
-rw-r--r-- | hw/tmp105.c | 6 | ||||
-rw-r--r-- | hw/tmp105.h | 4 | ||||
-rw-r--r-- | hw/tpci200.c | 4 | ||||
-rw-r--r-- | hw/tsc2005.c | 4 | ||||
-rw-r--r-- | hw/tsc210x.c | 6 | ||||
-rw-r--r-- | hw/tusb6010.c | 10 | ||||
-rw-r--r-- | hw/twl92230.c | 4 | ||||
-rw-r--r-- | hw/unicore32/Makefile.objs | 2 | ||||
-rw-r--r-- | hw/unicore32/puv3.c (renamed from hw/puv3.c) | 10 | ||||
-rw-r--r-- | hw/unin_pci.c | 8 | ||||
-rw-r--r-- | hw/usb.h | 2 | ||||
-rw-r--r-- | hw/usb/dev-network.c | 1 | ||||
-rw-r--r-- | hw/versatile_i2c.c | 4 | ||||
-rw-r--r-- | hw/versatile_pci.c | 6 | ||||
-rw-r--r-- | hw/vfio_pci.c | 6 | ||||
-rw-r--r-- | hw/vga-isa-mm.c | 6 | ||||
-rw-r--r-- | hw/vga-isa.c | 8 | ||||
-rw-r--r-- | hw/vga-pci.c | 8 | ||||
-rw-r--r-- | hw/vga.c | 26 | ||||
-rw-r--r-- | hw/vhost.c | 2 | ||||
-rw-r--r-- | hw/vhost_net.c | 6 | ||||
-rw-r--r-- | hw/virtio-balloon.c | 6 | ||||
-rw-r--r-- | hw/virtio-balloon.h | 4 | ||||
-rw-r--r-- | hw/virtio-blk.c | 6 | ||||
-rw-r--r-- | hw/virtio-blk.h | 2 | ||||
-rw-r--r-- | hw/virtio-bus.c | 8 | ||||
-rw-r--r-- | hw/virtio-bus.h | 4 | ||||
-rw-r--r-- | hw/virtio-console.c | 2 | ||||
-rw-r--r-- | hw/virtio-net.c | 6 | ||||
-rw-r--r-- | hw/virtio-net.h | 4 | ||||
-rw-r--r-- | hw/virtio-pci.c | 72 | ||||
-rw-r--r-- | hw/virtio-pci.h | 16 | ||||
-rw-r--r-- | hw/virtio-rng.c | 7 | ||||
-rw-r--r-- | hw/virtio-scsi.c | 3 | ||||
-rw-r--r-- | hw/virtio-scsi.h | 4 | ||||
-rw-r--r-- | hw/virtio-serial-bus.c | 4 | ||||
-rw-r--r-- | hw/virtio-serial.h | 4 | ||||
-rw-r--r-- | hw/virtio.c | 4 | ||||
-rw-r--r-- | hw/virtio.h | 10 | ||||
-rw-r--r-- | hw/vmmouse.c | 8 | ||||
-rw-r--r-- | hw/vmport.c | 8 | ||||
-rw-r--r-- | hw/vmware_vga.c | 8 | ||||
-rw-r--r-- | hw/vt82c686.c | 26 | ||||
-rw-r--r-- | hw/wdt_i6300esb.c | 6 | ||||
-rw-r--r-- | hw/wdt_ib700.c | 8 | ||||
-rw-r--r-- | hw/wm8750.c | 4 | ||||
-rw-r--r-- | hw/xen-host-pci-device.c | 2 | ||||
-rw-r--r-- | hw/xen-host-pci-device.h | 2 | ||||
-rw-r--r-- | hw/xen_apic.c | 2 | ||||
-rw-r--r-- | hw/xen_backend.c | 4 | ||||
-rw-r--r-- | hw/xen_backend.h | 2 | ||||
-rw-r--r-- | hw/xen_common.h | 4 | ||||
-rw-r--r-- | hw/xen_console.c | 4 | ||||
-rw-r--r-- | hw/xen_devconfig.c | 2 | ||||
-rw-r--r-- | hw/xen_disk.c | 6 | ||||
-rw-r--r-- | hw/xen_domainbuild.h | 2 | ||||
-rw-r--r-- | hw/xen_nic.c | 4 | ||||
-rw-r--r-- | hw/xen_platform.c | 12 | ||||
-rw-r--r-- | hw/xen_pt.c | 8 | ||||
-rw-r--r-- | hw/xen_pt.h | 6 | ||||
-rw-r--r-- | hw/xen_pt_config_init.c | 4 | ||||
-rw-r--r-- | hw/xen_pt_msi.c | 6 | ||||
-rw-r--r-- | hw/xenfb.c | 4 | ||||
-rw-r--r-- | hw/xgmac.c | 2 | ||||
-rw-r--r-- | hw/xilinx.h | 3 | ||||
-rw-r--r-- | hw/xilinx_axidma.c | 8 | ||||
-rw-r--r-- | hw/xilinx_axienet.c | 5 | ||||
-rw-r--r-- | hw/xilinx_ethlite.c | 4 | ||||
-rw-r--r-- | hw/xilinx_intc.c | 4 | ||||
-rw-r--r-- | hw/xilinx_spi.c | 6 | ||||
-rw-r--r-- | hw/xilinx_spips.c | 8 | ||||
-rw-r--r-- | hw/xilinx_timer.c | 4 | ||||
-rw-r--r-- | hw/xilinx_uartlite.c | 2 | ||||
-rw-r--r-- | hw/xio3130_downstream.c | 8 | ||||
-rw-r--r-- | hw/xio3130_downstream.h | 2 | ||||
-rw-r--r-- | hw/xio3130_upstream.c | 8 | ||||
-rw-r--r-- | hw/xio3130_upstream.h | 2 | ||||
-rw-r--r-- | hw/xtensa/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/xtensa/pic_cpu.c (renamed from hw/xtensa_pic.c) | 2 | ||||
-rw-r--r-- | hw/xtensa/xtensa_lx60.c (renamed from hw/xtensa_lx60.c) | 12 | ||||
-rw-r--r-- | hw/xtensa/xtensa_sim.c (renamed from hw/xtensa_sim.c) | 4 | ||||
-rw-r--r-- | hw/zaurus.c | 6 | ||||
-rw-r--r-- | hw/zynq_slcr.c | 4 | ||||
-rw-r--r-- | include/migration/vmstate.h | 2 | ||||
-rw-r--r-- | include/monitor/qdev.h (renamed from hw/qdev-monitor.h) | 3 | ||||
-rw-r--r-- | include/qemu/fifo8.h (renamed from hw/fifo.h) | 2 | ||||
-rw-r--r-- | monitor.c | 2 | ||||
-rw-r--r-- | qdev-monitor.c (renamed from hw/qdev-monitor.c) | 3 | ||||
-rw-r--r-- | qemu-char.c | 6 | ||||
-rw-r--r-- | qemu-options.hx | 2 | ||||
-rw-r--r-- | stubs/Makefile.objs | 1 | ||||
-rw-r--r-- | stubs/pci-drive-hot-add.c | 10 | ||||
-rw-r--r-- | tests/rtc-test.c | 4 | ||||
-rw-r--r-- | trace-events | 1 | ||||
-rw-r--r-- | util/Makefile.objs | 1 | ||||
-rw-r--r-- | util/fifo8.c (renamed from hw/fifo.c) | 3 | ||||
-rw-r--r-- | util/osdep.c | 4 | ||||
-rw-r--r-- | util/qemu-config.c | 1 | ||||
-rw-r--r-- | vl.c | 1 |
546 files changed, 2152 insertions, 1954 deletions
diff --git a/Makefile.objs b/Makefile.objs index a68cdac..8c90b92 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -51,6 +51,7 @@ ifeq ($(CONFIG_SOFTMMU),y) common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/ common-obj-y += net/ common-obj-y += readline.o +common-obj-y += qdev-monitor.o device-hotplug.o common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o diff --git a/Makefile.target b/Makefile.target index ca657b3..2bd6d14 100644 --- a/Makefile.target +++ b/Makefile.target @@ -111,6 +111,7 @@ CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y) obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o obj-y += qtest.o obj-y += hw/ +obj-$(CONFIG_FDT) += device_tree.o obj-$(CONFIG_KVM) += kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-y += memory.o savevm.o cputlb.o diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 8836761..464bc3e 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -1,2 +1,6 @@ common-obj-y += rng.o rng-egd.o common-obj-$(CONFIG_POSIX) += rng-random.o + +common-obj-y += msmouse.o +common-obj-$(CONFIG_BRLAPI) += baum.o +$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) diff --git a/hw/baum.c b/backends/baum.c index d75b150..9063aea 100644 --- a/hw/baum.c +++ b/backends/baum.c @@ -24,8 +24,7 @@ #include "qemu-common.h" #include "char/char.h" #include "qemu/timer.h" -#include "usb.h" -#include "baum.h" +#include "hw/usb.h" #include <brlapi.h> #include <brlapi_constants.h> #include <brlapi_keycodes.h> diff --git a/hw/msmouse.c b/backends/msmouse.c index 407ec87..407ec87 100644 --- a/hw/msmouse.c +++ b/backends/msmouse.c diff --git a/backends/rng-random.c b/backends/rng-random.c index 0d11088..acd20af 100644 --- a/backends/rng-random.c +++ b/backends/rng-random.c @@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error **errp) error_set(errp, QERR_INVALID_PARAMETER_VALUE, "filename", "a valid filename"); } else { - s->fd = open(s->filename, O_RDONLY | O_NONBLOCK); + s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK); if (s->fd == -1) { error_set(errp, QERR_OPEN_FILE_FAILED, s->filename); @@ -130,7 +130,7 @@ static void rng_random_finalize(Object *obj) qemu_set_fd_handler(s->fd, NULL, NULL, NULL); if (s->fd != -1) { - close(s->fd); + qemu_close(s->fd); } g_free(s->filename); diff --git a/block/iscsi.c b/block/iscsi.c index deb3b68..3d52921 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -60,8 +60,11 @@ typedef struct IscsiAIOCB { uint8_t *buf; int status; int canceled; + int retries; size_t read_size; size_t read_offset; + int64_t sector_num; + int nb_sectors; #ifdef __linux__ sg_io_hdr_t *ioh; #endif @@ -69,6 +72,7 @@ typedef struct IscsiAIOCB { #define NOP_INTERVAL 5000 #define MAX_NOP_FAILURES 3 +#define ISCSI_CMD_RETRIES 5 static void iscsi_bh_cb(void *p) @@ -191,6 +195,8 @@ iscsi_process_write(void *arg) iscsi_set_events(iscsilun); } +static int +iscsi_aio_writev_acb(IscsiAIOCB *acb); static void iscsi_aio_write16_cb(struct iscsi_context *iscsi, int status, @@ -208,7 +214,19 @@ iscsi_aio_write16_cb(struct iscsi_context *iscsi, int status, } acb->status = 0; - if (status < 0) { + if (status != 0) { + if (status == SCSI_STATUS_CHECK_CONDITION + && acb->task->sense.key == SCSI_SENSE_UNIT_ATTENTION + && acb->retries-- > 0) { + if (acb->task != NULL) { + scsi_free_scsi_task(acb->task); + acb->task = NULL; + } + if (iscsi_aio_writev_acb(acb) == 0) { + iscsi_set_events(acb->iscsilun); + return; + } + } error_report("Failed to write16 data to iSCSI lun. %s", iscsi_get_error(iscsi)); acb->status = -EIO; @@ -222,15 +240,10 @@ static int64_t sector_qemu2lun(int64_t sector, IscsiLun *iscsilun) return sector * BDRV_SECTOR_SIZE / iscsilun->block_size; } -static BlockDriverAIOCB * -iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, - QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, - void *opaque) +static int +iscsi_aio_writev_acb(IscsiAIOCB *acb) { - IscsiLun *iscsilun = bs->opaque; - struct iscsi_context *iscsi = iscsilun->iscsi; - IscsiAIOCB *acb; + struct iscsi_context *iscsi = acb->iscsilun->iscsi; size_t size; uint32_t num_sectors; uint64_t lba; @@ -239,19 +252,13 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, #endif int ret; - acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); - trace_iscsi_aio_writev(iscsi, sector_num, nb_sectors, opaque, acb); - - acb->iscsilun = iscsilun; - acb->qiov = qiov; - acb->canceled = 0; acb->bh = NULL; acb->status = -EINPROGRESS; acb->buf = NULL; /* this will allow us to get rid of 'buf' completely */ - size = nb_sectors * BDRV_SECTOR_SIZE; + size = acb->nb_sectors * BDRV_SECTOR_SIZE; #if !defined(LIBISCSI_FEATURE_IOVECTOR) data.size = MIN(size, acb->qiov->size); @@ -270,48 +277,76 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, if (acb->task == NULL) { error_report("iSCSI: Failed to allocate task for scsi WRITE16 " "command. %s", iscsi_get_error(iscsi)); - qemu_aio_release(acb); - return NULL; + return -1; } memset(acb->task, 0, sizeof(struct scsi_task)); acb->task->xfer_dir = SCSI_XFER_WRITE; acb->task->cdb_size = 16; acb->task->cdb[0] = 0x8a; - lba = sector_qemu2lun(sector_num, iscsilun); + lba = sector_qemu2lun(acb->sector_num, acb->iscsilun); *(uint32_t *)&acb->task->cdb[2] = htonl(lba >> 32); *(uint32_t *)&acb->task->cdb[6] = htonl(lba & 0xffffffff); - num_sectors = size / iscsilun->block_size; + num_sectors = size / acb->iscsilun->block_size; *(uint32_t *)&acb->task->cdb[10] = htonl(num_sectors); acb->task->expxferlen = size; #if defined(LIBISCSI_FEATURE_IOVECTOR) - ret = iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task, + ret = iscsi_scsi_command_async(iscsi, acb->iscsilun->lun, acb->task, iscsi_aio_write16_cb, NULL, acb); #else - ret = iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task, + ret = iscsi_scsi_command_async(iscsi, acb->iscsilun->lun, acb->task, iscsi_aio_write16_cb, &data, acb); #endif if (ret != 0) { - scsi_free_scsi_task(acb->task); g_free(acb->buf); - qemu_aio_release(acb); - return NULL; + return -1; } #if defined(LIBISCSI_FEATURE_IOVECTOR) scsi_task_set_iov_out(acb->task, (struct scsi_iovec*) acb->qiov->iov, acb->qiov->niov); #endif - iscsi_set_events(iscsilun); + return 0; +} + +static BlockDriverAIOCB * +iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, + QEMUIOVector *qiov, int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + IscsiLun *iscsilun = bs->opaque; + IscsiAIOCB *acb; + acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); + trace_iscsi_aio_writev(iscsilun->iscsi, sector_num, nb_sectors, opaque, acb); + + acb->iscsilun = iscsilun; + acb->qiov = qiov; + acb->nb_sectors = nb_sectors; + acb->sector_num = sector_num; + acb->retries = ISCSI_CMD_RETRIES; + + if (iscsi_aio_writev_acb(acb) != 0) { + if (acb->task) { + scsi_free_scsi_task(acb->task); + } + qemu_aio_release(acb); + return NULL; + } + + iscsi_set_events(iscsilun); return &acb->common; } +static int +iscsi_aio_readv_acb(IscsiAIOCB *acb); + static void iscsi_aio_read16_cb(struct iscsi_context *iscsi, int status, void *command_data, void *opaque) @@ -326,6 +361,18 @@ iscsi_aio_read16_cb(struct iscsi_context *iscsi, int status, acb->status = 0; if (status != 0) { + if (status == SCSI_STATUS_CHECK_CONDITION + && acb->task->sense.key == SCSI_SENSE_UNIT_ATTENTION + && acb->retries-- > 0) { + if (acb->task != NULL) { + scsi_free_scsi_task(acb->task); + acb->task = NULL; + } + if (iscsi_aio_readv_acb(acb) == 0) { + iscsi_set_events(acb->iscsilun); + return; + } + } error_report("Failed to read16 data from iSCSI lun. %s", iscsi_get_error(iscsi)); acb->status = -EIO; @@ -334,35 +381,20 @@ iscsi_aio_read16_cb(struct iscsi_context *iscsi, int status, iscsi_schedule_bh(acb); } -static BlockDriverAIOCB * -iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, - QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, - void *opaque) +static int +iscsi_aio_readv_acb(IscsiAIOCB *acb) { - IscsiLun *iscsilun = bs->opaque; - struct iscsi_context *iscsi = iscsilun->iscsi; - IscsiAIOCB *acb; - size_t qemu_read_size; + struct iscsi_context *iscsi = acb->iscsilun->iscsi; + uint64_t lba; + uint32_t num_sectors; + int ret; #if !defined(LIBISCSI_FEATURE_IOVECTOR) int i; #endif - int ret; - uint64_t lba; - uint32_t num_sectors; - - qemu_read_size = BDRV_SECTOR_SIZE * (size_t)nb_sectors; - - acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); - trace_iscsi_aio_readv(iscsi, sector_num, nb_sectors, opaque, acb); - - acb->iscsilun = iscsilun; - acb->qiov = qiov; acb->canceled = 0; acb->bh = NULL; acb->status = -EINPROGRESS; - acb->read_size = qemu_read_size; acb->buf = NULL; /* If LUN blocksize is bigger than BDRV_BLOCK_SIZE a read from QEMU @@ -370,30 +402,29 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, * data. */ acb->read_offset = 0; - if (iscsilun->block_size > BDRV_SECTOR_SIZE) { - uint64_t bdrv_offset = BDRV_SECTOR_SIZE * sector_num; + if (acb->iscsilun->block_size > BDRV_SECTOR_SIZE) { + uint64_t bdrv_offset = BDRV_SECTOR_SIZE * acb->sector_num; - acb->read_offset = bdrv_offset % iscsilun->block_size; + acb->read_offset = bdrv_offset % acb->iscsilun->block_size; } - num_sectors = (qemu_read_size + iscsilun->block_size + num_sectors = (acb->read_size + acb->iscsilun->block_size + acb->read_offset - 1) - / iscsilun->block_size; + / acb->iscsilun->block_size; acb->task = malloc(sizeof(struct scsi_task)); if (acb->task == NULL) { error_report("iSCSI: Failed to allocate task for scsi READ16 " "command. %s", iscsi_get_error(iscsi)); - qemu_aio_release(acb); - return NULL; + return -1; } memset(acb->task, 0, sizeof(struct scsi_task)); acb->task->xfer_dir = SCSI_XFER_READ; - lba = sector_qemu2lun(sector_num, iscsilun); - acb->task->expxferlen = qemu_read_size; + lba = sector_qemu2lun(acb->sector_num, acb->iscsilun); + acb->task->expxferlen = acb->read_size; - switch (iscsilun->type) { + switch (acb->iscsilun->type) { case TYPE_DISK: acb->task->cdb_size = 16; acb->task->cdb[0] = 0x88; @@ -409,14 +440,12 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, break; } - ret = iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task, + ret = iscsi_scsi_command_async(iscsi, acb->iscsilun->lun, acb->task, iscsi_aio_read16_cb, NULL, acb); if (ret != 0) { - scsi_free_scsi_task(acb->task); - qemu_aio_release(acb); - return NULL; + return -1; } #if defined(LIBISCSI_FEATURE_IOVECTOR) @@ -428,12 +457,42 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, acb->qiov->iov[i].iov_base); } #endif + return 0; +} - iscsi_set_events(iscsilun); +static BlockDriverAIOCB * +iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, + QEMUIOVector *qiov, int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + IscsiLun *iscsilun = bs->opaque; + IscsiAIOCB *acb; + acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); + trace_iscsi_aio_readv(iscsilun->iscsi, sector_num, nb_sectors, opaque, acb); + + acb->nb_sectors = nb_sectors; + acb->sector_num = sector_num; + acb->iscsilun = iscsilun; + acb->qiov = qiov; + acb->read_size = BDRV_SECTOR_SIZE * (size_t)acb->nb_sectors; + acb->retries = ISCSI_CMD_RETRIES; + + if (iscsi_aio_readv_acb(acb) != 0) { + if (acb->task) { + scsi_free_scsi_task(acb->task); + } + qemu_aio_release(acb); + return NULL; + } + + iscsi_set_events(iscsilun); return &acb->common; } +static int +iscsi_aio_flush_acb(IscsiAIOCB *acb); static void iscsi_synccache10_cb(struct iscsi_context *iscsi, int status, @@ -446,7 +505,19 @@ iscsi_synccache10_cb(struct iscsi_context *iscsi, int status, } acb->status = 0; - if (status < 0) { + if (status != 0) { + if (status == SCSI_STATUS_CHECK_CONDITION + && acb->task->sense.key == SCSI_SENSE_UNIT_ATTENTION + && acb->retries-- > 0) { + if (acb->task != NULL) { + scsi_free_scsi_task(acb->task); + acb->task = NULL; + } + if (iscsi_aio_flush_acb(acb) == 0) { + iscsi_set_events(acb->iscsilun); + return; + } + } error_report("Failed to sync10 data on iSCSI lun. %s", iscsi_get_error(iscsi)); acb->status = -EIO; @@ -455,29 +526,43 @@ iscsi_synccache10_cb(struct iscsi_context *iscsi, int status, iscsi_schedule_bh(acb); } -static BlockDriverAIOCB * -iscsi_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque) +static int +iscsi_aio_flush_acb(IscsiAIOCB *acb) { - IscsiLun *iscsilun = bs->opaque; - struct iscsi_context *iscsi = iscsilun->iscsi; - IscsiAIOCB *acb; - - acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); + struct iscsi_context *iscsi = acb->iscsilun->iscsi; - acb->iscsilun = iscsilun; acb->canceled = 0; acb->bh = NULL; acb->status = -EINPROGRESS; acb->buf = NULL; - acb->task = iscsi_synchronizecache10_task(iscsi, iscsilun->lun, + acb->task = iscsi_synchronizecache10_task(iscsi, acb->iscsilun->lun, 0, 0, 0, 0, iscsi_synccache10_cb, acb); if (acb->task == NULL) { error_report("iSCSI: Failed to send synchronizecache10 command. %s", iscsi_get_error(iscsi)); + return -1; + } + + return 0; +} + +static BlockDriverAIOCB * +iscsi_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + IscsiLun *iscsilun = bs->opaque; + + IscsiAIOCB *acb; + + acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); + + acb->iscsilun = iscsilun; + acb->retries = ISCSI_CMD_RETRIES; + + if (iscsi_aio_flush_acb(acb) != 0) { qemu_aio_release(acb); return NULL; } @@ -487,6 +572,8 @@ iscsi_aio_flush(BlockDriverState *bs, return &acb->common; } +static int iscsi_aio_discard_acb(IscsiAIOCB *acb); + static void iscsi_unmap_cb(struct iscsi_context *iscsi, int status, void *command_data, void *opaque) @@ -498,7 +585,19 @@ iscsi_unmap_cb(struct iscsi_context *iscsi, int status, } acb->status = 0; - if (status < 0) { + if (status != 0) { + if (status == SCSI_STATUS_CHECK_CONDITION + && acb->task->sense.key == SCSI_SENSE_UNIT_ATTENTION + && acb->retries-- > 0) { + if (acb->task != NULL) { + scsi_free_scsi_task(acb->task); + acb->task = NULL; + } + if (iscsi_aio_discard_acb(acb) == 0) { + iscsi_set_events(acb->iscsilun); + return; + } + } error_report("Failed to unmap data on iSCSI lun. %s", iscsi_get_error(iscsi)); acb->status = -EIO; @@ -507,34 +606,50 @@ iscsi_unmap_cb(struct iscsi_context *iscsi, int status, iscsi_schedule_bh(acb); } -static BlockDriverAIOCB * -iscsi_aio_discard(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) -{ - IscsiLun *iscsilun = bs->opaque; - struct iscsi_context *iscsi = iscsilun->iscsi; - IscsiAIOCB *acb; +static int iscsi_aio_discard_acb(IscsiAIOCB *acb) { + struct iscsi_context *iscsi = acb->iscsilun->iscsi; struct unmap_list list[1]; - acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); - - acb->iscsilun = iscsilun; acb->canceled = 0; acb->bh = NULL; acb->status = -EINPROGRESS; acb->buf = NULL; - list[0].lba = sector_qemu2lun(sector_num, iscsilun); - list[0].num = nb_sectors * BDRV_SECTOR_SIZE / iscsilun->block_size; + list[0].lba = sector_qemu2lun(acb->sector_num, acb->iscsilun); + list[0].num = acb->nb_sectors * BDRV_SECTOR_SIZE / acb->iscsilun->block_size; - acb->task = iscsi_unmap_task(iscsi, iscsilun->lun, + acb->task = iscsi_unmap_task(iscsi, acb->iscsilun->lun, 0, 0, &list[0], 1, iscsi_unmap_cb, acb); if (acb->task == NULL) { error_report("iSCSI: Failed to send unmap command. %s", iscsi_get_error(iscsi)); + return -1; + } + + return 0; +} + +static BlockDriverAIOCB * +iscsi_aio_discard(BlockDriverState *bs, + int64_t sector_num, int nb_sectors, + BlockDriverCompletionFunc *cb, void *opaque) +{ + IscsiLun *iscsilun = bs->opaque; + IscsiAIOCB *acb; + + acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); + + acb->iscsilun = iscsilun; + acb->nb_sectors = nb_sectors; + acb->sector_num = sector_num; + acb->retries = ISCSI_CMD_RETRIES; + + if (iscsi_aio_discard_acb(acb) != 0) { + if (acb->task) { + scsi_free_scsi_task(acb->task); + } qemu_aio_release(acb); return NULL; } @@ -823,6 +938,71 @@ static void iscsi_nop_timed_event(void *opaque) } #endif +static int iscsi_readcapacity_sync(IscsiLun *iscsilun) +{ + struct scsi_task *task = NULL; + struct scsi_readcapacity10 *rc10 = NULL; + struct scsi_readcapacity16 *rc16 = NULL; + int ret = 0; + int retries = ISCSI_CMD_RETRIES; + +try_again: + switch (iscsilun->type) { + case TYPE_DISK: + task = iscsi_readcapacity16_sync(iscsilun->iscsi, iscsilun->lun); + if (task == NULL || task->status != SCSI_STATUS_GOOD) { + if (task != NULL && task->status == SCSI_STATUS_CHECK_CONDITION + && task->sense.key == SCSI_SENSE_UNIT_ATTENTION + && retries-- > 0) { + scsi_free_scsi_task(task); + goto try_again; + } + error_report("iSCSI: failed to send readcapacity16 command."); + ret = -EINVAL; + goto out; + } + rc16 = scsi_datain_unmarshall(task); + if (rc16 == NULL) { + error_report("iSCSI: Failed to unmarshall readcapacity16 data."); + ret = -EINVAL; + goto out; + } + iscsilun->block_size = rc16->block_length; + iscsilun->num_blocks = rc16->returned_lba + 1; + break; + case TYPE_ROM: + task = iscsi_readcapacity10_sync(iscsilun->iscsi, iscsilun->lun, 0, 0); + if (task == NULL || task->status != SCSI_STATUS_GOOD) { + error_report("iSCSI: failed to send readcapacity10 command."); + ret = -EINVAL; + goto out; + } + rc10 = scsi_datain_unmarshall(task); + if (rc10 == NULL) { + error_report("iSCSI: Failed to unmarshall readcapacity10 data."); + ret = -EINVAL; + goto out; + } + iscsilun->block_size = rc10->block_size; + if (rc10->lba == 0) { + /* blank disk loaded */ + iscsilun->num_blocks = 0; + } else { + iscsilun->num_blocks = rc10->lba + 1; + } + break; + default: + break; + } + +out: + if (task) { + scsi_free_scsi_task(task); + } + + return ret; +} + /* * We support iscsi url's on the form * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun> @@ -834,8 +1014,6 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, int flags) struct iscsi_url *iscsi_url = NULL; struct scsi_task *task = NULL; struct scsi_inquiry_standard *inq = NULL; - struct scsi_readcapacity10 *rc10 = NULL; - struct scsi_readcapacity16 *rc16 = NULL; char *initiator_name = NULL; int ret; @@ -925,50 +1103,9 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, int flags) iscsilun->type = inq->periperal_device_type; - scsi_free_scsi_task(task); - - switch (iscsilun->type) { - case TYPE_DISK: - task = iscsi_readcapacity16_sync(iscsi, iscsilun->lun); - if (task == NULL || task->status != SCSI_STATUS_GOOD) { - error_report("iSCSI: failed to send readcapacity16 command."); - ret = -EINVAL; - goto out; - } - rc16 = scsi_datain_unmarshall(task); - if (rc16 == NULL) { - error_report("iSCSI: Failed to unmarshall readcapacity16 data."); - ret = -EINVAL; - goto out; - } - iscsilun->block_size = rc16->block_length; - iscsilun->num_blocks = rc16->returned_lba + 1; - break; - case TYPE_ROM: - task = iscsi_readcapacity10_sync(iscsi, iscsilun->lun, 0, 0); - if (task == NULL || task->status != SCSI_STATUS_GOOD) { - error_report("iSCSI: failed to send readcapacity10 command."); - ret = -EINVAL; - goto out; - } - rc10 = scsi_datain_unmarshall(task); - if (rc10 == NULL) { - error_report("iSCSI: Failed to unmarshall readcapacity10 data."); - ret = -EINVAL; - goto out; - } - iscsilun->block_size = rc10->block_size; - if (rc10->lba == 0) { - /* blank disk loaded */ - iscsilun->num_blocks = 0; - } else { - iscsilun->num_blocks = rc10->lba + 1; - } - break; - default: - break; + if ((ret = iscsi_readcapacity_sync(iscsilun)) != 0) { + goto out; } - bs->total_sectors = iscsilun->num_blocks * iscsilun->block_size / BDRV_SECTOR_SIZE ; @@ -981,8 +1118,6 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, int flags) bs->sg = 1; } - ret = 0; - #if defined(LIBISCSI_FEATURE_NOP_COUNTER) /* Set up a timer for sending out iSCSI NOPs */ iscsilun->nop_timer = qemu_new_timer_ms(rt_clock, iscsi_nop_timed_event, iscsilun); @@ -1023,6 +1158,26 @@ static void iscsi_close(BlockDriverState *bs) memset(iscsilun, 0, sizeof(IscsiLun)); } +static int iscsi_truncate(BlockDriverState *bs, int64_t offset) +{ + IscsiLun *iscsilun = bs->opaque; + int ret = 0; + + if (iscsilun->type != TYPE_DISK) { + return -ENOTSUP; + } + + if ((ret = iscsi_readcapacity_sync(iscsilun)) != 0) { + return ret; + } + + if (offset > iscsi_getlength(bs)) { + return -EINVAL; + } + + return 0; +} + static int iscsi_has_zero_init(BlockDriverState *bs) { return 0; @@ -1093,6 +1248,7 @@ static BlockDriver bdrv_iscsi = { .create_options = iscsi_create_options, .bdrv_getlength = iscsi_getlength, + .bdrv_truncate = iscsi_truncate, .bdrv_aio_readv = iscsi_aio_readv, .bdrv_aio_writev = iscsi_aio_writev, @@ -2420,6 +2420,7 @@ int main(void) { return 0; } EOF if compile_prog "" "$fdt_libs" ; then fdt=yes + libs_softmmu="$libs_softmmu $fdt_libs" else if test "$fdt" = "yes" ; then feature_not_found "fdt" @@ -2803,7 +2804,13 @@ if test "$libiscsi" != "no" ; then #include <iscsi/iscsi.h> int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; } EOF - if compile_prog "" "-liscsi" ; then + if $pkg_config --atleast-version=1.7.0 libiscsi --modversion >/dev/null 2>&1; then + libiscsi="yes" + libiscsi_cflags=$($pkg_config --cflags libiscsi 2>/dev/null) + libiscsi_libs=$($pkg_config --libs libiscsi 2>/dev/null) + CFLAGS="$CFLAGS $libiscsi_cflags" + LIBS="$LIBS $libiscsi_libs" + elif compile_prog "" "-liscsi" ; then libiscsi="yes" LIBS="$LIBS -liscsi" else @@ -2871,7 +2878,7 @@ EOF spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null) spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null) if $pkg_config --atleast-version=0.12.0 spice-server >/dev/null 2>&1 && \ - $pkg_config --atleast-version=0.12.2 spice-protocol > /dev/null 2>&1 && \ + $pkg_config --atleast-version=0.12.3 spice-protocol > /dev/null 2>&1 && \ compile_prog "$spice_cflags" "$spice_libs" ; then spice="yes" libs_softmmu="$libs_softmmu $spice_libs" @@ -3985,7 +3992,6 @@ case "$target_arch2" in target_nptl="yes" gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" target_llong_alignment=4 - target_libs_softmmu="$fdt_libs" ;; cris) target_nptl="yes" @@ -4004,7 +4010,6 @@ case "$target_arch2" in TARGET_ARCH=microblaze bflt="yes" target_nptl="yes" - target_libs_softmmu="$fdt_libs" ;; mips|mipsel) TARGET_ARCH=mips @@ -4030,21 +4035,18 @@ case "$target_arch2" in ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_nptl="yes" - target_libs_softmmu="$fdt_libs" ;; ppcemb) TARGET_BASE_ARCH=ppc TARGET_ABI_DIR=ppc gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_nptl="yes" - target_libs_softmmu="$fdt_libs" ;; ppc64) TARGET_BASE_ARCH=ppc TARGET_ABI_DIR=ppc gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_long_alignment=8 - target_libs_softmmu="$fdt_libs" ;; ppc64abi32) TARGET_ARCH=ppc64 @@ -4052,7 +4054,6 @@ case "$target_arch2" in TARGET_ABI_DIR=ppc echo "TARGET_ABI32=y" >> $config_target_mak gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" - target_libs_softmmu="$fdt_libs" ;; sh4|sh4eb) TARGET_ARCH=sh4 @@ -4154,9 +4155,6 @@ case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak esac -if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then - echo "CONFIG_PSERIES=y" >> $config_target_mak -fi if test "$target_bigendian" = "yes" ; then echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak fi @@ -4369,6 +4367,7 @@ FILES="$FILES tests/tcg/lm32/Makefile po/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" +FILES="$FILES pc-bios/qemu-icon.bmp" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.aml \ diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index f9f8a81..c209a8d 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -40,3 +40,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_E500=$(CONFIG_FDT) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index dc44294..8d490bd 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -40,3 +40,5 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_PSERIES=$(CONFIG_FDT) +CONFIG_E500=$(CONFIG_FDT) diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 1c6bcf9..7f13421 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -35,3 +35,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_E500=$(CONFIG_FDT) diff --git a/hw/device-hotplug.c b/device-hotplug.c index 88da145..103d34a 100644 --- a/hw/device-hotplug.c +++ b/device-hotplug.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "boards.h" +#include "hw/hw.h" +#include "hw/boards.h" #include "sysemu/blockdev.h" #include "qemu/config-file.h" #include "sysemu/sysemu.h" @@ -47,15 +47,6 @@ DriveInfo *add_init_drive(const char *optstr) return dinfo; } -#if !defined(TARGET_I386) -int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo) -{ - /* On non-x86 we don't do PCI hotplug */ - monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type); - return -1; -} -#endif - void drive_hot_add(Monitor *mon, const QDict *qdict) { DriveInfo *dinfo = NULL; diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 74155fb..d321c80 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -14,9 +14,9 @@ #include "hw/virtio.h" #include "hw/pc.h" #include "qemu/sockets.h" -#include "hw/virtio-pci.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" +#include "virtio-9p-device.h" #include "virtio-9p-xattr.h" #include "virtio-9p-coth.h" @@ -136,54 +136,3 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) return &s->vdev; } - -static int virtio_9p_init_pci(PCIDevice *pci_dev) -{ - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); - VirtIODevice *vdev; - - vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf); - vdev->nvectors = proxy->nvectors; - virtio_init_pci(proxy, vdev); - /* make the actual value visible */ - proxy->nvectors = vdev->nvectors; - return 0; -} - -static Property virtio_9p_properties[] = { - DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), - DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), - DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag), - DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id), - DEFINE_PROP_END_OF_LIST(), -}; - -static void virtio_9p_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - - k->init = virtio_9p_init_pci; - k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; - k->device_id = PCI_DEVICE_ID_VIRTIO_9P; - k->revision = VIRTIO_PCI_ABI_VERSION; - k->class_id = 0x2; - dc->props = virtio_9p_properties; - dc->reset = virtio_pci_reset; -} - -static const TypeInfo virtio_9p_info = { - .name = "virtio-9p-pci", - .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(VirtIOPCIProxy), - .class_init = virtio_9p_class_init, -}; - -static void virtio_9p_register_types(void) -{ - type_register_static(&virtio_9p_info); - virtio_9p_set_fd_limit(); -} - -type_init(virtio_9p_register_types) diff --git a/hw/9p.h b/hw/9pfs/virtio-9p-device.h index d9951d6..65789db 100644 --- a/hw/9p.h +++ b/hw/9pfs/virtio-9p-device.h @@ -11,8 +11,8 @@ * */ -#ifndef QEMU_9P_H -#define QEMU_9P_H +#ifndef QEMU_VIRTIO_9P_DEVICE_H +#define QEMU_VIRTIO_9P_DEVICE_H typedef struct V9fsConf { diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c index 54e9875..7300279 100644 --- a/hw/9pfs/virtio-9p-proxy.c +++ b/hw/9pfs/virtio-9p-proxy.c @@ -13,6 +13,7 @@ #include <sys/un.h> #include "hw/virtio.h" #include "virtio-9p.h" +#include "qemu/error-report.h" #include "fsdev/qemu-fsdev.h" #include "virtio-9p-proxy.h" diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index d3ea820..5cc4c92 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -14,7 +14,6 @@ #include "hw/virtio.h" #include "hw/pc.h" #include "qemu/sockets.h" -#include "hw/virtio-pci.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "virtio-9p-xattr.h" @@ -3269,7 +3268,7 @@ void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) free_pdu(s, pdu); } -void virtio_9p_set_fd_limit(void) +static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void) { struct rlimit rlim; if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) { diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 406fe52..52b1c69 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -389,7 +389,6 @@ static inline uint8_t v9fs_request_cancelled(V9fsPDU *pdu) } extern void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq); -extern void virtio_9p_set_fd_limit(void); extern void v9fs_reclaim_fd(V9fsPDU *pdu); extern void v9fs_path_init(V9fsPath *path); extern void v9fs_path_free(V9fsPath *path); diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 40ebe46..eb7eb31 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -44,7 +44,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o endif common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o common-obj-$(CONFIG_SDHCI) += sdhci.o -common-obj-y += fifo.o common-obj-y += pam.o # PPC devices @@ -190,10 +189,8 @@ common-obj-$(CONFIG_SSI_SD) += ssi-sd.o common-obj-$(CONFIG_SD) += sd.o common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o common-obj-y += bt-hci-csr.o -common-obj-y += msmouse.o ps2.o -common-obj-y += qdev-monitor.o +common-obj-y += ps2.o common-obj-y += qdev-properties-system.o -common-obj-$(CONFIG_BRLAPI) += baum.o # xen backend driver support common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o @@ -209,8 +206,6 @@ obj-$(CONFIG_SOFTMMU) += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/ obj-$(CONFIG_VGA) += vga.o -obj-$(CONFIG_SOFTMMU) += device-hotplug.o -obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o # Inter-VM PCI shared memory & VFIO PCI device assignment ifeq ($(CONFIG_PCI), y) @@ -218,5 +213,4 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_LINUX) += vfio_pci.o endif -$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) endif diff --git a/hw/a15mpcore.c b/hw/a15mpcore.c index 97abe41..648656d 100644 --- a/hw/a15mpcore.c +++ b/hw/a15mpcore.c @@ -18,7 +18,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/kvm.h" /* A15MP private memory region. */ diff --git a/hw/a9mpcore.c b/hw/a9mpcore.c index 01aee02..0a1a10f 100644 --- a/hw/a9mpcore.c +++ b/hw/a9mpcore.c @@ -8,7 +8,7 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" +#include "hw/sysbus.h" typedef struct A9MPPrivState { SysBusDevice busdev; @@ -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 { diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index d2f9808..29f84ff 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -23,16 +23,16 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pc.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pci/pci.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "acpi.h" +#include "hw/acpi.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" -#include "ich9.h" +#include "hw/ich9.h" //#define DEBUG diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h index ecb82ab..91c3aeb 100644 --- a/hw/acpi_ich9.h +++ b/hw/acpi_ich9.h @@ -21,7 +21,7 @@ #ifndef HW_ACPI_ICH9_H #define HW_ACPI_ICH9_H -#include "acpi.h" +#include "hw/acpi.h" typedef struct ICH9LPCPMRegs { /* diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 65b2601..7a4b712 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -18,16 +18,16 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pc.h" -#include "apm.h" -#include "pm_smbus.h" -#include "pci/pci.h" -#include "acpi.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/apm.h" +#include "hw/pm_smbus.h" +#include "hw/pci/pci.h" +#include "hw/acpi.h" #include "sysemu/sysemu.h" #include "qemu/range.h" #include "exec/ioport.h" -#include "fw_cfg.h" +#include "hw/fw_cfg.h" #include "exec/address-spaces.h" //#define DEBUG @@ -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 diff --git a/hw/ads7846.c b/hw/ads7846.c index 29e5585..5da3dc5 100644 --- a/hw/ads7846.c +++ b/hw/ads7846.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "ssi.h" +#include "hw/ssi.h" #include "ui/console.h" typedef struct { diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index af1c07f..db868d2 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1,4 +1,6 @@ obj-y = mc146818rtc.o -obj-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o +obj-y += alpha_typhoon.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += dp264.o pci.o diff --git a/hw/alpha_dp264.c b/hw/alpha/dp264.c index 1cd549c..13aaa57 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha/dp264.c @@ -6,16 +6,16 @@ * that we need to emulate as well. */ -#include "hw.h" +#include "hw/hw.h" #include "elf.h" -#include "loader.h" -#include "boards.h" -#include "alpha_sys.h" +#include "hw/loader.h" +#include "hw/boards.h" +#include "hw/alpha_sys.h" #include "sysemu/sysemu.h" -#include "mc146818rtc.h" -#include "ide.h" -#include "i8254.h" -#include "serial.h" +#include "hw/mc146818rtc.h" +#include "hw/ide.h" +#include "hw/i8254.h" +#include "hw/serial.h" #define MAX_IDE_BUS 2 diff --git a/hw/alpha_pci.c b/hw/alpha/pci.c index 7327d48..8462868 100644 --- a/hw/alpha_pci.c +++ b/hw/alpha/pci.c @@ -7,7 +7,7 @@ */ #include "config.h" -#include "alpha_sys.h" +#include "hw/alpha_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h" diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h index 233a71e..b4ebd2a 100644 --- a/hw/alpha_sys.h +++ b/hw/alpha_sys.h @@ -3,11 +3,11 @@ #ifndef HW_ALPHA_H #define HW_ALPHA_H 1 -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "ide.h" -#include "pc.h" -#include "irq.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/ide.h" +#include "hw/pc.h" +#include "hw/irq.h" PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, AlphaCPU *[4], diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index bf9aabf..95571ff 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -8,10 +8,10 @@ #include "cpu.h" #include "exec/exec-all.h" -#include "hw.h" -#include "devices.h" +#include "hw/hw.h" +#include "hw/devices.h" #include "sysemu/sysemu.h" -#include "alpha_sys.h" +#include "hw/alpha_sys.h" #include "exec/address-spaces.h" diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 7eb0c2b..7992d6f 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -26,12 +26,12 @@ Ultrasparc PCI host is called the PCI Bus Module (PBM). The APB is the secondary PCI bridge. */ -#include "sysbus.h" -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "pci/pci_bridge.h" -#include "pci/pci_bus.h" -#include "apb_pci.h" +#include "hw/sysbus.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_bus.h" +#include "hw/apb_pci.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" @@ -17,14 +17,14 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ #include "qemu/thread.h" -#include "apic_internal.h" -#include "apic.h" -#include "ioapic.h" -#include "pci/msi.h" +#include "hw/apic_internal.h" +#include "hw/apic.h" +#include "hw/ioapic.h" +#include "hw/pci/msi.h" #include "qemu/host-utils.h" #include "trace.h" -#include "pc.h" -#include "apic-msidef.h" +#include "hw/pc.h" +#include "hw/apic-msidef.h" #define MAX_APIC_WORDS 8 diff --git a/hw/apic_common.c b/hw/apic_common.c index d8c9810..d0c2616 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -17,8 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#include "apic.h" -#include "apic_internal.h" +#include "hw/apic.h" +#include "hw/apic_internal.h" #include "trace.h" #include "sysemu/kvm.h" diff --git a/hw/apic_internal.h b/hw/apic_internal.h index 9265e52..578241f 100644 --- a/hw/apic_internal.h +++ b/hw/apic_internal.h @@ -21,7 +21,7 @@ #define QEMU_APIC_INTERNAL_H #include "exec/memory.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" /* APIC Local Vector Table */ @@ -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); diff --git a/hw/applesmc.c b/hw/applesmc.c index 5a8c4ff..44b9bac 100644 --- a/hw/applesmc.c +++ b/hw/applesmc.c @@ -30,8 +30,8 @@ * */ -#include "hw.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/isa.h" #include "ui/console.h" #include "qemu/timer.h" diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 0e7df60..2d9c69d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,37 +1,37 @@ -obj-y = integratorcp.o versatilepb.o arm_pic.o -obj-y += arm_boot.o -obj-y += xilinx_zynq.o zynq_slcr.o +obj-y += zynq_slcr.o obj-y += xilinx_spips.o obj-y += arm_gic.o arm_gic_common.o obj-y += a9scu.o -obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o -obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o -obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o +obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o +obj-y += exynos4210_gic.o exynos4210_combiner.o +obj-y += exynos4210_uart.o exynos4210_pwm.o obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o obj-y += exynos4210_rtc.o exynos4210_i2c.o obj-y += arm_mptimer.o a15mpcore.o -obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o -obj-y += highbank.o -obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o +obj-y += armv7m_nvic.o stellaris_enet.o +obj-y += pxa2xx_timer.o pxa2xx_dma.o obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o -obj-y += gumstix.o -obj-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o -obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ +obj-y += zaurus.o ide/microdrive.o tc6393xb.o +obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ omap_gpio.o omap_intc.o omap_uart.o -obj-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ +obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o -obj-y += omap_sx1.o palm.o tsc210x.o -obj-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o -obj-y += mst_fpga.o mainstone.o -obj-y += z2.o -obj-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o +obj-y += tsc210x.o +obj-y += blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o +obj-y += mst_fpga.o +obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o -obj-y += vexpress.o obj-y += strongarm.o -obj-y += collie.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o -obj-y += kzm.o obj-$(CONFIG_FDT) += ../device_tree.o obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o +obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o +obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o +obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o + +obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o +obj-y += omap1.o omap2.o diff --git a/hw/armv7m.c b/hw/arm/armv7m.c index 904696c..1d5bb59 100644 --- a/hw/armv7m.c +++ b/hw/arm/armv7m.c @@ -7,9 +7,9 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" -#include "arm-misc.h" -#include "loader.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/loader.h" #include "elf.h" /* Bitbanded IO. Each word corresponds to a single bit. */ diff --git a/hw/arm_boot.c b/hw/arm/boot.c index 4065424..43253fd 100644 --- a/hw/arm_boot.c +++ b/hw/arm/boot.c @@ -8,11 +8,11 @@ */ #include "config.h" -#include "hw.h" -#include "arm-misc.h" +#include "hw/hw.h" +#include "hw/arm-misc.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "sysemu/device_tree.h" #include "qemu/config-file.h" diff --git a/hw/collie.c b/hw/arm/collie.c index d19db59..17fddc8 100644 --- a/hw/collie.c +++ b/hw/arm/collie.c @@ -8,13 +8,13 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "sysbus.h" -#include "boards.h" -#include "devices.h" -#include "strongarm.h" -#include "arm-misc.h" -#include "flash.h" +#include "hw/hw.h" +#include "hw/sysbus.h" +#include "hw/boards.h" +#include "hw/devices.h" +#include "hw/strongarm.h" +#include "hw/arm-misc.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/exynos4210.c b/hw/arm/exynos4210.c index fa54e42..4592514 100644 --- a/hw/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -21,13 +21,13 @@ * */ -#include "boards.h" +#include "hw/boards.h" #include "sysemu/sysemu.h" -#include "sysbus.h" -#include "arm-misc.h" -#include "loader.h" -#include "exynos4210.h" -#include "usb/hcd-ehci.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/loader.h" +#include "hw/exynos4210.h" +#include "hw/usb/hcd-ehci.h" #define EXYNOS4210_CHIPID_ADDR 0x10000000 diff --git a/hw/exynos4_boards.c b/hw/arm/exynos4_boards.c index b59e6aa..473da34 100644 --- a/hw/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -22,12 +22,12 @@ */ #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" -#include "arm-misc.h" +#include "hw/arm-misc.h" #include "exec/address-spaces.h" -#include "exynos4210.h" -#include "boards.h" +#include "hw/exynos4210.h" +#include "hw/boards.h" #undef DEBUG diff --git a/hw/gumstix.c b/hw/arm/gumstix.c index bea1605..8859b73 100644 --- a/hw/gumstix.c +++ b/hw/arm/gumstix.c @@ -34,12 +34,12 @@ * # qemu-system-arm -M verdex -pflash flash -monitor null -nographic -m 289 */ -#include "hw.h" -#include "pxa.h" +#include "hw/hw.h" +#include "hw/pxa.h" #include "net/net.h" -#include "flash.h" -#include "devices.h" -#include "boards.h" +#include "hw/flash.h" +#include "hw/devices.h" +#include "hw/boards.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/highbank.c b/hw/arm/highbank.c index defcc09..a622224 100644 --- a/hw/highbank.c +++ b/hw/arm/highbank.c @@ -17,14 +17,14 @@ * */ -#include "sysbus.h" -#include "arm-misc.h" -#include "devices.h" -#include "loader.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" +#include "hw/loader.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "sysbus.h" +#include "hw/boards.h" +#include "hw/sysbus.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/integratorcp.c b/hw/arm/integratorcp.c index 9e3630a..e0ba327 100644 --- a/hw/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -7,10 +7,10 @@ * This code is licensed under the GPL */ -#include "sysbus.h" -#include "devices.h" -#include "boards.h" -#include "arm-misc.h" +#include "hw/sysbus.h" +#include "hw/devices.h" +#include "hw/boards.h" +#include "hw/arm-misc.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" @@ -13,16 +13,16 @@ * i.MX31 SoC */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" -#include "hw.h" -#include "arm-misc.h" -#include "devices.h" +#include "hw/hw.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "serial.h" -#include "imx.h" +#include "hw/boards.h" +#include "hw/serial.h" +#include "hw/imx.h" /* Memory map for Kzm Emulation Baseboard: * 0x00000000-0x00003fff 16k secure ROM IGNORED diff --git a/hw/mainstone.c b/hw/arm/mainstone.c index d1ff6e7..aea908f 100644 --- a/hw/mainstone.c +++ b/hw/arm/mainstone.c @@ -11,15 +11,15 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pxa.h" -#include "arm-misc.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/arm-misc.h" #include "net/net.h" -#include "devices.h" -#include "boards.h" -#include "flash.h" +#include "hw/devices.h" +#include "hw/boards.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" /* Device addresses */ diff --git a/hw/musicpal.c b/hw/arm/musicpal.c index 272cb80..a37dbd7 100644 --- a/hw/musicpal.c +++ b/hw/arm/musicpal.c @@ -9,19 +9,19 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "sysbus.h" -#include "arm-misc.h" -#include "devices.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "serial.h" +#include "hw/boards.h" +#include "hw/serial.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "block/block.h" -#include "flash.h" +#include "hw/flash.h" #include "ui/console.h" -#include "i2c.h" +#include "hw/i2c.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "ui/pixel_ops.h" diff --git a/hw/nseries.c b/hw/arm/nseries.c index 99d353a..c5bf9f9 100644 --- a/hw/nseries.c +++ b/hw/arm/nseries.c @@ -20,19 +20,19 @@ #include "qemu-common.h" #include "sysemu/sysemu.h" -#include "omap.h" -#include "arm-misc.h" -#include "irq.h" +#include "hw/omap.h" +#include "hw/arm-misc.h" +#include "hw/irq.h" #include "ui/console.h" -#include "boards.h" -#include "i2c.h" -#include "devices.h" -#include "flash.h" -#include "hw.h" -#include "bt.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/i2c.h" +#include "hw/devices.h" +#include "hw/flash.h" +#include "hw/hw.h" +#include "hw/bt.h" +#include "hw/loader.h" #include "sysemu/blockdev.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" /* Nokia N8x0 support */ diff --git a/hw/omap1.c b/hw/arm/omap1.c index 623b101..6f0a8ca 100644 --- a/hw/omap1.c +++ b/hw/arm/omap1.c @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "arm-misc.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/arm-misc.h" +#include "hw/omap.h" #include "sysemu/sysemu.h" -#include "soc_dma.h" +#include "hw/soc_dma.h" #include "sysemu/blockdev.h" #include "qemu/range.h" -#include "sysbus.h" +#include "hw/sysbus.h" /* Should signal the TCMI/GPMC */ uint32_t omap_badwidth_read8(void *opaque, hwaddr addr) diff --git a/hw/omap2.c b/hw/arm/omap2.c index 038a82a..0a2cd7b 100644 --- a/hw/omap2.c +++ b/hw/arm/omap2.c @@ -19,15 +19,15 @@ */ #include "sysemu/blockdev.h" -#include "hw.h" -#include "arm-misc.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/arm-misc.h" +#include "hw/omap.h" #include "sysemu/sysemu.h" #include "qemu/timer.h" #include "char/char.h" -#include "flash.h" -#include "soc_dma.h" -#include "sysbus.h" +#include "hw/flash.h" +#include "hw/soc_dma.h" +#include "hw/sysbus.h" #include "audio/audio.h" /* Enhanced Audio Controller (CODEC only) */ diff --git a/hw/omap_sx1.c b/hw/arm/omap_sx1.c index 30998c5..8598233 100644 --- a/hw/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -25,12 +25,12 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "omap.h" -#include "boards.h" -#include "arm-misc.h" -#include "flash.h" +#include "hw/omap.h" +#include "hw/boards.h" +#include "hw/arm-misc.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/palm.c b/hw/arm/palm.c index a633dfc..91bc74a 100644 --- a/hw/palm.c +++ b/hw/arm/palm.c @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "audio/audio.h" #include "sysemu/sysemu.h" #include "ui/console.h" -#include "omap.h" -#include "boards.h" -#include "arm-misc.h" -#include "devices.h" -#include "loader.h" +#include "hw/omap.h" +#include "hw/boards.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" +#include "hw/loader.h" #include "exec/address-spaces.h" static uint32_t static_readb(void *opaque, hwaddr offset) diff --git a/hw/arm_pic.c b/hw/arm/pic_cpu.c index 394bc93..8223600 100644 --- a/hw/arm_pic.c +++ b/hw/arm/pic_cpu.c @@ -7,8 +7,8 @@ * This code is licensed under the LGPL */ -#include "hw.h" -#include "arm-misc.h" +#include "hw/hw.h" +#include "hw/arm-misc.h" #include "sysemu/kvm.h" /* Input 0 is IRQ and input 1 is FIQ. */ diff --git a/hw/pxa2xx.c b/hw/arm/pxa2xx.c index d303320..c0f50c9 100644 --- a/hw/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -7,12 +7,12 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" -#include "pxa.h" +#include "hw/sysbus.h" +#include "hw/pxa.h" #include "sysemu/sysemu.h" -#include "serial.h" -#include "i2c.h" -#include "ssi.h" +#include "hw/serial.h" +#include "hw/i2c.h" +#include "hw/ssi.h" #include "char/char.h" #include "sysemu/blockdev.h" diff --git a/hw/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index 05d2ad2..eef8411 100644 --- a/hw/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -7,9 +7,9 @@ * This code is licensed under the GPL. */ -#include "hw.h" -#include "sysbus.h" -#include "pxa.h" +#include "hw/hw.h" +#include "hw/sysbus.h" +#include "hw/pxa.h" #define PXA2XX_GPIO_BANKS 4 diff --git a/hw/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 90b8fef..145fc78 100644 --- a/hw/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -8,9 +8,9 @@ * This code is licensed under the GPL. */ -#include "hw.h" -#include "pxa.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/sysbus.h" #define ICIP 0x00 /* Interrupt Controller IRQ Pending register */ #define ICMR 0x04 /* Interrupt Controller Mask register */ diff --git a/hw/realview.c b/hw/arm/realview.c index 78da767..5fb490c 100644 --- a/hw/realview.c +++ b/hw/arm/realview.c @@ -7,15 +7,15 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" -#include "arm-misc.h" -#include "primecell.h" -#include "devices.h" -#include "pci/pci.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/primecell.h" +#include "hw/devices.h" +#include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "i2c.h" +#include "hw/boards.h" +#include "hw/i2c.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/spitz.c b/hw/arm/spitz.c index 5bc49fc..f5832be 100644 --- a/hw/spitz.c +++ b/hw/arm/spitz.c @@ -10,23 +10,23 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pxa.h" -#include "arm-misc.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/arm-misc.h" #include "sysemu/sysemu.h" -#include "pcmcia.h" -#include "i2c.h" -#include "ssi.h" -#include "flash.h" +#include "hw/pcmcia.h" +#include "hw/i2c.h" +#include "hw/ssi.h" +#include "hw/flash.h" #include "qemu/timer.h" -#include "devices.h" -#include "sharpsl.h" +#include "hw/devices.h" +#include "hw/sharpsl.h" #include "ui/console.h" #include "block/block.h" #include "audio/audio.h" -#include "boards.h" +#include "hw/boards.h" #include "sysemu/blockdev.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" #undef REG_FMT diff --git a/hw/stellaris.c b/hw/arm/stellaris.c index 9b8f203..f4ce794 100644 --- a/hw/stellaris.c +++ b/hw/arm/stellaris.c @@ -7,14 +7,14 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" -#include "ssi.h" -#include "arm-misc.h" -#include "devices.h" +#include "hw/sysbus.h" +#include "hw/ssi.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" #include "qemu/timer.h" -#include "i2c.h" +#include "hw/i2c.h" #include "net/net.h" -#include "boards.h" +#include "hw/boards.h" #include "exec/address-spaces.h" #define GPIO_A 0 diff --git a/hw/tosa.c b/hw/arm/tosa.c index efea109..747888c 100644 --- a/hw/tosa.c +++ b/hw/arm/tosa.c @@ -11,18 +11,18 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pxa.h" -#include "arm-misc.h" -#include "devices.h" -#include "sharpsl.h" -#include "pcmcia.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" +#include "hw/sharpsl.h" +#include "hw/pcmcia.h" #include "block/block.h" -#include "boards.h" -#include "i2c.h" -#include "ssi.h" +#include "hw/boards.h" +#include "hw/i2c.h" +#include "hw/ssi.h" #include "sysemu/blockdev.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" #define TOSA_RAM 0x04000000 diff --git a/hw/versatilepb.c b/hw/arm/versatilepb.c index e0a28f0..baaa265 100644 --- a/hw/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -7,17 +7,17 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" -#include "arm-misc.h" -#include "devices.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "pci/pci.h" -#include "i2c.h" -#include "boards.h" +#include "hw/pci/pci.h" +#include "hw/i2c.h" +#include "hw/boards.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" -#include "flash.h" +#include "hw/flash.h" #define VERSATILE_FLASH_ADDR 0x34000000 #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024) diff --git a/hw/vexpress.c b/hw/arm/vexpress.c index 741b044..02922c3 100644 --- a/hw/vexpress.c +++ b/hw/arm/vexpress.c @@ -21,16 +21,16 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "sysbus.h" -#include "arm-misc.h" -#include "primecell.h" -#include "devices.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" +#include "hw/primecell.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" +#include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/blockdev.h" -#include "flash.h" +#include "hw/flash.h" #define VEXPRESS_BOARD_ID 0x8e0 #define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024) diff --git a/hw/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 2f67d90..f78c47e 100644 --- a/hw/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -15,16 +15,16 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" -#include "arm-misc.h" +#include "hw/sysbus.h" +#include "hw/arm-misc.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "flash.h" +#include "hw/boards.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" -#include "loader.h" -#include "ssi.h" +#include "hw/loader.h" +#include "hw/ssi.h" #define NUM_SPI_FLASHES 4 #define NUM_QSPI_FLASHES 2 @@ -11,15 +11,15 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pxa.h" -#include "arm-misc.h" -#include "devices.h" -#include "i2c.h" -#include "ssi.h" -#include "boards.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/arm-misc.h" +#include "hw/devices.h" +#include "hw/i2c.h" +#include "hw/ssi.h" +#include "hw/boards.h" #include "sysemu/sysemu.h" -#include "flash.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" #include "ui/console.h" #include "audio/audio.h" diff --git a/hw/arm11mpcore.c b/hw/arm11mpcore.c index ca49948..90dcead 100644 --- a/hw/arm11mpcore.c +++ b/hw/arm11mpcore.c @@ -7,7 +7,7 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" /* MPCore private memory region. */ diff --git a/hw/arm_gic.c b/hw/arm_gic.c index 250e720..bcb072b 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -18,8 +18,8 @@ * armv7m_nvic device. */ -#include "sysbus.h" -#include "arm_gic_internal.h" +#include "hw/sysbus.h" +#include "hw/arm_gic_internal.h" //#define DEBUG_GIC diff --git a/hw/arm_gic_common.c b/hw/arm_gic_common.c index 20da9d2..f2dc8bf 100644 --- a/hw/arm_gic_common.c +++ b/hw/arm_gic_common.c @@ -18,7 +18,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "arm_gic_internal.h" +#include "hw/arm_gic_internal.h" static void gic_save(QEMUFile *f, void *opaque) { diff --git a/hw/arm_gic_internal.h b/hw/arm_gic_internal.h index 3ba37f3..3e1928b 100644 --- a/hw/arm_gic_internal.h +++ b/hw/arm_gic_internal.h @@ -21,7 +21,7 @@ #ifndef QEMU_ARM_GIC_INTERNAL_H #define QEMU_ARM_GIC_INTERNAL_H -#include "sysbus.h" +#include "hw/sysbus.h" /* Maximum number of possible interrupts, determined by the GIC architecture */ #define GIC_MAXIRQ 1020 diff --git a/hw/arm_l2x0.c b/hw/arm_l2x0.c index ae1e51d..eb4427d 100644 --- a/hw/arm_l2x0.c +++ b/hw/arm_l2x0.c @@ -18,7 +18,7 @@ * */ -#include "sysbus.h" +#include "hw/sysbus.h" /* L2C-310 r3p2 */ #define CACHE_ID 0x410000c8 diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c index 7b08aa3..f59a9f1 100644 --- a/hw/arm_mptimer.c +++ b/hw/arm_mptimer.c @@ -19,7 +19,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" /* This device implements the per-cpu private timer and watchdog block diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index 7ecb7da..a46f8d4 100644 --- a/hw/arm_sysctl.c +++ b/hw/arm_sysctl.c @@ -7,10 +7,10 @@ * This code is licensed under the GPL. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "sysbus.h" -#include "primecell.h" +#include "hw/sysbus.h" +#include "hw/primecell.h" #include "sysemu/sysemu.h" #define LOCK_VALUE 0xa05f diff --git a/hw/arm_timer.c b/hw/arm_timer.c index c1e56be..6449870 100644 --- a/hw/arm_timer.c +++ b/hw/arm_timer.c @@ -7,11 +7,11 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu-common.h" -#include "qdev.h" -#include "ptimer.h" +#include "hw/qdev.h" +#include "hw/ptimer.h" /* Common timer implementation. */ diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index 3c79674..d198cfd 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -10,11 +10,11 @@ * NVIC. Much of that is also implemented here. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" -#include "arm-misc.h" +#include "hw/arm-misc.h" #include "exec/address-spaces.h" -#include "arm_gic_internal.h" +#include "hw/arm_gic_internal.h" typedef struct { GICState gic; diff --git a/hw/bitbang_i2c.c b/hw/bitbang_i2c.c index 114508f..b8e6d3a 100644 --- a/hw/bitbang_i2c.c +++ b/hw/bitbang_i2c.c @@ -9,9 +9,9 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "bitbang_i2c.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/bitbang_i2c.h" +#include "hw/sysbus.h" //#define DEBUG_BITBANG_I2C diff --git a/hw/bitbang_i2c.h b/hw/bitbang_i2c.h index 519d2dc..e860627 100644 --- a/hw/bitbang_i2c.h +++ b/hw/bitbang_i2c.h @@ -1,7 +1,7 @@ #ifndef BITBANG_I2C_H #define BITBANG_I2C_H -#include "i2c.h" +#include "hw/i2c.h" typedef struct bitbang_i2c_interface bitbang_i2c_interface; diff --git a/hw/blizzard.c b/hw/blizzard.c index 24bde32..805f4d5 100644 --- a/hw/blizzard.c +++ b/hw/blizzard.c @@ -20,8 +20,8 @@ #include "qemu-common.h" #include "ui/console.h" -#include "devices.h" -#include "vga_int.h" +#include "hw/devices.h" +#include "hw/vga_int.h" #include "ui/pixel_ops.h" typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); @@ -941,15 +941,15 @@ static void blizzard_screen_dump(void *opaque, const char *filename, } #define DEPTH 8 -#include "blizzard_template.h" +#include "hw/blizzard_template.h" #define DEPTH 15 -#include "blizzard_template.h" +#include "hw/blizzard_template.h" #define DEPTH 16 -#include "blizzard_template.h" +#include "hw/blizzard_template.h" #define DEPTH 24 -#include "blizzard_template.h" +#include "hw/blizzard_template.h" #define DEPTH 32 -#include "blizzard_template.h" +#include "hw/blizzard_template.h" void *s1d13745_init(qemu_irq gpio_int) { diff --git a/hw/boards.h b/hw/boards.h index 3813d4e..425bdc7 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -4,7 +4,7 @@ #define HW_BOARDS_H #include "sysemu/blockdev.h" -#include "qdev.h" +#include "hw/qdev.h" #define DEFAULT_MACHINE_OPTIONS \ .boot_order = "cad" diff --git a/hw/bonito.c b/hw/bonito.c index 0498c9b..3456e78 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -39,11 +39,11 @@ #include <assert.h> -#include "hw.h" -#include "pci/pci.h" -#include "pc.h" -#include "mips.h" -#include "pci/pci_host.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/pc.h" +#include "hw/mips.h" +#include "hw/pci/pci_host.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c index 2070bb9..e4ada3c 100644 --- a/hw/bt-hci-csr.c +++ b/hw/bt-hci-csr.c @@ -21,9 +21,9 @@ #include "qemu-common.h" #include "char/char.h" #include "qemu/timer.h" -#include "irq.h" +#include "hw/irq.h" #include "bt/bt.h" -#include "bt.h" +#include "hw/bt.h" struct csrhci_s { int enable; diff --git a/hw/bt-hci.c b/hw/bt-hci.c index 69d2c73..a76edea 100644 --- a/hw/bt-hci.c +++ b/hw/bt-hci.c @@ -20,9 +20,9 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "usb.h" +#include "hw/usb.h" #include "bt/bt.h" -#include "bt.h" +#include "hw/bt.h" struct bt_hci_s { uint8_t *(*evt_packet)(void *opaque); diff --git a/hw/bt-hid.c b/hw/bt-hid.c index cfa7c14..69ccf9b 100644 --- a/hw/bt-hid.c +++ b/hw/bt-hid.c @@ -21,8 +21,8 @@ #include "qemu-common.h" #include "qemu/timer.h" #include "ui/console.h" -#include "hid.h" -#include "bt.h" +#include "hw/hid.h" +#include "hw/bt.h" enum hid_transaction_req { BT_HANDSHAKE = 0x0, diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c index ba061c0..521587a 100644 --- a/hw/bt-l2cap.c +++ b/hw/bt-l2cap.c @@ -19,7 +19,7 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "bt.h" +#include "hw/bt.h" #define L2CAP_CID_MAX 0x100 /* Between 0x40 and 0x10000 */ diff --git a/hw/bt-sdp.c b/hw/bt-sdp.c index c0431d1..218e075 100644 --- a/hw/bt-sdp.c +++ b/hw/bt-sdp.c @@ -18,7 +18,7 @@ */ #include "qemu-common.h" -#include "bt.h" +#include "hw/bt.h" struct bt_l2cap_sdp_state_s { struct bt_l2cap_conn_params_s *channel; @@ -19,7 +19,7 @@ #include "qemu-common.h" #include "bt/bt.h" -#include "bt.h" +#include "hw/bt.h" /* Slave implementations can ignore this */ static void bt_dummy_lmp_mode_change(struct bt_link_s *link) diff --git a/hw/cadence_gem.c b/hw/cadence_gem.c index de7d15a..e177057 100644 --- a/hw/cadence_gem.c +++ b/hw/cadence_gem.c @@ -24,7 +24,7 @@ #include <zlib.h> /* For crc32 */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" #include "net/checksum.h" diff --git a/hw/cadence_ttc.c b/hw/cadence_ttc.c index 67028a3..ba584f4 100644 --- a/hw/cadence_ttc.c +++ b/hw/cadence_ttc.c @@ -16,7 +16,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" #ifdef CADENCE_TTC_ERR_DEBUG diff --git a/hw/cadence_uart.c b/hw/cadence_uart.c index 5766d38..5426f10 100644 --- a/hw/cadence_uart.c +++ b/hw/cadence_uart.c @@ -16,7 +16,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "char/char.h" #include "qemu/timer.h" @@ -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) { diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 2a2c8da..7babcb6 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -26,11 +26,11 @@ * Reference: Finn Thogersons' VGADOC4b * available at http://home.worldonline.dk/~finth/ */ -#include "hw.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" #include "ui/console.h" -#include "vga_int.h" -#include "loader.h" +#include "hw/vga_int.h" +#include "hw/loader.h" /* * TODO: @@ -288,63 +288,63 @@ static void cirrus_bitblt_fill_nop(CirrusVGAState *s, #define ROP_NAME 0 #define ROP_FN(d, s) 0 -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src_and_dst #define ROP_FN(d, s) (s) & (d) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src_and_notdst #define ROP_FN(d, s) (s) & (~(d)) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME notdst #define ROP_FN(d, s) ~(d) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src #define ROP_FN(d, s) s -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME 1 #define ROP_FN(d, s) ~0 -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME notsrc_and_dst #define ROP_FN(d, s) (~(s)) & (d) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src_xor_dst #define ROP_FN(d, s) (s) ^ (d) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src_or_dst #define ROP_FN(d, s) (s) | (d) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME notsrc_or_notdst #define ROP_FN(d, s) (~(s)) | (~(d)) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src_notxor_dst #define ROP_FN(d, s) ~((s) ^ (d)) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME src_or_notdst #define ROP_FN(d, s) (s) | (~(d)) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME notsrc #define ROP_FN(d, s) (~(s)) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME notsrc_or_dst #define ROP_FN(d, s) (~(s)) | (d) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" #define ROP_NAME notsrc_and_notdst #define ROP_FN(d, s) (~(s)) & (~(d)) -#include "cirrus_vga_rop.h" +#include "hw/cirrus_vga_rop.h" static const cirrus_bitblt_rop_t cirrus_fwd_rop[16] = { cirrus_bitblt_rop_fwd_0, @@ -2165,13 +2165,13 @@ static void cirrus_cursor_invalidate(VGACommonState *s1) } #define DEPTH 8 -#include "cirrus_vga_template.h" +#include "hw/cirrus_vga_template.h" #define DEPTH 16 -#include "cirrus_vga_template.h" +#include "hw/cirrus_vga_template.h" #define DEPTH 32 -#include "cirrus_vga_template.h" +#include "hw/cirrus_vga_template.h" static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) { diff --git a/hw/cirrus_vga_rop.h b/hw/cirrus_vga_rop.h index 9c7bb09..894610c 100644 --- a/hw/cirrus_vga_rop.h +++ b/hw/cirrus_vga_rop.h @@ -191,16 +191,16 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_16)(CirrusVGAState *s, } #define DEPTH 8 -#include "cirrus_vga_rop2.h" +#include "hw/cirrus_vga_rop2.h" #define DEPTH 16 -#include "cirrus_vga_rop2.h" +#include "hw/cirrus_vga_rop2.h" #define DEPTH 24 -#include "cirrus_vga_rop2.h" +#include "hw/cirrus_vga_rop2.h" #define DEPTH 32 -#include "cirrus_vga_rop2.h" +#include "hw/cirrus_vga_rop2.h" #undef ROP_NAME #undef ROP_OP diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index aa9298a..a94c624 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,8 +1,3 @@ -# Boards -obj-y = cris_pic_cpu.o -obj-y += cris-boot.o -obj-y += axis_dev88.o - # IO blocks obj-y += etraxfs_dma.o obj-y += etraxfs_pic.o @@ -11,3 +6,8 @@ obj-y += etraxfs_timer.o obj-y += etraxfs_ser.o obj-y := $(addprefix ../,$(obj-y)) + +# Boards +obj-y += pic_cpu.o +obj-y += boot.o +obj-y += axis_dev88.o diff --git a/hw/axis_dev88.c b/hw/cris/axis_dev88.c index dd37fa1..eccd423 100644 --- a/hw/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -22,14 +22,14 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" -#include "flash.h" -#include "boards.h" -#include "etraxfs.h" -#include "loader.h" +#include "hw/flash.h" +#include "hw/boards.h" +#include "hw/etraxfs.h" +#include "hw/loader.h" #include "elf.h" -#include "cris-boot.h" +#include "hw/cris-boot.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/cris-boot.c b/hw/cris/boot.c index b21326f..c330e22 100644 --- a/hw/cris-boot.c +++ b/hw/cris/boot.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "loader.h" +#include "hw/hw.h" +#include "hw/loader.h" #include "elf.h" -#include "cris-boot.h" +#include "hw/cris-boot.h" static void main_cpu_reset(void *opaque) { diff --git a/hw/cris_pic_cpu.c b/hw/cris/pic_cpu.c index 3da0e86..7f50471 100644 --- a/hw/cris_pic_cpu.c +++ b/hw/cris/pic_cpu.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" -#include "etraxfs.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/etraxfs.h" #define D(x) diff --git a/hw/cs4231.c b/hw/cs4231.c index ae384b9..2975336 100644 --- a/hw/cs4231.c +++ b/hw/cs4231.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" /* diff --git a/hw/cs4231a.c b/hw/cs4231a.c index 73f0859..f005f25 100644 --- a/hw/cs4231a.c +++ b/hw/cs4231a.c @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "audiodev.h" +#include "hw/hw.h" +#include "hw/audiodev.h" #include "audio/audio.h" -#include "isa.h" -#include "qdev.h" +#include "hw/isa.h" +#include "hw/qdev.h" #include "qemu/timer.h" /* @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc/mac.h" -#include "adb.h" +#include "hw/hw.h" +#include "hw/ppc/mac.h" +#include "hw/adb.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/dataplane/ioq.c b/hw/dataplane/ioq.c index 0c9f5c4..f709f87 100644 --- a/hw/dataplane/ioq.c +++ b/hw/dataplane/ioq.c @@ -12,7 +12,7 @@ * */ -#include "hw/dataplane/ioq.h" +#include "ioq.h" void ioq_init(IOQueue *ioq, int fd, unsigned int max_reqs) { diff --git a/hw/dataplane/virtio-blk.c b/hw/dataplane/virtio-blk.c index aa9b040..dfe5f9b 100644 --- a/hw/dataplane/virtio-blk.c +++ b/hw/dataplane/virtio-blk.c @@ -15,9 +15,11 @@ #include "trace.h" #include "qemu/iov.h" #include "qemu/thread.h" +#include "qemu/error-report.h" #include "vring.h" #include "ioq.h" #include "migration/migration.h" +#include "block/block.h" #include "hw/virtio-blk.h" #include "hw/dataplane/virtio-blk.h" #include "block/aio.h" diff --git a/hw/dataplane/vring.c b/hw/dataplane/vring.c index d5d4ef4..e3b2253 100644 --- a/hw/dataplane/vring.c +++ b/hw/dataplane/vring.c @@ -15,7 +15,8 @@ */ #include "trace.h" -#include "hw/dataplane/vring.h" +#include "vring.h" +#include "qemu/error-report.h" /* Map the guest's vring to host memory */ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n) diff --git a/hw/dataplane/vring.h b/hw/dataplane/vring.h index 3274f62..defb1ef 100644 --- a/hw/dataplane/vring.h +++ b/hw/dataplane/vring.h @@ -19,7 +19,7 @@ #include <linux/virtio_ring.h> #include "qemu-common.h" -#include "hw/dataplane/hostmem.h" +#include "hostmem.h" #include "hw/virtio.h" typedef struct { diff --git a/hw/debugcon.c b/hw/debugcon.c index 81b2bb0..cab7691 100644 --- a/hw/debugcon.c +++ b/hw/debugcon.c @@ -24,10 +24,10 @@ * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "char/char.h" -#include "isa.h" -#include "pc.h" +#include "hw/isa.h" +#include "hw/pc.h" #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" #define ISA_DEBUGCON_DEVICE(obj) \ diff --git a/hw/debugexit.c b/hw/debugexit.c index c1b489d..ba67a8f 100644 --- a/hw/debugexit.c +++ b/hw/debugexit.c @@ -7,8 +7,8 @@ * (at your option) any later version. */ -#include "hw.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/isa.h" #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit" #define ISA_DEBUG_EXIT_DEVICE(obj) \ diff --git a/hw/dec_pci.c b/hw/dec_pci.c index ee3f4ca..64a5092 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -23,12 +23,12 @@ * THE SOFTWARE. */ -#include "dec_pci.h" -#include "sysbus.h" -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "pci/pci_bridge.h" -#include "pci/pci_bus.h" +#include "hw/dec_pci.h" +#include "hw/sysbus.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_bus.h" /* debug DEC */ //#define DEBUG_DEC @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/isa.h" #include "qemu/main-loop.h" /* #define DEBUG_DMA */ diff --git a/hw/dp8393x.c b/hw/dp8393x.c index 808157b..8b5ca6a 100644 --- a/hw/dp8393x.c +++ b/hw/dp8393x.c @@ -17,10 +17,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "net/net.h" -#include "mips.h" +#include "hw/mips.h" //#define DEBUG_SONIC diff --git a/hw/ds1225y.c b/hw/ds1225y.c index a6219a7..488f1d7 100644 --- a/hw/ds1225y.c +++ b/hw/ds1225y.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" typedef struct { diff --git a/hw/ds1338.c b/hw/ds1338.c index 1da0f96..ae7ca9f 100644 --- a/hw/ds1338.c +++ b/hw/ds1338.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "i2c.h" +#include "hw/i2c.h" /* Size of NVRAM including both the user-accessible area and the * secondary register area. @@ -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. diff --git a/hw/eccmemctl.c b/hw/eccmemctl.c index dbac2c2..6f4a407 100644 --- a/hw/eccmemctl.c +++ b/hw/eccmemctl.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" /* There are 3 versions of this chip used in SMP sun4m systems: diff --git a/hw/eepro100.c b/hw/eepro100.c index 5d23796..68d729c 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -41,10 +41,10 @@ */ #include <stddef.h> /* offsetof */ -#include "hw.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" #include "net/net.h" -#include "eeprom93xx.h" +#include "hw/eeprom93xx.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c index 4c7158d..39f5605 100644 --- a/hw/eeprom93xx.c +++ b/hw/eeprom93xx.c @@ -35,8 +35,8 @@ * - No emulation of EEPROM timings. */ -#include "hw.h" -#include "eeprom93xx.h" +#include "hw/hw.h" +#include "hw/eeprom93xx.h" /* Debug EEPROM emulation. */ //~ #define DEBUG_EEPROM diff --git a/hw/empty_slot.c b/hw/empty_slot.c index d7b5497..5234a4d 100644 --- a/hw/empty_slot.c +++ b/hw/empty_slot.c @@ -9,9 +9,9 @@ * version. */ -#include "hw.h" -#include "sysbus.h" -#include "empty_slot.h" +#include "hw/hw.h" +#include "hw/sysbus.h" +#include "hw/empty_slot.h" //#define DEBUG_EMPTY_SLOT diff --git a/hw/es1370.c b/hw/es1370.c index 977d2e3..e64cf23 100644 --- a/hw/es1370.c +++ b/hw/es1370.c @@ -26,10 +26,10 @@ /* #define VERBOSE_ES1370 */ #define SILENT_ES1370 -#include "hw.h" -#include "audiodev.h" +#include "hw/hw.h" +#include "hw/audiodev.h" #include "audio/audio.h" -#include "pci/pci.h" +#include "hw/pci/pci.h" #include "sysemu/dma.h" /* Missing stuff: @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "sysbus.h" -#include "escc.h" +#include "hw/hw.h" +#include "hw/sysbus.h" +#include "hw/escc.h" #include "char/char.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/esp-pci.c b/hw/esp-pci.c index c949e6e..7599b39 100644 --- a/hw/esp-pci.c +++ b/hw/esp-pci.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ -#include "pci/pci.h" -#include "eeprom93xx.h" -#include "esp.h" +#include "hw/pci/pci.h" +#include "hw/eeprom93xx.h" +#include "hw/esp.h" #include "trace.h" #include "qemu/log.h" @@ -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 diff --git a/hw/etraxfs.h b/hw/etraxfs.h index 180de5a..0df4fdd 100644 --- a/hw/etraxfs.h +++ b/hw/etraxfs.h @@ -26,7 +26,7 @@ #define HW_EXTRAXFS_H 1 #include "net/net.h" -#include "etraxfs_dma.h" +#include "hw/etraxfs_dma.h" qemu_irq *cris_pic_init_cpu(CPUCRISState *env); diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c index d415003..a84ec1f 100644 --- a/hw/etraxfs_dma.c +++ b/hw/etraxfs_dma.c @@ -23,12 +23,12 @@ */ #include <stdio.h> #include <sys/time.h> -#include "hw.h" +#include "hw/hw.h" #include "exec/address-spaces.h" #include "qemu-common.h" #include "sysemu/sysemu.h" -#include "etraxfs_dma.h" +#include "hw/etraxfs_dma.h" #define D(x) diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index ad36411..591bee2 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -23,9 +23,9 @@ */ #include <stdio.h> -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" -#include "etraxfs.h" +#include "hw/etraxfs.h" #define D(x) diff --git a/hw/etraxfs_pic.c b/hw/etraxfs_pic.c index 64af31c..635103c 100644 --- a/hw/etraxfs_pic.c +++ b/hw/etraxfs_pic.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" +#include "hw/sysbus.h" +#include "hw/hw.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index 72c8868..7e24d34 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "char/char.h" #include "qemu/log.h" diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c index d3dac52..3cd9476 100644 --- a/hw/etraxfs_timer.c +++ b/hw/etraxfs_timer.c @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #define D(x) diff --git a/hw/exynos4210_combiner.c b/hw/exynos4210_combiner.c index ba644b4..5818f10 100644 --- a/hw/exynos4210_combiner.c +++ b/hw/exynos4210_combiner.c @@ -27,9 +27,9 @@ * IRQs are passed to GIC through Combiner. */ -#include "sysbus.h" +#include "hw/sysbus.h" -#include "exynos4210.h" +#include "hw/exynos4210.h" //#define DEBUG_COMBINER diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c index 3d498b7..6b31ae3 100644 --- a/hw/exynos4210_fimd.c +++ b/hw/exynos4210_fimd.c @@ -24,7 +24,7 @@ #include "qemu-common.h" #include "exec/cpu-all.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "qemu/bswap.h" diff --git a/hw/exynos4210_gic.c b/hw/exynos4210_gic.c index 94b138f..807849c 100644 --- a/hw/exynos4210_gic.c +++ b/hw/exynos4210_gic.c @@ -20,10 +20,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu-common.h" -#include "irq.h" -#include "exynos4210.h" +#include "hw/irq.h" +#include "hw/exynos4210.h" enum ExtGicId { EXT_GIC_ID_MDMA_LCD0 = 66, diff --git a/hw/exynos4210_i2c.c b/hw/exynos4210_i2c.c index cefd736..9e42875 100644 --- a/hw/exynos4210_i2c.c +++ b/hw/exynos4210_i2c.c @@ -21,8 +21,8 @@ */ #include "qemu/timer.h" -#include "sysbus.h" -#include "i2c.h" +#include "hw/sysbus.h" +#include "hw/i2c.h" #ifndef EXYNOS4_I2C_DEBUG #define EXYNOS4_I2C_DEBUG 0 diff --git a/hw/exynos4210_mct.c b/hw/exynos4210_mct.c index d7d5904..862c962 100644 --- a/hw/exynos4210_mct.c +++ b/hw/exynos4210_mct.c @@ -52,12 +52,12 @@ * there is no way to avoid frequently events). */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu-common.h" -#include "ptimer.h" +#include "hw/ptimer.h" -#include "exynos4210.h" +#include "hw/exynos4210.h" //#define DEBUG_MCT diff --git a/hw/exynos4210_pmu.c b/hw/exynos4210_pmu.c index 7c81a1b..ba5aa8d 100644 --- a/hw/exynos4210_pmu.c +++ b/hw/exynos4210_pmu.c @@ -24,7 +24,7 @@ * uses PMU INFORM5 register as a holding pen. */ -#include "sysbus.h" +#include "hw/sysbus.h" #ifndef DEBUG_PMU #define DEBUG_PMU 0 diff --git a/hw/exynos4210_pwm.c b/hw/exynos4210_pwm.c index c865624..6d74cd4 100644 --- a/hw/exynos4210_pwm.c +++ b/hw/exynos4210_pwm.c @@ -20,12 +20,12 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu-common.h" -#include "ptimer.h" +#include "hw/ptimer.h" -#include "exynos4210.h" +#include "hw/exynos4210.h" //#define DEBUG_PWM diff --git a/hw/exynos4210_rtc.c b/hw/exynos4210_rtc.c index 5694a62..d170ca7 100644 --- a/hw/exynos4210_rtc.c +++ b/hw/exynos4210_rtc.c @@ -25,16 +25,16 @@ * CLKOUTEN Bit[9] not used */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu-common.h" -#include "ptimer.h" +#include "hw/ptimer.h" -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "exynos4210.h" +#include "hw/exynos4210.h" #define DEBUG_RTC 0 diff --git a/hw/exynos4210_uart.c b/hw/exynos4210_uart.c index bdf797a..006f3d4 100644 --- a/hw/exynos4210_uart.c +++ b/hw/exynos4210_uart.c @@ -19,11 +19,11 @@ * */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "char/char.h" -#include "exynos4210.h" +#include "hw/exynos4210.h" #undef DEBUG_UART #undef DEBUG_UART_EXTEND @@ -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 diff --git a/hw/framebuffer.c b/hw/framebuffer.c index 2a87096..d341aa0 100644 --- a/hw/framebuffer.c +++ b/hw/framebuffer.c @@ -17,9 +17,9 @@ - Remove all DisplayState knowledge from devices. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "framebuffer.h" +#include "hw/framebuffer.h" /* Render an image from a shared memory framebuffer. */ diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 02618f2..63a1998 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/sysemu.h" -#include "isa.h" -#include "fw_cfg.h" -#include "sysbus.h" +#include "hw/isa.h" +#include "hw/fw_cfg.h" +#include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/config-file.h" diff --git a/hw/g364fb.c b/hw/g364fb.c index 0c0c8ba..7b69815 100644 --- a/hw/g364fb.c +++ b/hw/g364fb.c @@ -17,11 +17,11 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" -#include "sysbus.h" +#include "hw/sysbus.h" typedef struct G364State { /* hardware */ diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 95639d5..11e47d5 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ -#include "pci/pci_host.h" -#include "ppc/mac.h" -#include "pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/ppc/mac.h" +#include "hw/pci/pci.h" /* debug Grackle */ //#define DEBUG_GRACKLE @@ -25,8 +25,8 @@ #ifndef _GRLIB_H_ #define _GRLIB_H_ -#include "qdev.h" -#include "sysbus.h" +#include "hw/qdev.h" +#include "hw/sysbus.h" /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual: * http://www.gaisler.com/products/grlib/grip.pdf diff --git a/hw/grlib_apbuart.c b/hw/grlib_apbuart.c index ba1685a..62f7990 100644 --- a/hw/grlib_apbuart.c +++ b/hw/grlib_apbuart.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "char/char.h" #include "trace.h" diff --git a/hw/grlib_gptimer.c b/hw/grlib_gptimer.c index 7962b74..7043a34 100644 --- a/hw/grlib_gptimer.c +++ b/hw/grlib_gptimer.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "trace.h" diff --git a/hw/grlib_irqmp.c b/hw/grlib_irqmp.c index ef8dd95..7ee469d 100644 --- a/hw/grlib_irqmp.c +++ b/hw/grlib_irqmp.c @@ -24,10 +24,10 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "cpu.h" -#include "grlib.h" +#include "hw/grlib.h" #include "trace.h" diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 977a2c5..c73a58a 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -22,11 +22,11 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "pc.h" +#include "hw/hw.h" +#include "hw/mips.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/pc.h" #include "exec/address-spaces.h" //#define DEBUG @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "audiodev.h" +#include "hw/hw.h" +#include "hw/audiodev.h" #include "audio/audio.h" -#include "isa.h" -#include "gusemu.h" -#include "gustate.h" +#include "hw/isa.h" +#include "hw/gusemu.h" +#include "hw/gustate.h" #define dolog(...) AUD_log ("audio", __VA_ARGS__) #ifdef DEBUG diff --git a/hw/gusemu_hal.c b/hw/gusemu_hal.c index 6096690..0eee617 100644 --- a/hw/gusemu_hal.c +++ b/hw/gusemu_hal.c @@ -26,8 +26,8 @@ * TODO: check mixer: see 7.20 of sdk for panning pos (applies to all gus models?)? */ -#include "gustate.h" -#include "gusemu.h" +#include "hw/gustate.h" +#include "hw/gusemu.h" #define GUSregb(position) (* (gusptr+(position))) #define GUSregw(position) (*(GUSword *) (gusptr+(position))) diff --git a/hw/gusemu_mixer.c b/hw/gusemu_mixer.c index 6d8d9ce..816c58a 100644 --- a/hw/gusemu_mixer.c +++ b/hw/gusemu_mixer.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "gusemu.h" -#include "gustate.h" +#include "hw/gusemu.h" +#include "hw/gustate.h" #define GUSregb(position) (* (gusptr+(position))) #define GUSregw(position) (*(GUSword *) (gusptr+(position))) diff --git a/hw/hda-audio.c b/hw/hda-audio.c index 3190bd1..6bdd820 100644 --- a/hw/hda-audio.c +++ b/hw/hda-audio.c @@ -17,10 +17,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "pci/pci.h" -#include "intel-hda.h" -#include "intel-hda-defs.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/intel-hda.h" +#include "hw/intel-hda-defs.h" #include "audio/audio.h" /* -------------------------------------------------------------------------- */ diff --git a/hw/heathrow_pic.c b/hw/heathrow_pic.c index c0a71c3..beb9661 100644 --- a/hw/heathrow_pic.c +++ b/hw/heathrow_pic.c @@ -22,8 +22,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc/mac.h" +#include "hw/hw.h" +#include "hw/ppc/mac.h" /* debug PIC */ //#define DEBUG_PIC @@ -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 @@ -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 diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 025803a..a78c0b2 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,12 +1,11 @@ -obj-y += mc146818rtc.o pc.o -obj-y += apic_common.o apic.o kvmvapic.o +obj-y += mc146818rtc.o +obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o -obj-y += pci/pci-hotplug.o smbios.o wdt_ib700.o -obj-y += debugcon.o debugexit.o multiboot.o -obj-y += pc_piix.o +obj-y += pci/pci-hotplug.o wdt_ib700.o +obj-y += debugcon.o debugexit.o obj-y += pc_sysfw.o -obj-y += lpc_ich9.o q35.o pc_q35.o +obj-y += lpc_ich9.o q35.o obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o @@ -15,3 +14,9 @@ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += pc-testdev.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += multiboot.o smbios.o +obj-y += pc.o pc_piix.o pc_q35.o +obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o + +obj-y += kvmvapic.o diff --git a/hw/kvmvapic.c b/hw/i386/kvmvapic.c index 9265baf..c151c95 100644 --- a/hw/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -11,7 +11,7 @@ #include "sysemu/sysemu.h" #include "sysemu/cpus.h" #include "sysemu/kvm.h" -#include "apic_internal.h" +#include "hw/apic_internal.h" #define APIC_DEFAULT_ADDRESS 0xfee00000 diff --git a/hw/multiboot.c b/hw/i386/multiboot.c index c4ec2e3..3cb228f 100644 --- a/hw/multiboot.c +++ b/hw/i386/multiboot.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "fw_cfg.h" -#include "multiboot.h" -#include "loader.h" +#include "hw/hw.h" +#include "hw/fw_cfg.h" +#include "hw/multiboot.h" +#include "hw/loader.h" #include "elf.h" #include "sysemu/sysemu.h" @@ -21,29 +21,29 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "serial.h" -#include "apic.h" -#include "fdc.h" -#include "ide.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/apic.h" +#include "hw/fdc.h" +#include "hw/ide.h" +#include "hw/pci/pci.h" #include "monitor/monitor.h" -#include "fw_cfg.h" -#include "hpet_emul.h" -#include "smbios.h" -#include "loader.h" +#include "hw/fw_cfg.h" +#include "hw/hpet_emul.h" +#include "hw/smbios.h" +#include "hw/loader.h" #include "elf.h" -#include "multiboot.h" -#include "mc146818rtc.h" -#include "i8254.h" -#include "pcspk.h" -#include "pci/msi.h" -#include "sysbus.h" +#include "hw/multiboot.h" +#include "hw/mc146818rtc.h" +#include "hw/i8254.h" +#include "hw/pcspk.h" +#include "hw/pci/msi.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_i386.h" -#include "xen.h" +#include "hw/xen.h" #include "sysemu/blockdev.h" #include "hw/block-common.h" #include "ui/qemu-spice.h" diff --git a/hw/pc_piix.c b/hw/i386/pc_piix.c index a305e1f..0ee3b3b 100644 --- a/hw/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -24,23 +24,23 @@ #include <glib.h> -#include "hw.h" -#include "pc.h" -#include "apic.h" -#include "pci/pci.h" -#include "pci/pci_ids.h" -#include "usb.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/apic.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_ids.h" +#include "hw/usb.h" #include "net/net.h" -#include "boards.h" -#include "ide.h" +#include "hw/boards.h" +#include "hw/ide.h" #include "sysemu/kvm.h" -#include "kvm/clock.h" +#include "hw/kvm/clock.h" #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/arch_init.h" #include "sysemu/blockdev.h" -#include "smbus.h" -#include "xen.h" +#include "hw/smbus.h" +#include "hw/xen.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/hw/pc_q35.c b/hw/i386/pc_q35.c index e22fb98..4f5f347 100644 --- a/hw/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -27,17 +27,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/arch_init.h" -#include "smbus.h" -#include "boards.h" -#include "mc146818rtc.h" -#include "xen.h" +#include "hw/smbus.h" +#include "hw/boards.h" +#include "hw/mc146818rtc.h" +#include "hw/xen.h" #include "sysemu/kvm.h" -#include "kvm/clock.h" -#include "q35.h" +#include "hw/kvm/clock.h" +#include "hw/q35.h" #include "exec/address-spaces.h" -#include "ich9.h" +#include "hw/ich9.h" #include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" diff --git a/hw/smbios.c b/hw/i386/smbios.c index a7b8bfc..672ee9b 100644 --- a/hw/smbios.c +++ b/hw/i386/smbios.c @@ -14,8 +14,8 @@ */ #include "sysemu/sysemu.h" -#include "smbios.h" -#include "loader.h" +#include "hw/smbios.h" +#include "hw/loader.h" /* * Structures shared with the BIOS diff --git a/hw/xen_domainbuild.c b/hw/i386/xen_domainbuild.c index a4272f0..d477061 100644 --- a/hw/xen_domainbuild.c +++ b/hw/i386/xen_domainbuild.c @@ -1,6 +1,6 @@ #include <signal.h> -#include "xen_backend.h" -#include "xen_domainbuild.h" +#include "hw/xen_backend.h" +#include "hw/xen_domainbuild.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/xen_machine_pv.c b/hw/i386/xen_machine_pv.c index 66e8981..a8177b6 100644 --- a/hw/xen_machine_pv.c +++ b/hw/i386/xen_machine_pv.c @@ -22,11 +22,11 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "boards.h" -#include "xen_backend.h" -#include "xen_domainbuild.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/boards.h" +#include "hw/xen_backend.h" +#include "hw/xen_domainbuild.h" #include "sysemu/blockdev.h" static void xen_init_pv(QEMUMachineInitArgs *args) diff --git a/hw/i82374.c b/hw/i82374.c index 6a62ba2..22115e4 100644 --- a/hw/i82374.c +++ b/hw/i82374.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "isa.h" +#include "hw/isa.h" //#define DEBUG_I82374 diff --git a/hw/i82378.c b/hw/i82378.c index 0914d7b..6f8c48b 100644 --- a/hw/i82378.c +++ b/hw/i82378.c @@ -17,10 +17,10 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci/pci.h" -#include "pc.h" -#include "i8254.h" -#include "pcspk.h" +#include "hw/pci/pci.h" +#include "hw/pc.h" +#include "hw/i8254.h" +#include "hw/pcspk.h" //#define DEBUG_I82378 @@ -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 diff --git a/hw/i8254_common.c b/hw/i8254_common.c index 8c2e45a..c6c0c80 100644 --- a/hw/i8254_common.c +++ b/hw/i8254_common.c @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/isa.h" #include "qemu/timer.h" -#include "i8254.h" -#include "i8254_internal.h" +#include "hw/i8254.h" +#include "hw/i8254_internal.h" /* val must be 0 or 1 */ void pit_set_gate(ISADevice *dev, int channel, int val) diff --git a/hw/i8254_internal.h b/hw/i8254_internal.h index 686f0c2..30d5b1b 100644 --- a/hw/i8254_internal.h +++ b/hw/i8254_internal.h @@ -25,9 +25,9 @@ #ifndef QEMU_I8254_INTERNAL_H #define QEMU_I8254_INTERNAL_H -#include "hw.h" -#include "pc.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/isa.h" typedef struct PITChannelState { int count; /* can be 65536 */ @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/isa.h" #include "monitor/monitor.h" #include "qemu/timer.h" -#include "i8259_internal.h" +#include "hw/i8259_internal.h" /* debug PIC */ //#define DEBUG_PIC diff --git a/hw/i8259_common.c b/hw/i8259_common.c index fc91056..98052db 100644 --- a/hw/i8259_common.c +++ b/hw/i8259_common.c @@ -22,8 +22,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "pc.h" -#include "i8259_internal.h" +#include "hw/pc.h" +#include "hw/i8259_internal.h" void pic_reset_common(PICCommonState *s) { diff --git a/hw/i8259_internal.h b/hw/i8259_internal.h index 8785b1d..2813ec1 100644 --- a/hw/i8259_internal.h +++ b/hw/i8259_internal.h @@ -25,9 +25,9 @@ #ifndef QEMU_I8259_INTERNAL_H #define QEMU_I8259_INTERNAL_H -#include "hw.h" -#include "pc.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/isa.h" typedef struct PICCommonState PICCommonState; diff --git a/hw/i82801b11.c b/hw/i82801b11.c index 3dc1000..992095c 100644 --- a/hw/i82801b11.c +++ b/hw/i82801b11.c @@ -41,8 +41,8 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#include "pci/pci.h" -#include "ich9.h" +#include "hw/pci/pci.h" +#include "hw/ich9.h" /*****************************************************************************/ @@ -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 diff --git a/hw/imx_avic.c b/hw/imx_avic.c index f1f066c..4e280b6 100644 --- a/hw/imx_avic.c +++ b/hw/imx_avic.c @@ -14,8 +14,8 @@ * TODO: implement vectors. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "qemu/host-utils.h" #define DEBUG_INT 1 diff --git a/hw/imx_ccm.c b/hw/imx_ccm.c index 477903a..ad7aad3 100644 --- a/hw/imx_ccm.c +++ b/hw/imx_ccm.c @@ -10,10 +10,10 @@ * the CCM. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" -#include "imx.h" +#include "hw/imx.h" #define CKIH_FREQ 26000000 /* 26MHz crystal input */ #define CKIL_FREQ 32768 /* nominal 32khz clock */ diff --git a/hw/imx_serial.c b/hw/imx_serial.c index 2d8253e..746723c 100644 --- a/hw/imx_serial.c +++ b/hw/imx_serial.c @@ -17,11 +17,11 @@ * is a real serial device. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "char/char.h" -#include "imx.h" +#include "hw/imx.h" //#define DEBUG_SERIAL 1 #ifdef DEBUG_SERIAL diff --git a/hw/imx_timer.c b/hw/imx_timer.c index e924c74..a8c3111 100644 --- a/hw/imx_timer.c +++ b/hw/imx_timer.c @@ -11,11 +11,11 @@ * */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "ptimer.h" -#include "sysbus.h" -#include "imx.h" +#include "hw/ptimer.h" +#include "hw/sysbus.h" +#include "hw/imx.h" //#define DEBUG_TIMER 1 #ifdef DEBUG_TIMER diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 784c229..728b60f 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -17,13 +17,13 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "pci/pci.h" -#include "pci/msi.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" #include "qemu/timer.h" -#include "audiodev.h" -#include "intel-hda.h" -#include "intel-hda-defs.h" +#include "hw/audiodev.h" +#include "hw/intel-hda.h" +#include "hw/intel-hda-defs.h" #include "sysemu/dma.h" /* --------------------------------------------------------------------- */ diff --git a/hw/intel-hda.h b/hw/intel-hda.h index 22e0968..2544f0a 100644 --- a/hw/intel-hda.h +++ b/hw/intel-hda.h @@ -1,7 +1,7 @@ #ifndef HW_INTEL_HDA_H #define HW_INTEL_HDA_H -#include "qdev.h" +#include "hw/qdev.h" /* --------------------------------------------------------------------- */ /* hda bus */ diff --git a/hw/ioapic.c b/hw/ioapic.c index f06c2dc..78629fa 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -20,11 +20,11 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "pc.h" -#include "apic.h" -#include "ioapic.h" -#include "ioapic_internal.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/apic.h" +#include "hw/ioapic.h" +#include "hw/ioapic_internal.h" //#define DEBUG_IOAPIC diff --git a/hw/ioapic_common.c b/hw/ioapic_common.c index 7dc552f..d4aff29 100644 --- a/hw/ioapic_common.c +++ b/hw/ioapic_common.c @@ -19,9 +19,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "ioapic.h" -#include "ioapic_internal.h" -#include "sysbus.h" +#include "hw/ioapic.h" +#include "hw/ioapic_internal.h" +#include "hw/sysbus.h" void ioapic_reset_common(DeviceState *dev) { diff --git a/hw/ioapic_internal.h b/hw/ioapic_internal.h index c8447d7..25576c8 100644 --- a/hw/ioapic_internal.h +++ b/hw/ioapic_internal.h @@ -22,9 +22,9 @@ #ifndef QEMU_IOAPIC_INTERNAL_H #define QEMU_IOAPIC_INTERNAL_H -#include "hw.h" +#include "hw/hw.h" #include "exec/memory.h" -#include "sysbus.h" +#include "hw/sysbus.h" #define MAX_IOAPICS 1 diff --git a/hw/ioh3420.c b/hw/ioh3420.c index 95bceb5..43f8554 100644 --- a/hw/ioh3420.c +++ b/hw/ioh3420.c @@ -20,10 +20,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci/pci_ids.h" -#include "pci/msi.h" -#include "pci/pcie.h" -#include "ioh3420.h" +#include "hw/pci/pci_ids.h" +#include "hw/pci/msi.h" +#include "hw/pci/pcie.h" +#include "hw/ioh3420.h" #define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */ #define PCI_DEVICE_ID_IOH_REV 0x2 diff --git a/hw/ioh3420.h b/hw/ioh3420.h index 046cf2c..7776e5b 100644 --- a/hw/ioh3420.h +++ b/hw/ioh3420.h @@ -1,7 +1,7 @@ #ifndef QEMU_IOH3420_H #define QEMU_IOH3420_H -#include "pci/pcie_port.h" +#include "hw/pci/pcie_port.h" PCIESlot *ioh3420_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq, @@ -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; diff --git a/hw/ipoctal232.c b/hw/ipoctal232.c index c1e3b19..1da6a99 100644 --- a/hw/ipoctal232.c +++ b/hw/ipoctal232.c @@ -8,7 +8,7 @@ * later version. */ -#include "ipack.h" +#include "hw/ipack.h" #include "qemu/bitops.h" #include "char/char.h" @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "irq.h" +#include "hw/irq.h" struct IRQState { qemu_irq_handler handler; diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 6dc34f0..67ff8fd 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -16,11 +16,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "monitor/monitor.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" -#include "isa.h" +#include "hw/isa.h" #include "exec/address-spaces.h" static ISABus *isabus; @@ -5,7 +5,7 @@ #include "exec/ioport.h" #include "exec/memory.h" -#include "qdev.h" +#include "hw/qdev.h" #define ISA_NUM_IRQS 16 diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c index 487cf6a..a7860e7 100644 --- a/hw/isa_mmio.c +++ b/hw/isa_mmio.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/isa.h" #include "exec/address-spaces.h" static void isa_mmio_writeb (void *opaque, hwaddr addr, diff --git a/hw/ivshmem.c b/hw/ivshmem.c index afaf9b3..68a2cf2 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -16,10 +16,10 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pc.h" -#include "pci/pci.h" -#include "pci/msix.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pci/pci.h" +#include "hw/pci/msix.h" #include "sysemu/kvm.h" #include "migration/migration.h" #include "qapi/qmp/qerror.h" diff --git a/hw/jazz_led.c b/hw/jazz_led.c index 4822c48..a418a7d 100644 --- a/hw/jazz_led.c +++ b/hw/jazz_led.c @@ -26,7 +26,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" -#include "sysbus.h" +#include "hw/sysbus.h" typedef enum { REDRAW_NONE = 0, REDRAW_SEGMENTS = 1, REDRAW_BACKGROUND = 2, diff --git a/hw/lan9118.c b/hw/lan9118.c index 0e844e5..403fb86 100644 --- a/hw/lan9118.c +++ b/hw/lan9118.c @@ -10,11 +10,11 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" -#include "devices.h" +#include "hw/devices.h" #include "sysemu/sysemu.h" -#include "ptimer.h" +#include "hw/ptimer.h" /* For crc32 */ #include <zlib.h> @@ -35,12 +35,12 @@ * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" #include "qemu/timer.h" #include "qemu/sockets.h" -#include "sun4m.h" -#include "pcnet.h" +#include "hw/sun4m.h" +#include "hw/pcnet.h" #include "trace.h" typedef struct { diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index 4e1843c..4592fe5 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -1,7 +1,3 @@ -# LM32 boards -obj-y += lm32_boards.o -obj-y += milkymist.o - # LM32 peripherals obj-y += lm32_pic.o obj-y += lm32_juart.o @@ -21,3 +17,7 @@ obj-y += milkymist-vgafb.o obj-y += framebuffer.o obj-y := $(addprefix ../,$(obj-y)) + +# LM32 boards +obj-y += lm32_boards.o +obj-y += milkymist.o diff --git a/hw/lm32_boards.c b/hw/lm32/lm32_boards.c index 2bc06d7..1ce466a 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -17,16 +17,16 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" -#include "hw.h" -#include "flash.h" -#include "devices.h" -#include "boards.h" -#include "loader.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/flash.h" +#include "hw/devices.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "sysemu/blockdev.h" #include "elf.h" -#include "lm32_hwsetup.h" -#include "lm32.h" +#include "hw/lm32_hwsetup.h" +#include "hw/lm32.h" #include "exec/address-spaces.h" typedef struct { diff --git a/hw/milkymist.c b/hw/lm32/milkymist.c index c04eb35..fd36de5 100644 --- a/hw/milkymist.c +++ b/hw/lm32/milkymist.c @@ -17,17 +17,17 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" -#include "hw.h" -#include "flash.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/flash.h" #include "sysemu/sysemu.h" -#include "devices.h" -#include "boards.h" -#include "loader.h" +#include "hw/devices.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "sysemu/blockdev.h" -#include "milkymist-hw.h" -#include "lm32.h" +#include "hw/milkymist-hw.h" +#include "hw/lm32.h" #include "exec/address-spaces.h" #define BIOS_FILENAME "mmone-bios.bin" diff --git a/hw/lm32_hwsetup.h b/hw/lm32_hwsetup.h index 853e9ab..3449bd8 100644 --- a/hw/lm32_hwsetup.h +++ b/hw/lm32_hwsetup.h @@ -26,7 +26,7 @@ #define QEMU_HW_LM32_HWSETUP_H #include "qemu-common.h" -#include "loader.h" +#include "hw/loader.h" typedef struct { void *data; diff --git a/hw/lm32_juart.c b/hw/lm32_juart.c index 8c82c85..472e9c2 100644 --- a/hw/lm32_juart.c +++ b/hw/lm32_juart.c @@ -17,12 +17,12 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "char/char.h" -#include "lm32_juart.h" +#include "hw/lm32_juart.h" enum { LM32_JUART_MIN_SAVE_VERSION = 0, diff --git a/hw/lm32_pic.c b/hw/lm32_pic.c index 42f298a..d17c310 100644 --- a/hw/lm32_pic.c +++ b/hw/lm32_pic.c @@ -19,12 +19,12 @@ #include <assert.h> -#include "hw.h" -#include "pc.h" +#include "hw/hw.h" +#include "hw/pc.h" #include "monitor/monitor.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" -#include "lm32_pic.h" +#include "hw/lm32_pic.h" struct LM32PicState { SysBusDevice busdev; diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c index 187ef6d..33a3b80 100644 --- a/hw/lm32_sys.c +++ b/hw/lm32_sys.c @@ -28,8 +28,8 @@ * the test is passed or any non-zero value to it if the test is failed. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "qemu/log.h" #include "qemu/error-report.h" diff --git a/hw/lm32_timer.c b/hw/lm32_timer.c index db527e9..e06fac7 100644 --- a/hw/lm32_timer.c +++ b/hw/lm32_timer.c @@ -21,11 +21,11 @@ * http://www.latticesemi.com/documents/mico32timer.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "qemu/error-report.h" #define DEFAULT_FREQUENCY (50*1000000) diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c index 9c89cca..02f6f89 100644 --- a/hw/lm32_uart.c +++ b/hw/lm32_uart.c @@ -22,8 +22,8 @@ */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "char/char.h" #include "qemu/error-report.h" diff --git a/hw/lm4549.c b/hw/lm4549.c index b3c2d5f..67335cb 100644 --- a/hw/lm4549.c +++ b/hw/lm4549.c @@ -13,9 +13,9 @@ * It supports only one playback voice and no record voice. */ -#include "hw.h" +#include "hw/hw.h" #include "audio/audio.h" -#include "lm4549.h" +#include "hw/lm4549.h" #if 0 #define LM4549_DEBUG 1 diff --git a/hw/lm832x.c b/hw/lm832x.c index 94b8ae0..a064dfd 100644 --- a/hw/lm832x.c +++ b/hw/lm832x.c @@ -18,8 +18,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "i2c.h" +#include "hw/hw.h" +#include "hw/i2c.h" #include "qemu/timer.h" #include "ui/console.h" diff --git a/hw/loader.c b/hw/loader.c index bd2b52d..6ce66fb 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -42,13 +42,13 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "disas/disas.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" -#include "uboot_image.h" -#include "loader.h" -#include "fw_cfg.h" +#include "hw/uboot_image.h" +#include "hw/loader.h" +#include "hw/fw_cfg.h" #include "exec/memory.h" #include "exec/address-spaces.h" @@ -260,7 +260,7 @@ static void *load_at(int fd, int offset, int size) #define elf_word uint32_t #define elf_sword int32_t #define bswapSZs bswap32s -#include "elf_ops.h" +#include "hw/elf_ops.h" #undef elfhdr #undef elf_phdr @@ -280,7 +280,7 @@ static void *load_at(int fd, int offset, int size) #define elf_sword int64_t #define bswapSZs bswap64s #define SZ 64 -#include "elf_ops.h" +#include "hw/elf_ops.h" /* return < 0 if error, otherwise the number of bytes loaded in memory */ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c index eceb052..0ca0a59 100644 --- a/hw/lpc_ich9.c +++ b/hw/lpc_ich9.c @@ -28,21 +28,21 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "hw.h" +#include "hw/hw.h" #include "qemu/range.h" -#include "isa.h" -#include "sysbus.h" -#include "pc.h" -#include "apm.h" -#include "ioapic.h" -#include "pci/pci.h" -#include "pci/pcie_host.h" -#include "pci/pci_bridge.h" -#include "ich9.h" -#include "acpi.h" -#include "acpi_ich9.h" -#include "pam.h" -#include "pci/pci_bus.h" +#include "hw/isa.h" +#include "hw/sysbus.h" +#include "hw/pc.h" +#include "hw/apm.h" +#include "hw/ioapic.h" +#include "hw/pci/pci.h" +#include "hw/pci/pcie_host.h" +#include "hw/pci/pci_bridge.h" +#include "hw/ich9.h" +#include "hw/acpi.h" +#include "hw/acpi_ich9.h" +#include "hw/pam.h" +#include "hw/pci/pci_bus.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 860df32..5a8bf4d 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -12,9 +12,9 @@ #include <assert.h> -#include "hw.h" -#include "pci/pci.h" -#include "scsi.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/scsi.h" #include "sysemu/dma.h" //#define DEBUG_LSI diff --git a/hw/m25p80.c b/hw/m25p80.c index 1372d06..55e9d0d 100644 --- a/hw/m25p80.c +++ b/hw/m25p80.c @@ -21,10 +21,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/blockdev.h" -#include "ssi.h" -#include "devices.h" +#include "hw/ssi.h" +#include "hw/devices.h" #ifdef M25P80_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/m48t59.c b/hw/m48t59.c index 427d95b..39a9d80 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "nvram.h" +#include "hw/hw.h" +#include "hw/nvram.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "sysbus.h" -#include "isa.h" +#include "hw/sysbus.h" +#include "hw/isa.h" #include "exec/address-spaces.h" //#define DEBUG_NVRAM diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs index 93b6d25..ede32a7 100644 --- a/hw/m68k/Makefile.objs +++ b/hw/m68k/Makefile.objs @@ -1,4 +1,8 @@ -obj-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o -obj-y += dummy_m68k.o +obj-y = mcf_uart.o mcf_fec.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += an5206.o mcf5208.o +obj-y += dummy_m68k.o + +obj-y += mcf5206.o mcf_intc.o diff --git a/hw/an5206.c b/hw/m68k/an5206.c index 924be81..7c21c66 100644 --- a/hw/an5206.c +++ b/hw/m68k/an5206.c @@ -6,10 +6,10 @@ * This code is licensed under the GPL */ -#include "hw.h" -#include "mcf.h" -#include "boards.h" -#include "loader.h" +#include "hw/hw.h" +#include "hw/mcf.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "exec/address-spaces.h" diff --git a/hw/dummy_m68k.c b/hw/m68k/dummy_m68k.c index 3a88805..544d56b 100644 --- a/hw/dummy_m68k.c +++ b/hw/m68k/dummy_m68k.c @@ -6,9 +6,9 @@ * This code is licensed under the GPL */ -#include "hw.h" -#include "boards.h" -#include "loader.h" +#include "hw/hw.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "exec/address-spaces.h" diff --git a/hw/mcf5206.c b/hw/m68k/mcf5206.c index ea2db23..58cd8d4 100644 --- a/hw/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -5,10 +5,10 @@ * * This code is licensed under the GPL */ -#include "hw.h" -#include "mcf.h" +#include "hw/hw.h" +#include "hw/mcf.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/hw/mcf5208.c b/hw/m68k/mcf5208.c index 86402d3..748bf56 100644 --- a/hw/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -5,14 +5,14 @@ * * This code is licensed under the GPL */ -#include "hw.h" -#include "mcf.h" +#include "hw/hw.h" +#include "hw/mcf.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "sysemu/sysemu.h" #include "net/net.h" -#include "boards.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "exec/address-spaces.h" diff --git a/hw/mcf_intc.c b/hw/m68k/mcf_intc.c index b213656..fff27b3 100644 --- a/hw/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -5,8 +5,8 @@ * * This code is licensed under the GPL */ -#include "hw.h" -#include "mcf.h" +#include "hw/hw.h" +#include "hw/mcf.h" #include "exec/address-spaces.h" typedef struct { diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c index 73d74c2..61d2f35 100644 --- a/hw/mac_dbdma.c +++ b/hw/mac_dbdma.c @@ -36,9 +36,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "isa.h" -#include "mac_dbdma.h" +#include "hw/hw.h" +#include "hw/isa.h" +#include "hw/mac_dbdma.h" #include "qemu/main-loop.h" /* debug DBDMA */ diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c index 25121fa..ed32bde 100644 --- a/hw/mac_nvram.c +++ b/hw/mac_nvram.c @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "firmware_abi.h" +#include "hw/hw.h" +#include "hw/firmware_abi.h" #include "sysemu/sysemu.h" -#include "ppc/mac.h" +#include "hw/ppc/mac.h" /* debug NVR */ //#define DEBUG_NVR @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc/mac.h" -#include "pci/pci.h" -#include "mac_dbdma.h" -#include "escc.h" +#include "hw/hw.h" +#include "hw/ppc/mac.h" +#include "hw/pci/pci.h" +#include "hw/mac_dbdma.h" +#include "hw/escc.h" #define TYPE_MACIO "macio" #define MACIO(obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO) diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c index c792caf..e042046 100644 --- a/hw/marvell_88w8618_audio.c +++ b/hw/marvell_88w8618_audio.c @@ -9,10 +9,10 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "sysbus.h" -#include "hw.h" -#include "i2c.h" -#include "sysbus.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/i2c.h" +#include "hw/sysbus.h" #include "audio/audio.h" #define MP_AUDIO_SIZE 0x00001000 diff --git a/hw/max111x.c b/hw/max111x.c index de1be4d..d477ecd 100644 --- a/hw/max111x.c +++ b/hw/max111x.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "ssi.h" +#include "hw/ssi.h" typedef struct { SSISlave ssidev; diff --git a/hw/max7310.c b/hw/max7310.c index c2df0b4..e5cb810 100644 --- a/hw/max7310.c +++ b/hw/max7310.c @@ -7,7 +7,7 @@ * This file is licensed under GNU GPL. */ -#include "i2c.h" +#include "hw/i2c.h" typedef struct { I2CSlave i2c; diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 2fb11f6..a2119ad 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "mc146818rtc.h" +#include "hw/mc146818rtc.h" #include "qapi/visitor.h" #ifdef TARGET_I386 -#include "apic.h" +#include "hw/apic.h" #endif //#define DEBUG_CMOS diff --git a/hw/mc146818rtc.h b/hw/mc146818rtc.h index f286b6a..967403e 100644 --- a/hw/mc146818rtc.h +++ b/hw/mc146818rtc.h @@ -1,8 +1,8 @@ #ifndef MC146818RTC_H #define MC146818RTC_H -#include "isa.h" -#include "mc146818rtc_regs.h" +#include "hw/isa.h" +#include "hw/mc146818rtc_regs.h" ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c index 8e60f09..0227bd8 100644 --- a/hw/mcf_fec.c +++ b/hw/mcf_fec.c @@ -5,9 +5,9 @@ * * This code is licensed under the GPL */ -#include "hw.h" +#include "hw/hw.h" #include "net/net.h" -#include "mcf.h" +#include "hw/mcf.h" /* For crc32 */ #include <zlib.h> #include "exec/address-spaces.h" diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c index c443443..aacf0f0 100644 --- a/hw/mcf_uart.c +++ b/hw/mcf_uart.c @@ -5,8 +5,8 @@ * * This code is licensed under the GPL */ -#include "hw.h" -#include "mcf.h" +#include "hw/hw.h" +#include "hw/mcf.h" #include "char/char.h" #include "exec/address-spaces.h" diff --git a/hw/megasas.c b/hw/megasas.c index eb191f5..9b815d4 100644 --- a/hw/megasas.c +++ b/hw/megasas.c @@ -18,16 +18,16 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" #include "sysemu/dma.h" -#include "pci/msix.h" +#include "hw/pci/msix.h" #include "qemu/iov.h" -#include "scsi.h" -#include "scsi-defs.h" +#include "hw/scsi.h" +#include "hw/scsi-defs.h" #include "trace.h" -#include "mfi.h" +#include "hw/mfi.h" #define MEGASAS_VERSION "1.70" #define MEGASAS_MAX_FRAMES 2048 /* Firmware limit at 65535 */ diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index 3028e65..9e7f249 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,10 +1,9 @@ -obj-y = petalogix_s3adsp1800_mmu.o -obj-y += petalogix_ml605_mmu.o -obj-y += microblaze_boot.o obj-y += xilinx_spi.o - -obj-y += microblaze_pic_cpu.o obj-y += xilinx_ethlite.o -obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += petalogix_s3adsp1800_mmu.o +obj-y += petalogix_ml605_mmu.o +obj-y += boot.o +obj-y += pic_cpu.o diff --git a/hw/microblaze_boot.c b/hw/microblaze/boot.c index 3ec5c0f..e13b3e1 100644 --- a/hw/microblaze_boot.c +++ b/hw/microblaze/boot.c @@ -28,10 +28,10 @@ #include "qemu/config-file.h" #include "qemu-common.h" #include "sysemu/device_tree.h" -#include "loader.h" +#include "hw/loader.h" #include "elf.h" -#include "microblaze_boot.h" +#include "hw/microblaze_boot.h" static struct { diff --git a/hw/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index fe7a932..cfc0220 100644 --- a/hw/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -25,23 +25,23 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" +#include "hw/sysbus.h" +#include "hw/hw.h" #include "net/net.h" -#include "flash.h" +#include "hw/flash.h" #include "sysemu/sysemu.h" -#include "devices.h" -#include "boards.h" -#include "xilinx.h" +#include "hw/devices.h" +#include "hw/boards.h" +#include "hw/xilinx.h" #include "sysemu/blockdev.h" -#include "serial.h" +#include "hw/serial.h" #include "exec/address-spaces.h" -#include "ssi.h" +#include "hw/ssi.h" -#include "microblaze_boot.h" -#include "microblaze_pic_cpu.h" +#include "hw/microblaze_boot.h" +#include "hw/microblaze_pic_cpu.h" -#include "stream.h" +#include "hw/stream.h" #define LMB_BRAM_SIZE (128 * 1024) #define FLASH_SIZE (32 * 1024 * 1024) diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 8605fb8..2498362 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -23,19 +23,19 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" +#include "hw/sysbus.h" +#include "hw/hw.h" #include "net/net.h" -#include "flash.h" +#include "hw/flash.h" #include "sysemu/sysemu.h" -#include "devices.h" -#include "boards.h" -#include "xilinx.h" +#include "hw/devices.h" +#include "hw/boards.h" +#include "hw/xilinx.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" -#include "microblaze_boot.h" -#include "microblaze_pic_cpu.h" +#include "hw/microblaze_boot.h" +#include "hw/microblaze_pic_cpu.h" #define LMB_BRAM_SIZE (128 * 1024) #define FLASH_SIZE (16 * 1024 * 1024) diff --git a/hw/microblaze_pic_cpu.c b/hw/microblaze/pic_cpu.c index ff36a52..d4743ab 100644 --- a/hw/microblaze_pic_cpu.c +++ b/hw/microblaze/pic_cpu.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "microblaze_pic_cpu.h" +#include "hw/hw.h" +#include "hw/microblaze_pic_cpu.h" #define D(x) diff --git a/hw/microblaze_boot.h b/hw/microblaze_boot.h index c1cf836..b14ef2b 100644 --- a/hw/microblaze_boot.h +++ b/hw/microblaze_boot.h @@ -1,7 +1,7 @@ #ifndef __MICROBLAZE_BOOT__ #define __MICROBLAZE_BOOT__ -#include "hw.h" +#include "hw/hw.h" void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, uint32_t ramsize, const char *dtb_filename, diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c index d51d1ac..e08e9dc 100644 --- a/hw/milkymist-ac97.c +++ b/hw/milkymist-ac97.c @@ -21,8 +21,8 @@ * http://www.milkymist.org/socdoc/ac97.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "audio/audio.h" #include "qemu/error-report.h" diff --git a/hw/milkymist-hpdmc.c b/hw/milkymist-hpdmc.c index ea4d210..d922f6f 100644 --- a/hw/milkymist-hpdmc.c +++ b/hw/milkymist-hpdmc.c @@ -21,8 +21,8 @@ * http://www.milkymist.org/socdoc/hpdmc.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index c8bd7e9..ced1c5f 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -1,8 +1,8 @@ #ifndef QEMU_HW_MILKYMIST_H #define QEMU_HW_MILKYMIST_H -#include "qdev.h" -#include "qdev-addr.h" +#include "hw/qdev.h" +#include "hw/qdev-addr.h" #include "net/net.h" static inline DeviceState *milkymist_uart_create(hwaddr base, @@ -170,22 +170,6 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base, return dev; } -static inline DeviceState *milkymist_minimac_create(hwaddr base, - qemu_irq rx_irq, qemu_irq tx_irq) -{ - DeviceState *dev; - - qemu_check_nic_model(&nd_table[0], "minimac"); - dev = qdev_create(NULL, "milkymist-minimac"); - qdev_set_nic_properties(dev, &nd_table[0]); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq); - - return dev; -} - static inline DeviceState *milkymist_minimac2_create(hwaddr base, hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq) { diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c index 9d15309..d5944bc 100644 --- a/hw/milkymist-memcard.c +++ b/hw/milkymist-memcard.c @@ -21,13 +21,13 @@ * http://www.milkymist.org/socdoc/memcard.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "trace.h" #include "qemu/error-report.h" #include "sysemu/blockdev.h" -#include "sd.h" +#include "hw/sd.h" enum { ENABLE_CMD_TX = (1<<0), diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c index 9992dcc..c20ff90 100644 --- a/hw/milkymist-minimac2.c +++ b/hw/milkymist-minimac2.c @@ -22,12 +22,12 @@ * */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "net/net.h" #include "qemu/error-report.h" -#include "qdev-addr.h" +#include "hw/qdev-addr.h" #include <zlib.h> diff --git a/hw/milkymist-pfpu.c b/hw/milkymist-pfpu.c index c347680..ad44b4d 100644 --- a/hw/milkymist-pfpu.c +++ b/hw/milkymist-pfpu.c @@ -22,8 +22,8 @@ * */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "qemu/log.h" #include "qemu/error-report.h" diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c index 01660be..d911686 100644 --- a/hw/milkymist-softusb.c +++ b/hw/milkymist-softusb.c @@ -21,11 +21,11 @@ * not available yet */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "ui/console.h" -#include "hid.h" +#include "hw/hid.h" #include "qemu/error-report.h" enum { diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c index e69ac6f..e083a28 100644 --- a/hw/milkymist-sysctl.c +++ b/hw/milkymist-sysctl.c @@ -21,12 +21,12 @@ * http://www.milkymist.org/socdoc/sysctl.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "trace.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "qemu/error-report.h" enum { diff --git a/hw/milkymist-tmu2.c b/hw/milkymist-tmu2.c index 42de10a..b723a04 100644 --- a/hw/milkymist-tmu2.c +++ b/hw/milkymist-tmu2.c @@ -24,8 +24,8 @@ * */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c index e73eb84..ac6f537 100644 --- a/hw/milkymist-uart.c +++ b/hw/milkymist-uart.c @@ -21,8 +21,8 @@ * http://www.milkymist.org/socdoc/uart.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "char/char.h" #include "qemu/error-report.h" diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c index 4d0a5df..85ebb85 100644 --- a/hw/milkymist-vgafb.c +++ b/hw/milkymist-vgafb.c @@ -22,24 +22,24 @@ * http://www.milkymist.org/socdoc/vgafb.pdf */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "trace.h" #include "ui/console.h" -#include "framebuffer.h" +#include "hw/framebuffer.h" #include "ui/pixel_ops.h" #include "qemu/error-report.h" #define BITS 8 -#include "milkymist-vgafb_template.h" +#include "hw/milkymist-vgafb_template.h" #define BITS 15 -#include "milkymist-vgafb_template.h" +#include "hw/milkymist-vgafb_template.h" #define BITS 16 -#include "milkymist-vgafb_template.h" +#include "hw/milkymist-vgafb_template.h" #define BITS 24 -#include "milkymist-vgafb_template.h" +#include "hw/milkymist-vgafb_template.h" #define BITS 32 -#include "milkymist-vgafb_template.h" +#include "hw/milkymist-vgafb_template.h" enum { R_CTRL = 0, diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 29a5d0d..1e3bca1 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,6 +1,8 @@ -obj-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o -obj-y += mips_addr.o mips_timer.o mips_int.o obj-y += gt64xxx.o mc146818rtc.o -obj-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o +obj-$(CONFIG_FULONG) += bonito.o vt82c686.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o +obj-y += addr.o cputimer.o mips_int.o +obj-$(CONFIG_FULONG) += mips_fulong2e.o diff --git a/hw/mips_addr.c b/hw/mips/addr.c index aa1c7d8..cddc25c 100644 --- a/hw/mips_addr.c +++ b/hw/mips/addr.c @@ -20,8 +20,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "mips_cpudevs.h" +#include "hw/hw.h" +#include "hw/mips_cpudevs.h" uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr) { diff --git a/hw/mips_timer.c b/hw/mips/cputimer.c index 83c400c..9ad13f3 100644 --- a/hw/mips_timer.c +++ b/hw/mips/cputimer.c @@ -20,8 +20,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "mips_cpudevs.h" +#include "hw/hw.h" +#include "hw/mips_cpudevs.h" #include "qemu/timer.h" #define TIMER_FREQ 100 * 1000 * 1000 diff --git a/hw/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 8b532e1..766aa9d 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -18,29 +18,29 @@ * http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf */ -#include "hw.h" -#include "pc.h" -#include "serial.h" -#include "fdc.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/fdc.h" #include "net/net.h" -#include "boards.h" -#include "smbus.h" +#include "hw/boards.h" +#include "hw/smbus.h" #include "block/block.h" -#include "flash.h" -#include "mips.h" -#include "mips_cpudevs.h" -#include "pci/pci.h" +#include "hw/flash.h" +#include "hw/mips.h" +#include "hw/mips_cpudevs.h" +#include "hw/pci/pci.h" #include "char/char.h" #include "sysemu/sysemu.h" #include "audio/audio.h" #include "qemu/log.h" -#include "loader.h" -#include "mips-bios.h" -#include "ide.h" +#include "hw/loader.h" +#include "hw/mips-bios.h" +#include "hw/ide.h" #include "elf.h" -#include "vt82c686.h" -#include "mc146818rtc.h" -#include "i8254.h" +#include "hw/vt82c686.h" +#include "hw/mc146818rtc.h" +#include "hw/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/mips_int.c b/hw/mips/mips_int.c index 6423fd0..ddd3b1b 100644 --- a/hw/mips_int.c +++ b/hw/mips/mips_int.c @@ -20,8 +20,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "mips_cpudevs.h" +#include "hw/hw.h" +#include "hw/mips_cpudevs.h" #include "cpu.h" static void cpu_mips_irq_request(void *opaque, int irq, int level) diff --git a/hw/mips_jazz.c b/hw/mips/mips_jazz.c index 17fbdde..daeb985 100644 --- a/hw/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -22,25 +22,25 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" -#include "mips_cpudevs.h" -#include "pc.h" -#include "serial.h" -#include "isa.h" -#include "fdc.h" +#include "hw/hw.h" +#include "hw/mips.h" +#include "hw/mips_cpudevs.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/isa.h" +#include "hw/fdc.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" -#include "boards.h" +#include "hw/boards.h" #include "net/net.h" -#include "esp.h" -#include "mips-bios.h" -#include "loader.h" -#include "mc146818rtc.h" -#include "i8254.h" -#include "pcspk.h" +#include "hw/esp.h" +#include "hw/mips-bios.h" +#include "hw/loader.h" +#include "hw/mc146818rtc.h" +#include "hw/i8254.h" +#include "hw/pcspk.h" #include "sysemu/blockdev.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" enum jazz_model_e diff --git a/hw/mips_malta.c b/hw/mips/mips_malta.c index 2a150df..9a67dce 100644 --- a/hw/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -22,32 +22,32 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "serial.h" -#include "fdc.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/fdc.h" #include "net/net.h" -#include "boards.h" -#include "smbus.h" +#include "hw/boards.h" +#include "hw/smbus.h" #include "block/block.h" -#include "flash.h" -#include "mips.h" -#include "mips_cpudevs.h" -#include "pci/pci.h" +#include "hw/flash.h" +#include "hw/mips.h" +#include "hw/mips_cpudevs.h" +#include "hw/pci/pci.h" #include "char/char.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" -#include "boards.h" +#include "hw/boards.h" #include "qemu/log.h" -#include "mips-bios.h" -#include "ide.h" -#include "loader.h" +#include "hw/mips-bios.h" +#include "hw/ide.h" +#include "hw/loader.h" #include "elf.h" -#include "mc146818rtc.h" -#include "i8254.h" +#include "hw/mc146818rtc.h" +#include "hw/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" -#include "sysbus.h" /* SysBusDevice */ +#include "hw/sysbus.h" /* SysBusDevice */ //#define DEBUG_BOARD_INIT diff --git a/hw/mips_mipssim.c b/hw/mips/mips_mipssim.c index b0ab8f6..4935c78 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -24,18 +24,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" -#include "mips_cpudevs.h" -#include "serial.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/mips.h" +#include "hw/mips_cpudevs.h" +#include "hw/serial.h" +#include "hw/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "mips-bios.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/mips-bios.h" +#include "hw/loader.h" #include "elf.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "exec/address-spaces.h" static struct _loaderparams { diff --git a/hw/mips_r4k.c b/hw/mips/mips_r4k.c index 5df7eb4..539a562 100644 --- a/hw/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -7,23 +7,23 @@ * All peripherial devices are attached to this "bus" with * the standard PC ISA addresses. */ -#include "hw.h" -#include "mips.h" -#include "mips_cpudevs.h" -#include "pc.h" -#include "serial.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/mips.h" +#include "hw/mips_cpudevs.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "flash.h" +#include "hw/boards.h" +#include "hw/flash.h" #include "qemu/log.h" -#include "mips-bios.h" -#include "ide.h" -#include "loader.h" +#include "hw/mips-bios.h" +#include "hw/ide.h" +#include "hw/loader.h" #include "elf.h" -#include "mc146818rtc.h" -#include "i8254.h" +#include "hw/mc146818rtc.h" +#include "hw/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/mipsnet.c b/hw/mipsnet.c index ff6bf7f..ac6193a 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -1,7 +1,7 @@ -#include "hw.h" +#include "hw/hw.h" #include "net/net.h" #include "trace.h" -#include "sysbus.h" +#include "hw/sysbus.h" /* MIPSnet register offsets */ diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c index 7ae05e3..1dd1505 100644 --- a/hw/mst_fpga.c +++ b/hw/mst_fpga.c @@ -10,8 +10,8 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" /* Mainstone FPGA for extern irqs */ #define FPGA_GPIO_PIN 0 @@ -18,10 +18,10 @@ #ifndef NAND_IO -# include "hw.h" -# include "flash.h" +# include "hw/hw.h" +# include "hw/flash.h" # include "sysemu/blockdev.h" -# include "sysbus.h" +# include "hw/sysbus.h" #include "qemu/error-report.h" # define NAND_CMD_READ0 0x00 diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 342c6bd..47c00c3 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "isa.h" -#include "qdev.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/isa.h" +#include "hw/qdev.h" #include "net/net.h" -#include "ne2000.h" +#include "hw/ne2000.h" #include "exec/address-spaces.h" typedef struct ISANE2000State { diff --git a/hw/ne2000.c b/hw/ne2000.c index 3dd1c84..7dadc1c 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" #include "net/net.h" -#include "ne2000.h" -#include "loader.h" +#include "hw/ne2000.h" +#include "hw/loader.h" #include "sysemu/sysemu.h" /* debug NE2000 card */ diff --git a/hw/omap_clk.c b/hw/omap_clk.c index 8448006..c7b5c11 100644 --- a/hw/omap_clk.c +++ b/hw/omap_clk.c @@ -18,8 +18,8 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/omap.h" struct clk { const char *name; diff --git a/hw/omap_dma.c b/hw/omap_dma.c index 0c878b6..0c5902f 100644 --- a/hw/omap_dma.c +++ b/hw/omap_dma.c @@ -19,9 +19,9 @@ */ #include "qemu-common.h" #include "qemu/timer.h" -#include "omap.h" -#include "irq.h" -#include "soc_dma.h" +#include "hw/omap.h" +#include "hw/irq.h" +#include "hw/soc_dma.h" struct omap_dma_channel_s { /* transfer data */ diff --git a/hw/omap_dss.c b/hw/omap_dss.c index ae51bdf..948ad8f 100644 --- a/hw/omap_dss.c +++ b/hw/omap_dss.c @@ -17,9 +17,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "omap.h" +#include "hw/omap.h" struct omap_dss_s { qemu_irq irq; diff --git a/hw/omap_gpio.c b/hw/omap_gpio.c index aadf1cc..c79f61c 100644 --- a/hw/omap_gpio.c +++ b/hw/omap_gpio.c @@ -18,9 +18,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/omap.h" +#include "hw/sysbus.h" struct omap_gpio_s { qemu_irq irq; diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c index 02ab0ab..ebb259c 100644 --- a/hw/omap_gpmc.c +++ b/hw/omap_gpmc.c @@ -18,9 +18,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "flash.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/flash.h" +#include "hw/omap.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c index a5db710..8485ee8 100644 --- a/hw/omap_gptimer.c +++ b/hw/omap_gptimer.c @@ -17,9 +17,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "omap.h" +#include "hw/omap.h" /* GP timers */ struct omap_gp_timer_s { diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c index 143b198..92f7b37 100644 --- a/hw/omap_i2c.c +++ b/hw/omap_i2c.c @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "i2c.h" -#include "omap.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/i2c.h" +#include "hw/omap.h" +#include "hw/sysbus.h" typedef struct OMAPI2CState { diff --git a/hw/omap_intc.c b/hw/omap_intc.c index 4b0acd0..7da9c35 100644 --- a/hw/omap_intc.c +++ b/hw/omap_intc.c @@ -17,9 +17,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/omap.h" +#include "hw/sysbus.h" /* Interrupt Handlers */ struct omap_intr_handler_bank_s { diff --git a/hw/omap_l4.c b/hw/omap_l4.c index 09e983f..cbe8a06 100644 --- a/hw/omap_l4.c +++ b/hw/omap_l4.c @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/omap.h" struct omap_l4_s { MemoryRegion *address_space; diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index 936850a..c426f3a 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "omap.h" -#include "framebuffer.h" +#include "hw/omap.h" +#include "hw/framebuffer.h" #include "ui/pixel_ops.h" struct omap_lcd_panel_s { @@ -70,13 +70,13 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s) #define draw_line_func drawfn #define DEPTH 8 -#include "omap_lcd_template.h" +#include "hw/omap_lcd_template.h" #define DEPTH 15 -#include "omap_lcd_template.h" +#include "hw/omap_lcd_template.h" #define DEPTH 16 -#include "omap_lcd_template.h" +#include "hw/omap_lcd_template.h" #define DEPTH 32 -#include "omap_lcd_template.h" +#include "hw/omap_lcd_template.h" static draw_line_func draw_line_table2[33] = { [0 ... 32] = NULL, diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c index 7ecd9bd..6e48110 100644 --- a/hw/omap_mmc.c +++ b/hw/omap_mmc.c @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" -#include "sd.h" +#include "hw/hw.h" +#include "hw/omap.h" +#include "hw/sd.h" struct omap_mmc_s { qemu_irq irq; diff --git a/hw/omap_sdrc.c b/hw/omap_sdrc.c index b0f3b8e..510e6cc 100644 --- a/hw/omap_sdrc.c +++ b/hw/omap_sdrc.c @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/omap.h" /* SDRAM Controller Subsystem */ struct omap_sdrc_s { diff --git a/hw/omap_spi.c b/hw/omap_spi.c index 8ff01ed..1cbd98d 100644 --- a/hw/omap_spi.c +++ b/hw/omap_spi.c @@ -19,8 +19,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "hw.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/omap.h" /* Multichannel SPI */ struct omap_mcspi_s { diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c index 945711e..13e7280 100644 --- a/hw/omap_synctimer.c +++ b/hw/omap_synctimer.c @@ -17,9 +17,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "omap.h" +#include "hw/omap.h" struct omap_synctimer_s { MemoryRegion iomem; uint32_t val; diff --git a/hw/omap_tap.c b/hw/omap_tap.c index e273e97..181ecee 100644 --- a/hw/omap_tap.c +++ b/hw/omap_tap.c @@ -18,8 +18,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "omap.h" +#include "hw/hw.h" +#include "hw/omap.h" /* TEST-Chip-level TAP */ static uint64_t omap_tap_read(void *opaque, hwaddr addr, diff --git a/hw/omap_uart.c b/hw/omap_uart.c index 0ebfbf8..af51ce7 100644 --- a/hw/omap_uart.c +++ b/hw/omap_uart.c @@ -18,9 +18,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "char/char.h" -#include "hw.h" -#include "omap.h" -#include "serial.h" +#include "hw/hw.h" +#include "hw/omap.h" +#include "hw/serial.h" #include "exec/address-spaces.h" /* UARTs */ diff --git a/hw/onenand.c b/hw/onenand.c index 00a8738..ddba366 100644 --- a/hw/onenand.c +++ b/hw/onenand.c @@ -19,13 +19,13 @@ */ #include "qemu-common.h" -#include "hw.h" -#include "flash.h" -#include "irq.h" +#include "hw/hw.h" +#include "hw/flash.h" +#include "hw/irq.h" #include "sysemu/blockdev.h" #include "exec/memory.h" #include "exec/address-spaces.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/error-report.h" /* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */ diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c index f9ba5ee..be64bf2 100644 --- a/hw/opencores_eth.c +++ b/hw/opencores_eth.c @@ -31,8 +31,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/openpic.c b/hw/openpic.c index 20a479c..03a7075 100644 --- a/hw/openpic.c +++ b/hw/openpic.c @@ -33,14 +33,14 @@ * Serial interrupts, as implemented in Raven chipset are not supported yet. * */ -#include "hw.h" -#include "ppc/mac.h" -#include "pci/pci.h" -#include "openpic.h" -#include "sysbus.h" -#include "pci/msi.h" +#include "hw/hw.h" +#include "hw/ppc/mac.h" +#include "hw/pci/pci.h" +#include "hw/openpic.h" +#include "hw/sysbus.h" +#include "hw/pci/msi.h" #include "qemu/bitops.h" -#include "ppc.h" +#include "hw/ppc.h" //#define DEBUG_OPENPIC diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs index 38ff8f5..61246b1 100644 --- a/hw/openrisc/Makefile.objs +++ b/hw/openrisc/Makefile.objs @@ -1,3 +1,2 @@ -obj-y = openrisc_pic.o openrisc_sim.o openrisc_timer.o - -obj-y := $(addprefix ../,$(obj-y)) +obj-y = pic_cpu.o cputimer.o +obj-y += openrisc_sim.o diff --git a/hw/openrisc_timer.c b/hw/openrisc/cputimer.c index d965be7..f6c877f 100644 --- a/hw/openrisc_timer.c +++ b/hw/openrisc/cputimer.c @@ -19,7 +19,7 @@ */ #include "cpu.h" -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" #define TIMER_FREQ (20 * 1000 * 1000) /* 20MHz */ diff --git a/hw/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 30947de..db2aac8 100644 --- a/hw/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -18,15 +18,15 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "boards.h" +#include "hw/hw.h" +#include "hw/boards.h" #include "elf.h" -#include "serial.h" +#include "hw/serial.h" #include "net/net.h" -#include "loader.h" +#include "hw/loader.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/qtest.h" #define KERNEL_LOAD_ADDR 0x100 diff --git a/hw/openrisc_pic.c b/hw/openrisc/pic_cpu.c index aaeb9a9..931511e 100644 --- a/hw/openrisc_pic.c +++ b/hw/openrisc/pic_cpu.c @@ -18,7 +18,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "cpu.h" /* OpenRISC pic handler */ @@ -27,7 +27,7 @@ * THE SOFTWARE. */ #include "sysemu/sysemu.h" -#include "pam.h" +#include "hw/pam.h" void smram_update(MemoryRegion *smram_region, uint8_t smram, uint8_t smm_enabled) diff --git a/hw/parallel.c b/hw/parallel.c index 3a4e06b..0b9af43 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -22,10 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "char/char.h" -#include "isa.h" -#include "pc.h" +#include "hw/isa.h" +#include "hw/pc.h" #include "sysemu/sysemu.h" //#define DEBUG_PARALLEL diff --git a/hw/pc-testdev.c b/hw/pc-testdev.c index cf64a1f..8236bce 100644 --- a/hw/pc-testdev.c +++ b/hw/pc-testdev.c @@ -39,9 +39,9 @@ #if defined(CONFIG_POSIX) #include <sys/mman.h> #endif -#include "hw.h" -#include "qdev.h" -#include "isa.h" +#include "hw/hw.h" +#include "hw/qdev.h" +#include "hw/isa.h" #define IOMEM_LEN 0x10000 @@ -4,11 +4,11 @@ #include "qemu-common.h" #include "exec/memory.h" #include "exec/ioport.h" -#include "isa.h" -#include "fdc.h" +#include "hw/isa.h" +#include "hw/fdc.h" #include "net/net.h" #include "exec/memory.h" -#include "ioapic.h" +#include "hw/ioapic.h" /* PC-style peripherals (also used by other machines). */ diff --git a/hw/pc87312.c b/hw/pc87312.c index 38af4c1..c4e4c62 100644 --- a/hw/pc87312.c +++ b/hw/pc87312.c @@ -23,7 +23,8 @@ * THE SOFTWARE. */ -#include "pc87312.h" +#include "hw/pc87312.h" +#include "qemu/error-report.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "char/char.h" diff --git a/hw/pc87312.h b/hw/pc87312.h index 7b9e6f6..ad087c7 100644 --- a/hw/pc87312.h +++ b/hw/pc87312.h @@ -25,7 +25,7 @@ #ifndef QEMU_PC87312_H #define QEMU_PC87312_H -#include "isa.h" +#include "hw/isa.h" #define TYPE_PC87312 "pc87312" diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c index 7f6c12c..3e01528 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -24,13 +24,14 @@ */ #include "sysemu/blockdev.h" -#include "sysbus.h" -#include "hw.h" -#include "pc.h" +#include "qemu/error-report.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/pc.h" #include "hw/boards.h" -#include "loader.h" +#include "hw/loader.h" #include "sysemu/sysemu.h" -#include "flash.h" +#include "hw/flash.h" #include "sysemu/kvm.h" #define BIOS_FILENAME "bios.bin" diff --git a/hw/pci/pci_host.h b/hw/pci/pci_host.h index 1845d4d..236cd0f 100644 --- a/hw/pci/pci_host.h +++ b/hw/pci/pci_host.h @@ -40,7 +40,6 @@ struct PCIHostState { MemoryRegion conf_mem; MemoryRegion data_mem; MemoryRegion mmcfg; - MemoryRegion *address_space; uint32_t config_reg; PCIBus *bus; }; diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index f07266d..d35c2ee 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -1,7 +1,8 @@ +#include "qemu-common.h" #include <strings.h> #include <stdint.h> #include "qemu/range.h" -#include "qemu/range.h" +#include "qemu/error-report.h" #include "hw/pci/shpc.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" diff --git a/hw/pci/slotid_cap.c b/hw/pci/slotid_cap.c index 99a30f4..62f7bae 100644 --- a/hw/pci/slotid_cap.c +++ b/hw/pci/slotid_cap.c @@ -1,5 +1,6 @@ #include "hw/pci/slotid_cap.h" #include "hw/pci/pci.h" +#include "qemu/error-report.h" #define SLOTID_CAP_LENGTH 4 #define SLOTID_NSLOTS_SHIFT (ffs(PCI_SID_ESR_NSLOTS) - 1) diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c index 1124c53..9cc6a40 100644 --- a/hw/pci_bridge_dev.c +++ b/hw/pci_bridge_dev.c @@ -19,13 +19,13 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci/pci_bridge.h" -#include "pci/pci_ids.h" -#include "pci/msi.h" -#include "pci/shpc.h" -#include "pci/slotid_cap.h" +#include "hw/pci/pci_bridge.h" +#include "hw/pci/pci_ids.h" +#include "hw/pci/msi.h" +#include "hw/pci/shpc.h" +#include "hw/pci/slotid_cap.h" #include "exec/memory.h" -#include "pci/pci_bus.h" +#include "hw/pci/pci_bus.h" struct PCIBridgeDev { PCIBridge bridge; @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "isa.h" -#include "pc.h" -#include "ps2.h" +#include "hw/hw.h" +#include "hw/isa.h" +#include "hw/pc.h" +#include "hw/ps2.h" #include "sysemu/sysemu.h" /* debug PC keyboard */ diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index df63b22..55f80ca 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -27,13 +27,13 @@ * AMD Publication# 19436 Rev:E Amendment/0 Issue Date: June 2000 */ -#include "pci/pci.h" +#include "hw/pci/pci.h" #include "net/net.h" -#include "loader.h" +#include "hw/loader.h" #include "qemu/timer.h" #include "sysemu/dma.h" -#include "pcnet.h" +#include "hw/pcnet.h" //#define PCNET_DEBUG //#define PCNET_DEBUG_IO @@ -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) { diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 123b006..5d57bab 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -36,13 +36,13 @@ * It does not implement much more ... */ -#include "hw.h" -#include "flash.h" +#include "hw/hw.h" +#include "hw/flash.h" #include "block/block.h" #include "qemu/timer.h" #include "exec/address-spaces.h" #include "qemu/host-utils.h" -#include "sysbus.h" +#include "hw/sysbus.h" #define PFLASH_BUG(fmt, ...) \ do { \ diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index 44bd465..37b4fcc 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -35,13 +35,13 @@ * It does not implement multiple sectors erase */ -#include "hw.h" -#include "flash.h" +#include "hw/hw.h" +#include "hw/flash.h" #include "qemu/timer.h" #include "block/block.h" #include "exec/address-spaces.h" #include "qemu/host-utils.h" -#include "sysbus.h" +#include "hw/sysbus.h" //#define PFLASH_DEBUG #ifdef PFLASH_DEBUG @@ -22,11 +22,11 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "pci/pci.h" -#include "isa.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa.h" +#include "hw/sysbus.h" PCIDevice *piix4_dev; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 6c77e49..e10bc1c 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -22,15 +22,15 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "isa.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/isa.h" +#include "hw/sysbus.h" #include "qemu/range.h" -#include "xen.h" -#include "pam.h" +#include "hw/xen.h" +#include "hw/pam.h" #include "sysemu/sysemu.h" /* @@ -244,7 +244,6 @@ static PCIBus *i440fx_common_init(const char *device_name, dev = qdev_create(NULL, "i440FX-pcihost"); s = PCI_HOST_BRIDGE(dev); - s->address_space = address_space_mem; b = pci_bus_new(dev, NULL, pci_address_space, address_space_io, 0); s->bus = b; @@ -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) { diff --git a/hw/pl110_template.h b/hw/pl110_template.h index e738e4a..ec4bfd6 100644 --- a/hw/pl110_template.h +++ b/hw/pl110_template.h @@ -27,20 +27,20 @@ #undef RGB #define BORDER bgr #define ORDER 0 -#include "pl110_template.h" +#include "hw/pl110_template.h" #define ORDER 1 -#include "pl110_template.h" +#include "hw/pl110_template.h" #define ORDER 2 -#include "pl110_template.h" +#include "hw/pl110_template.h" #undef BORDER #define RGB #define BORDER rgb #define ORDER 0 -#include "pl110_template.h" +#include "hw/pl110_template.h" #define ORDER 1 -#include "pl110_template.h" +#include "hw/pl110_template.h" #define ORDER 2 -#include "pl110_template.h" +#include "hw/pl110_template.h" #undef BORDER static drawfn glue(pl110_draw_fn_,BITS)[48] = @@ -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 diff --git a/hw/pm_smbus.c b/hw/pm_smbus.c index ea1380c..7900610 100644 --- a/hw/pm_smbus.c +++ b/hw/pm_smbus.c @@ -17,10 +17,10 @@ * License along with this library; if not, see * <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "pc.h" -#include "pm_smbus.h" -#include "smbus.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pm_smbus.h" +#include "hw/smbus.h" /* no save/load? */ diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index f762050..4de0209 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,28 +1,26 @@ -# shared objects -obj-y = ppc.o ppc_booke.o # PREP target obj-y += mc146818rtc.o # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o -obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o -obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o spapr_iommu.o -obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o +obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o +obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o +obj-$(CONFIG_PSERIES) += spapr_nvram.o # PowerPC 4xx boards -obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o -obj-y += ppc440_bamboo.o -# PowerPC E500 boards -obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o -# PowerPC 440 Xilinx ML507 reference board. -obj-y += virtex_ml507.o +obj-y += ppc4xx_pci.o # PowerPC OpenPIC obj-y += openpic.o -obj-$(CONFIG_FDT) += ../device_tree.o # Xilinx PPC peripherals obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) +# shared objects +obj-y += ppc.o ppc_booke.o +# IBM pSeries (sPAPR) +obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o spapr_events.o +obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o +# PowerPC 4xx boards +obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o # PReP obj-y += prep.o # OldWorld PowerMac @@ -30,4 +28,7 @@ obj-y += mac_oldworld.o # NewWorld PowerMac obj-y += mac_newworld.o # e500 -obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o +# PowerPC 440 Xilinx ML507 reference board. +obj-y += virtex_ml507.o diff --git a/hw/ppc/e500-ccsr.h b/hw/ppc/e500-ccsr.h index f20f51b..12a2ba4 100644 --- a/hw/ppc/e500-ccsr.h +++ b/hw/ppc/e500-ccsr.h @@ -1,7 +1,7 @@ #ifndef E500_CCSR_H #define E500_CCSR_H -#include "../sysbus.h" +#include "hw/sysbus.h" typedef struct PPCE500CCSRState { /*< private >*/ diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 25ac4b1..4b30575 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -12,7 +12,7 @@ #include "config.h" #include "qemu-common.h" #include "e500.h" -#include "../boards.h" +#include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/pci/pci.h" #include "hw/openpic.h" diff --git a/hw/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index 728723c..193beab 100644 --- a/hw/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -17,9 +17,9 @@ * */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #define MPC8544_GUTS_MMIO_SIZE 0x1000 #define MPC8544_GUTS_RSTCR_RESET 0x02 diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index e25c70b..cf29788 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -12,7 +12,7 @@ #include "config.h" #include "qemu-common.h" #include "e500.h" -#include "../boards.h" +#include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/openpic.h" @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc.h" +#include "hw/hw.h" +#include "hw/ppc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "nvram.h" +#include "hw/nvram.h" #include "qemu/log.h" -#include "loader.h" +#include "hw/loader.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" diff --git a/hw/ppc405_boards.c b/hw/ppc/ppc405_boards.c index cf371db..ba443cf 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -21,16 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc.h" -#include "ppc405.h" -#include "nvram.h" -#include "flash.h" +#include "hw/hw.h" +#include "hw/ppc.h" +#include "hw/ppc405.h" +#include "hw/nvram.h" +#include "hw/flash.h" #include "sysemu/sysemu.h" #include "block/block.h" -#include "boards.h" +#include "hw/boards.h" #include "qemu/log.h" -#include "loader.h" +#include "hw/loader.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/ppc405_uc.c b/hw/ppc/ppc405_uc.c index d8cbe87..8465f6d 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc.h" -#include "ppc405.h" -#include "serial.h" +#include "hw/hw.h" +#include "hw/ppc.h" +#include "hw/ppc405.h" +#include "hw/serial.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 73b5ac7..66911b5 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -14,20 +14,20 @@ #include "config.h" #include "qemu-common.h" #include "net/net.h" -#include "hw.h" -#include "pci/pci.h" -#include "boards.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/boards.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" #include "sysemu/device_tree.h" -#include "loader.h" +#include "hw/loader.h" #include "elf.h" #include "exec/address-spaces.h" -#include "serial.h" -#include "ppc.h" -#include "ppc405.h" +#include "hw/serial.h" +#include "hw/ppc.h" +#include "hw/ppc405.h" #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #define BINARY_DEVICE_TREE_FILE "bamboo.dtb" diff --git a/hw/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index b6bb0e1..49ec728 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc.h" -#include "ppc4xx.h" +#include "hw/hw.h" +#include "hw/ppc.h" +#include "hw/ppc4xx.h" #include "qemu/log.h" #include "exec/address-spaces.h" diff --git a/hw/ppc_booke.c b/hw/ppc/ppc_booke.c index 25a4e91..30375c0 100644 --- a/hw/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc.h" +#include "hw/hw.h" +#include "hw/ppc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "nvram.h" +#include "hw/nvram.h" #include "qemu/log.h" -#include "loader.h" +#include "hw/loader.h" /* Timer Control Register */ diff --git a/hw/ppce500_spin.c b/hw/ppc/ppce500_spin.c index 5bdce52..d904fbe 100644 --- a/hw/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -27,9 +27,9 @@ * */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/kvm.h" #define MAX_CPUS 32 diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index e06dded..2920911 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -567,7 +567,6 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) dev = qdev_create(NULL, "raven-pcihost"); pcihost = PCI_HOST_BRIDGE(dev); - pcihost->address_space = get_system_memory(); object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NULL); qdev_init_nofail(dev); pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0"); diff --git a/hw/spapr.c b/hw/ppc/spapr.c index fadf70f..fd24113 100644 --- a/hw/spapr.c +++ b/hw/ppc/spapr.c @@ -25,7 +25,7 @@ * */ #include "sysemu/sysemu.h" -#include "hw.h" +#include "hw/hw.h" #include "elf.h" #include "net/net.h" #include "sysemu/blockdev.h" @@ -45,7 +45,7 @@ #include "sysemu/kvm.h" #include "kvm_ppc.h" -#include "pci/pci.h" +#include "hw/pci/pci.h" #include "exec/address-spaces.h" #include "hw/usb.h" diff --git a/hw/spapr_events.c b/hw/ppc/spapr_events.c index ce78f09..ce78f09 100644 --- a/hw/spapr_events.c +++ b/hw/ppc/spapr_events.c diff --git a/hw/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 77c052f..77c052f 100644 --- a/hw/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c diff --git a/hw/spapr_iommu.c b/hw/ppc/spapr_iommu.c index d8a098c..8d500bf 100644 --- a/hw/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -16,9 +16,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/kvm.h" -#include "qdev.h" +#include "hw/qdev.h" #include "kvm_ppc.h" #include "sysemu/dma.h" #include "exec/address-spaces.h" diff --git a/hw/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 5ec787f..5ec787f 100644 --- a/hw/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c diff --git a/hw/spapr_vio.c b/hw/ppc/spapr_vio.c index 34c9ca6..6eb3ab5 100644 --- a/hw/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -19,11 +19,11 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "sysemu/sysemu.h" -#include "boards.h" +#include "hw/boards.h" #include "monitor/monitor.h" -#include "loader.h" +#include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" diff --git a/hw/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 8c4e8e4..41eab16 100644 --- a/hw/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -22,25 +22,25 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" -#include "serial.h" -#include "flash.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/serial.h" +#include "hw/flash.h" #include "sysemu/sysemu.h" -#include "devices.h" -#include "boards.h" +#include "hw/devices.h" +#include "hw/boards.h" #include "sysemu/device_tree.h" -#include "loader.h" +#include "hw/loader.h" #include "elf.h" #include "qemu/log.h" #include "exec/address-spaces.h" -#include "ppc.h" -#include "ppc4xx.h" -#include "ppc405.h" +#include "hw/ppc.h" +#include "hw/ppc4xx.h" +#include "hw/ppc405.h" #include "sysemu/blockdev.h" -#include "xilinx.h" +#include "hw/xilinx.h" #define EPAPR_MAGIC (0x45504150) #define FLASH_SIZE (16 * 1024 * 1024) diff --git a/hw/xics.c b/hw/ppc/xics.c index 9ef0d61..c3ef12f 100644 --- a/hw/xics.c +++ b/hw/ppc/xics.c @@ -25,7 +25,7 @@ * */ -#include "hw.h" +#include "hw/hw.h" #include "trace.h" #include "hw/spapr.h" #include "hw/xics.h" diff --git a/hw/ppc405.h b/hw/ppc405.h index 535cbfb..45c2159 100644 --- a/hw/ppc405.h +++ b/hw/ppc405.h @@ -25,7 +25,7 @@ #if !defined(PPC_405_H) #define PPC_405_H -#include "ppc4xx.h" +#include "hw/ppc4xx.h" /* Bootinfo as set-up by u-boot */ typedef struct ppc4xx_bd_info_t ppc4xx_bd_info_t; diff --git a/hw/ppc4xx.h b/hw/ppc4xx.h index 59dba9e..91d84ba 100644 --- a/hw/ppc4xx.h +++ b/hw/ppc4xx.h @@ -25,7 +25,7 @@ #if !defined(PPC_4XX_H) #define PPC_4XX_H -#include "pci/pci.h" +#include "hw/pci/pci.h" /* PowerPC 4xx core initialization */ PowerPCCPU *ppc4xx_init(const char *cpu_model, diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index ba2d669..f3bbe88 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -19,11 +19,11 @@ /* This file implements emulation of the 32-bit PCI controller found in some * 4xx SoCs, such as the 440EP. */ -#include "hw.h" -#include "ppc.h" -#include "ppc4xx.h" -#include "pci/pci.h" -#include "pci/pci_host.h" +#include "hw/hw.h" +#include "hw/ppc.h" +#include "hw/ppc4xx.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "exec/address-spaces.h" #undef DEBUG diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 1e1ade3..310ae1c 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -14,12 +14,12 @@ * (at your option) any later version. */ -#include "hw.h" +#include "hw/hw.h" #include "hw/ppc/e500-ccsr.h" -#include "pci/pci.h" -#include "pci/pci_host.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "qemu/bswap.h" -#include "ppce500_pci.h" +#include "hw/ppce500_pci.h" #ifdef DEBUG_PCI #define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__) diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 52ee5d9..d21e876 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -23,11 +23,11 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "pci/pci.h" -#include "pci/pci_bus.h" -#include "pci/pci_host.h" -#include "pc.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" +#include "hw/pci/pci_host.h" +#include "hw/pc.h" #include "exec/address-spaces.h" #define TYPE_RAVEN_PCI_DEVICE "raven" @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ps2.h" +#include "hw/hw.h" +#include "hw/ps2.h" #include "ui/console.h" #include "sysemu/sysemu.h" diff --git a/hw/ptimer.c b/hw/ptimer.c index 24af6a2..4bc96c9 100644 --- a/hw/ptimer.c +++ b/hw/ptimer.c @@ -5,9 +5,9 @@ * * This code is licensed under the GNU LGPL. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "qemu/host-utils.h" struct ptimer_state diff --git a/hw/puv3_dma.c b/hw/puv3_dma.c index 9de63b4..c05a14e 100644 --- a/hw/puv3_dma.c +++ b/hw/puv3_dma.c @@ -8,11 +8,11 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "puv3.h" +#include "hw/puv3.h" #define PUV3_DMA_CH_NR (6) #define PUV3_DMA_CH_MASK (0xff) diff --git a/hw/puv3_gpio.c b/hw/puv3_gpio.c index 152248d..b2a790b 100644 --- a/hw/puv3_gpio.c +++ b/hw/puv3_gpio.c @@ -8,11 +8,11 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "puv3.h" +#include "hw/puv3.h" typedef struct { SysBusDevice busdev; diff --git a/hw/puv3_intc.c b/hw/puv3_intc.c index 07f5649..6bc9e1a 100644 --- a/hw/puv3_intc.c +++ b/hw/puv3_intc.c @@ -8,10 +8,10 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ -#include "sysbus.h" +#include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "puv3.h" +#include "hw/puv3.h" typedef struct { SysBusDevice busdev; diff --git a/hw/puv3_ost.c b/hw/puv3_ost.c index 14c6f21..10a522a 100644 --- a/hw/puv3_ost.c +++ b/hw/puv3_ost.c @@ -8,11 +8,11 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ -#include "sysbus.h" -#include "ptimer.h" +#include "hw/sysbus.h" +#include "hw/ptimer.h" #undef DEBUG_PUV3 -#include "puv3.h" +#include "hw/puv3.h" /* puv3 ostimer implementation. */ typedef struct { diff --git a/hw/puv3_pm.c b/hw/puv3_pm.c index 87a687a..6b8d94d 100644 --- a/hw/puv3_pm.c +++ b/hw/puv3_pm.c @@ -8,11 +8,11 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ -#include "hw.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "puv3.h" +#include "hw/puv3.h" typedef struct { SysBusDevice busdev; diff --git a/hw/pxa2xx_dma.c b/hw/pxa2xx_dma.c index c0dba45..1db21c9 100644 --- a/hw/pxa2xx_dma.c +++ b/hw/pxa2xx_dma.c @@ -8,9 +8,9 @@ * This code is licensed under the GPL. */ -#include "hw.h" -#include "pxa.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/sysbus.h" #define PXA255_DMA_NUM_CHANNELS 16 #define PXA27X_DMA_NUM_CHANNELS 32 diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c index 4ff04ad..32ea7a5 100644 --- a/hw/pxa2xx_keypad.c +++ b/hw/pxa2xx_keypad.c @@ -11,8 +11,8 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pxa.h" +#include "hw/hw.h" +#include "hw/pxa.h" #include "ui/console.h" /* diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c index 512a27e..6484d27 100644 --- a/hw/pxa2xx_lcd.c +++ b/hw/pxa2xx_lcd.c @@ -10,13 +10,13 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "pxa.h" +#include "hw/pxa.h" #include "ui/pixel_ops.h" /* FIXME: For graphic_rotate. Should probably be done in common code. */ #include "sysemu/sysemu.h" -#include "framebuffer.h" +#include "hw/framebuffer.h" struct DMAChannel { uint32_t branch; @@ -976,15 +976,15 @@ static const VMStateDescription vmstate_pxa2xx_lcdc = { }; #define BITS 8 -#include "pxa2xx_template.h" +#include "hw/pxa2xx_template.h" #define BITS 15 -#include "pxa2xx_template.h" +#include "hw/pxa2xx_template.h" #define BITS 16 -#include "pxa2xx_template.h" +#include "hw/pxa2xx_template.h" #define BITS 24 -#include "pxa2xx_template.h" +#include "hw/pxa2xx_template.h" #define BITS 32 -#include "pxa2xx_template.h" +#include "hw/pxa2xx_template.h" PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, hwaddr base, qemu_irq irq) diff --git a/hw/pxa2xx_mmci.c b/hw/pxa2xx_mmci.c index 3589968..0df83cc 100644 --- a/hw/pxa2xx_mmci.c +++ b/hw/pxa2xx_mmci.c @@ -10,10 +10,10 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pxa.h" -#include "sd.h" -#include "qdev.h" +#include "hw/hw.h" +#include "hw/pxa.h" +#include "hw/sd.h" +#include "hw/qdev.h" struct PXA2xxMMCIState { MemoryRegion iomem; diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c index 3a79c72..66fefba 100644 --- a/hw/pxa2xx_pcmcia.c +++ b/hw/pxa2xx_pcmcia.c @@ -10,9 +10,9 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "pcmcia.h" -#include "pxa.h" +#include "hw/hw.h" +#include "hw/pcmcia.h" +#include "hw/pxa.h" struct PXA2xxPCMCIAState { diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c index 5c9d2e8..c173fe4 100644 --- a/hw/pxa2xx_timer.c +++ b/hw/pxa2xx_timer.c @@ -7,11 +7,11 @@ * This code is licensed under the GPL. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "pxa.h" -#include "sysbus.h" +#include "hw/pxa.h" +#include "hw/sysbus.h" #define OSMR0 0x00 #define OSMR1 0x04 @@ -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) \ diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c index b4388f6..2398b4a 100644 --- a/hw/qdev-addr.c +++ b/hw/qdev-addr.c @@ -1,6 +1,7 @@ -#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" /* --- target physical address --- */ diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c index ce3af22..8795144 100644 --- a/hw/qdev-properties-system.c +++ b/hw/qdev-properties-system.c @@ -11,7 +11,7 @@ */ #include "net/net.h" -#include "qdev.h" +#include "hw/qdev.h" #include "qapi/qmp/qerror.h" #include "sysemu/blockdev.h" #include "hw/block-common.h" diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index a8a31f5..0307a78 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -1,5 +1,5 @@ #include "net/net.h" -#include "qdev.h" +#include "hw/qdev.h" #include "qapi/qmp/qerror.h" #include "sysemu/blockdev.h" #include "hw/block-common.h" diff --git a/hw/qdev-properties.h b/hw/qdev-properties.h index 20c67f3..0b0465c 100644 --- a/hw/qdev-properties.h +++ b/hw/qdev-properties.h @@ -1,7 +1,7 @@ #ifndef QEMU_QDEV_PROPERTIES_H #define QEMU_QDEV_PROPERTIES_H -#include "qdev-core.h" +#include "hw/qdev-core.h" /*** qdev-properties.c ***/ @@ -25,9 +25,10 @@ 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" #include "qapi/visitor.h" int qdev_hotplug = 0; @@ -2,8 +2,7 @@ #define QDEV_H #include "hw/hw.h" -#include "qdev-core.h" -#include "qdev-properties.h" -#include "qdev-monitor.h" +#include "hw/qdev-core.h" +#include "hw/qdev-properties.h" #endif diff --git a/hw/qxl-logger.c b/hw/qxl-logger.c index 3cd85d9..84f9aa1 100644 --- a/hw/qxl-logger.c +++ b/hw/qxl-logger.c @@ -20,7 +20,7 @@ */ #include "qemu/timer.h" -#include "qxl.h" +#include "hw/qxl.h" static const char *qxl_type[] = { [ QXL_CMD_NOP ] = "nop", diff --git a/hw/qxl-render.c b/hw/qxl-render.c index 455fb91..d77df42 100644 --- a/hw/qxl-render.c +++ b/hw/qxl-render.c @@ -19,7 +19,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "qxl.h" +#include "hw/qxl.h" static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) { @@ -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" diff --git a/hw/rc4030.c b/hw/rc4030.c index a0358a3..b065515 100644 --- a/hw/rc4030.c +++ b/hw/rc4030.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" +#include "hw/hw.h" +#include "hw/mips.h" #include "qemu/timer.h" /********************************************************/ diff --git a/hw/realview_gic.c b/hw/realview_gic.c index 8f2a7e2..0ec30ca 100644 --- a/hw/realview_gic.c +++ b/hw/realview_gic.c @@ -7,7 +7,7 @@ * This code is licensed under the GPL. */ -#include "sysbus.h" +#include "hw/sysbus.h" typedef struct { SysBusDevice busdev; diff --git a/hw/rtl8139.c b/hw/rtl8139.c index d7716be..786b875 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -51,12 +51,12 @@ /* For crc32 */ #include <zlib.h> -#include "hw.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" #include "sysemu/dma.h" #include "qemu/timer.h" #include "net/net.h" -#include "loader.h" +#include "hw/loader.h" #include "sysemu/sysemu.h" #include "qemu/iov.h" diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 6b56995..0faade0 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -18,8 +18,8 @@ #include "monitor/monitor.h" #include "sysemu/sysemu.h" -#include "sclp.h" -#include "event-facility.h" +#include "hw/s390x/sclp.h" +#include "hw/s390x/event-facility.h" typedef struct EventTypesBus { BusState qbus; diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 6549211..d436414 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -12,7 +12,7 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "s390-virtio.h" -#include "sclp.h" +#include "hw/s390x/sclp.h" #include "ioinst.h" #include "css.h" #include "virtio-ccw.h" diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index a9d3a6a..86d6ae0 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -16,7 +16,7 @@ #include "sysemu/kvm.h" #include "exec/memory.h" -#include "sclp.h" +#include "hw/s390x/sclp.h" static inline S390SCLPDevice *get_event_facility(void) { diff --git a/hw/s390x/sclpconsole.c b/hw/s390x/sclpconsole.c index effe511..5c881e5 100644 --- a/hw/s390x/sclpconsole.c +++ b/hw/s390x/sclpconsole.c @@ -14,9 +14,10 @@ #include <hw/qdev.h> #include "qemu/thread.h" +#include "qemu/error-report.h" -#include "sclp.h" -#include "event-facility.h" +#include "hw/s390x/sclp.h" +#include "hw/s390x/event-facility.h" #include "char/char.h" typedef struct ASCIIConsoleData { diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 2538498..5fadc86 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -13,8 +13,8 @@ */ #include <hw/qdev.h> #include "sysemu/sysemu.h" -#include "sclp.h" -#include "event-facility.h" +#include "hw/s390x/sclp.h" +#include "hw/s390x/event-facility.h" typedef struct SignalQuiesce { EventBufferHeader ebh; @@ -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 diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index a97f1cd..08787c2 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1,8 +1,8 @@ -#include "hw.h" +#include "hw/hw.h" #include "qemu/error-report.h" -#include "scsi.h" -#include "scsi-defs.h" -#include "qdev.h" +#include "hw/scsi.h" +#include "hw/scsi-defs.h" +#include "hw/qdev.h" #include "sysemu/blockdev.h" #include "trace.h" #include "sysemu/dma.h" @@ -1508,6 +1508,10 @@ void scsi_req_unref(SCSIRequest *req) will start the next chunk or complete the command. */ void scsi_req_continue(SCSIRequest *req) { + if (req->io_canceled) { + trace_scsi_req_continue_canceled(req->dev->id, req->lun, req->tag); + return; + } trace_scsi_req_continue(req->dev->id, req->lun, req->tag); if (req->cmd.mode == SCSI_XFER_TO_DEV) { req->ops->write_data(req); diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index d411586..c5c7bf3 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -30,8 +30,8 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #include "qemu-common.h" #include "qemu/error-report.h" -#include "scsi.h" -#include "scsi-defs.h" +#include "hw/scsi.h" +#include "hw/scsi-defs.h" #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" #include "hw/block-common.h" @@ -178,6 +178,9 @@ static void scsi_aio_complete(void *opaque, int ret) assert(r->req.aiocb != NULL); r->req.aiocb = NULL; bdrv_acct_done(s->qdev.conf.bs, &r->acct); + if (r->req.io_canceled) { + goto done; + } if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { @@ -223,6 +226,10 @@ static void scsi_write_do_fua(SCSIDiskReq *r) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + if (r->req.io_canceled) { + goto done; + } + if (scsi_is_cmd_fua(&r->req.cmd)) { bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH); r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_aio_complete, r); @@ -230,6 +237,8 @@ static void scsi_write_do_fua(SCSIDiskReq *r) } scsi_req_complete(&r->req, GOOD); + +done: if (!r->req.io_canceled) { scsi_req_unref(&r->req); } @@ -243,6 +252,9 @@ static void scsi_dma_complete(void *opaque, int ret) assert(r->req.aiocb != NULL); r->req.aiocb = NULL; bdrv_acct_done(s->qdev.conf.bs, &r->acct); + if (r->req.io_canceled) { + goto done; + } if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { @@ -274,6 +286,9 @@ static void scsi_read_complete(void * opaque, int ret) assert(r->req.aiocb != NULL); r->req.aiocb = NULL; bdrv_acct_done(s->qdev.conf.bs, &r->acct); + if (r->req.io_canceled) { + goto done; + } if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { @@ -305,6 +320,9 @@ static void scsi_do_read(void *opaque, int ret) r->req.aiocb = NULL; bdrv_acct_done(s->qdev.conf.bs, &r->acct); } + if (r->req.io_canceled) { + goto done; + } if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { @@ -312,10 +330,6 @@ static void scsi_do_read(void *opaque, int ret) } } - if (r->req.io_canceled) { - return; - } - /* The request is used as the AIO opaque value, so add a ref. */ scsi_req_ref(&r->req); @@ -423,6 +437,9 @@ static void scsi_write_complete(void * opaque, int ret) r->req.aiocb = NULL; bdrv_acct_done(s->qdev.conf.bs, &r->acct); } + if (r->req.io_canceled) { + goto done; + } if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { @@ -1478,13 +1495,17 @@ static void scsi_unmap_complete(void *opaque, int ret) uint32_t nb_sectors; r->req.aiocb = NULL; + if (r->req.io_canceled) { + goto done; + } + if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { goto done; } } - if (data->count > 0 && !r->req.io_canceled) { + if (data->count > 0) { sector_num = ldq_be_p(&data->inbuf[0]); nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; if (!check_lba_range(s, sector_num, nb_sectors)) { @@ -1501,10 +1522,9 @@ static void scsi_unmap_complete(void *opaque, int ret) return; } + scsi_req_complete(&r->req, GOOD); + done: - if (data->count == 0) { - scsi_req_complete(&r->req, GOOD); - } if (!r->req.io_canceled) { scsi_req_unref(&r->req); } diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 8175474..4d04cac 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -13,7 +13,7 @@ #include "qemu-common.h" #include "qemu/error-report.h" -#include "scsi.h" +#include "hw/scsi.h" #include "sysemu/blockdev.h" #ifdef __linux__ @@ -35,7 +35,7 @@ do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0) #include <sys/stat.h> #include <unistd.h> #include <scsi/sg.h> -#include "scsi-defs.h" +#include "hw/scsi-defs.h" #define SCSI_SENSE_BUF_SIZE 96 @@ -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 @@ -26,8 +26,8 @@ #define SDHCI_H #include "qemu-common.h" -#include "sysbus.h" -#include "sd.h" +#include "hw/sysbus.h" +#include "hw/sd.h" /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 diff --git a/hw/serial-isa.c b/hw/serial-isa.c index 5a6f51f..a630a7d 100644 --- a/hw/serial-isa.c +++ b/hw/serial-isa.c @@ -23,8 +23,8 @@ * THE SOFTWARE. */ -#include "serial.h" -#include "isa.h" +#include "hw/serial.h" +#include "hw/isa.h" typedef struct ISASerialState { ISADevice dev; diff --git a/hw/serial-pci.c b/hw/serial-pci.c index 1c31353..954657b 100644 --- a/hw/serial-pci.c +++ b/hw/serial-pci.c @@ -25,8 +25,8 @@ /* see docs/specs/pci-serial.txt */ -#include "serial.h" -#include "pci/pci.h" +#include "hw/serial.h" +#include "hw/pci/pci.h" #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/serial.c b/hw/serial.c index eb38f22..48a5eb6 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "serial.h" +#include "hw/serial.h" #include "char/char.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/hw/serial.h b/hw/serial.h index e57375d..e884499 100644 --- a/hw/serial.h +++ b/hw/serial.h @@ -25,7 +25,7 @@ #ifndef HW_SERIAL_H #define HW_SERIAL_H 1 -#include "hw.h" +#include "hw/hw.h" #include "sysemu/sysemu.h" #include "exec/memory.h" @@ -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) diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 68c5921..72b6a1f 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,5 +1,9 @@ -obj-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o +obj-y = tc58128.o obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o obj-y += ide/mmio.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += shix.o r2d.o + +obj-y += sh7750.o sh7750_regnames.o @@ -23,19 +23,19 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" -#include "sh.h" -#include "devices.h" +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/sh.h" +#include "hw/devices.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "pci/pci.h" +#include "hw/boards.h" +#include "hw/pci/pci.h" #include "net/net.h" -#include "sh7750_regs.h" -#include "ide.h" -#include "loader.h" -#include "usb.h" -#include "flash.h" +#include "hw/sh7750_regs.h" +#include "hw/ide.h" +#include "hw/loader.h" +#include "hw/usb.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/sh7750.c b/hw/sh4/sh7750.c index 666f865..6778c94 100644 --- a/hw/sh7750.c +++ b/hw/sh4/sh7750.c @@ -23,12 +23,12 @@ * THE SOFTWARE. */ #include <stdio.h> -#include "hw.h" -#include "sh.h" +#include "hw/hw.h" +#include "hw/sh.h" #include "sysemu/sysemu.h" -#include "sh7750_regs.h" -#include "sh7750_regnames.h" -#include "sh_intc.h" +#include "hw/sh7750_regs.h" +#include "hw/sh7750_regnames.h" +#include "hw/sh_intc.h" #include "cpu.h" #include "exec/address-spaces.h" diff --git a/hw/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c index 5a5a2d8..389698d 100644 --- a/hw/sh7750_regnames.c +++ b/hw/sh4/sh7750_regnames.c @@ -1,7 +1,7 @@ -#include "hw.h" -#include "sh.h" -#include "sh7750_regs.h" -#include "sh7750_regnames.h" +#include "hw/hw.h" +#include "hw/sh.h" +#include "hw/sh7750_regs.h" +#include "hw/sh7750_regnames.h" #define REGNAME(r) {r, #r}, diff --git a/hw/shix.c b/hw/sh4/shix.c index 6f2d55a..192579d 100644 --- a/hw/shix.c +++ b/hw/sh4/shix.c @@ -27,11 +27,11 @@ More information in target-sh4/README.sh4 */ -#include "hw.h" -#include "sh.h" +#include "hw/hw.h" +#include "hw/sh.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "exec/address-spaces.h" #define BIOS_FILENAME "shix_bios.bin" diff --git a/hw/sh_intc.c b/hw/sh_intc.c index c3f77d5..9e64e4d 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -8,9 +8,9 @@ * This code is licensed under the GPL. */ -#include "sh_intc.h" -#include "hw.h" -#include "sh.h" +#include "hw/sh_intc.h" +#include "hw/hw.h" +#include "hw/sh.h" //#define DEBUG_INTC //#define DEBUG_INTC_SOURCES diff --git a/hw/sh_intc.h b/hw/sh_intc.h index 6f11bee..b7ddcb0 100644 --- a/hw/sh_intc.h +++ b/hw/sh_intc.h @@ -2,7 +2,7 @@ #define __SH_INTC_H__ #include "qemu-common.h" -#include "irq.h" +#include "hw/irq.h" #include "exec/address-spaces.h" typedef unsigned char intc_enum; diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 077d957..96535db 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "sysbus.h" -#include "sh.h" -#include "pci/pci.h" -#include "pci/pci_host.h" +#include "hw/sysbus.h" +#include "hw/sh.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "qemu/bswap.h" #include "exec/address-spaces.h" diff --git a/hw/sh_serial.c b/hw/sh_serial.c index 21c5b13..40e797c 100644 --- a/hw/sh_serial.c +++ b/hw/sh_serial.c @@ -24,8 +24,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "sh.h" +#include "hw/hw.h" +#include "hw/sh.h" #include "char/char.h" #include "exec/address-spaces.h" diff --git a/hw/sh_timer.c b/hw/sh_timer.c index 64ea23f..b450323 100644 --- a/hw/sh_timer.c +++ b/hw/sh_timer.c @@ -8,11 +8,11 @@ * This code is licensed under the GPL. */ -#include "hw.h" -#include "sh.h" +#include "hw/hw.h" +#include "hw/sh.h" #include "qemu/timer.h" #include "exec/address-spaces.h" -#include "ptimer.h" +#include "hw/ptimer.h" //#define DEBUG_TIMER diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index 136ceeb..b60592b 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -#include "sun4m.h" +#include "hw/sun4m.h" #include "monitor/monitor.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" //#define DEBUG_IRQ_COUNT diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index af24cc1..a7a9368 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -23,7 +23,7 @@ */ #include "sysemu/sysemu.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" /* diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index 68a4c0c..83f22a0 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -#include "sun4m.h" +#include "hw/sun4m.h" #include "qemu/timer.h" -#include "ptimer.h" -#include "sysbus.h" +#include "hw/ptimer.h" +#include "hw/sysbus.h" #include "trace.h" /* @@ -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, @@ -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) \ diff --git a/hw/smbus_eeprom.c b/hw/smbus_eeprom.c index d36dc7b..dff8403d 100644 --- a/hw/smbus_eeprom.c +++ b/hw/smbus_eeprom.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "i2c.h" -#include "smbus.h" +#include "hw/hw.h" +#include "hw/i2c.h" +#include "hw/smbus.h" //#define DEBUG diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c index 16db3a7..732ebd3 100644 --- a/hw/smbus_ich9.c +++ b/hw/smbus_ich9.c @@ -24,15 +24,15 @@ * GNU GPL, version 2 or (at your option) any later version. * */ -#include "hw.h" -#include "pc.h" -#include "pm_smbus.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pm_smbus.h" +#include "hw/pci/pci.h" #include "sysemu/sysemu.h" -#include "i2c.h" -#include "smbus.h" +#include "hw/i2c.h" +#include "hw/smbus.h" -#include "ich9.h" +#include "hw/ich9.h" #define TYPE_ICH9_SMB_DEVICE "ICH9 SMB" #define ICH9_SMB_DEVICE(obj) \ diff --git a/hw/smc91c111.c b/hw/smc91c111.c index 67fd074..c2feae6 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -7,9 +7,9 @@ * This code is licensed under the GPL */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" -#include "devices.h" +#include "hw/devices.h" /* For crc32 */ #include <zlib.h> diff --git a/hw/soc_dma.c b/hw/soc_dma.c index 64e8ee1..db5d609 100644 --- a/hw/soc_dma.c +++ b/hw/soc_dma.c @@ -19,7 +19,7 @@ */ #include "qemu-common.h" #include "qemu/timer.h" -#include "soc_dma.h" +#include "hw/soc_dma.h" static void transfer_mem2mem(struct soc_dma_ch_s *ch) { diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c index 0ace2eb..19701e7 100644 --- a/hw/spapr_llan.c +++ b/hw/spapr_llan.c @@ -24,7 +24,7 @@ * THE SOFTWARE. * */ -#include "hw.h" +#include "hw/hw.h" #include "net/net.h" #include "hw/qdev.h" #include "hw/spapr.h" diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 4eacbcf..36adbc5 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pci/pci.h" -#include "pci/msi.h" -#include "pci/msix.h" -#include "pci/pci_host.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/pci/msix.h" +#include "hw/pci/pci_host.h" #include "hw/spapr.h" #include "hw/spapr_pci.h" #include "exec/address-spaces.h" diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c index 7fc0e13..2794094 100644 --- a/hw/spapr_vscsi.c +++ b/hw/spapr_vscsi.c @@ -31,10 +31,10 @@ * - Add indirect descriptors support * - Maybe do autosense (PAPR seems to mandate it, linux doesn't care) */ -#include "hw.h" -#include "scsi.h" -#include "scsi-defs.h" -#include "srp.h" +#include "hw/hw.h" +#include "hw/scsi.h" +#include "hw/scsi-defs.h" +#include "hw/srp.h" #include "hw/qdev.h" #include "hw/spapr.h" #include "hw/spapr_vio.h" diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c index 5c63eaa..be08571 100644 --- a/hw/spapr_vty.c +++ b/hw/spapr_vty.c @@ -1,4 +1,4 @@ -#include "qdev.h" +#include "hw/qdev.h" #include "char/char.h" #include "hw/spapr.h" #include "hw/spapr_vio.h" diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index a39a511..71bbddf 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1,8 +1,10 @@ -obj-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o +obj-y = lance.o tcx.o sun4m_iommu.o slavio_intctl.o obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o -obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o +obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o # GRLIB obj-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += sun4m.o leon3.o diff --git a/hw/leon3.c b/hw/sparc/leon3.c index f16a8bb..f58061f 100644 --- a/hw/leon3.c +++ b/hw/sparc/leon3.c @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "char/char.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "trace.h" #include "exec/address-spaces.h" -#include "grlib.h" +#include "hw/grlib.h" /* Default system clock. */ #define CPU_CLK (40 * 1000 * 1000) diff --git a/hw/sun4m.c b/hw/sparc/sun4m.c index 9903f44..37bd041 100644 --- a/hw/sun4m.c +++ b/hw/sparc/sun4m.c @@ -21,24 +21,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" -#include "sun4m.h" -#include "nvram.h" -#include "sparc32_dma.h" -#include "fdc.h" +#include "hw/sun4m.h" +#include "hw/nvram.h" +#include "hw/sparc32_dma.h" +#include "hw/fdc.h" #include "sysemu/sysemu.h" #include "net/net.h" -#include "boards.h" -#include "firmware_abi.h" -#include "esp.h" -#include "pc.h" -#include "isa.h" -#include "fw_cfg.h" -#include "escc.h" -#include "empty_slot.h" -#include "qdev-addr.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/firmware_abi.h" +#include "hw/esp.h" +#include "hw/pc.h" +#include "hw/isa.h" +#include "hw/fw_cfg.h" +#include "hw/escc.h" +#include "hw/empty_slot.h" +#include "hw/qdev-addr.h" +#include "hw/loader.h" #include "elf.h" #include "sysemu/blockdev.h" #include "trace.h" diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c index 6d0df51..18e368e 100644 --- a/hw/sparc32_dma.c +++ b/hw/sparc32_dma.c @@ -25,10 +25,10 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "sparc32_dma.h" -#include "sun4m.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sparc32_dma.h" +#include "hw/sun4m.h" +#include "hw/sysbus.h" #include "trace.h" /* diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index 8c65fc4..4df0d90 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1,4 +1,6 @@ -obj-y = sun4u.o apb_pci.o +obj-y = apb_pci.o obj-y += mc146818rtc.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += sun4u.o diff --git a/hw/sun4u.c b/hw/sparc64/sun4u.c index 9fbda29..51ffa1c 100644 --- a/hw/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -21,22 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pci/pci.h" -#include "apb_pci.h" -#include "pc.h" -#include "serial.h" -#include "nvram.h" -#include "fdc.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/apb_pci.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/nvram.h" +#include "hw/fdc.h" #include "net/net.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "boards.h" -#include "firmware_abi.h" -#include "fw_cfg.h" -#include "sysbus.h" -#include "ide.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/firmware_abi.h" +#include "hw/fw_cfg.h" +#include "hw/sysbus.h" +#include "hw/ide.h" +#include "hw/loader.h" #include "elf.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/ssd0303.c b/hw/ssd0303.c index 8777b16..db50909 100644 --- a/hw/ssd0303.c +++ b/hw/ssd0303.c @@ -10,7 +10,7 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ -#include "i2c.h" +#include "hw/i2c.h" #include "ui/console.h" //#define DEBUG_SSD0303 1 diff --git a/hw/ssd0323.c b/hw/ssd0323.c index 84c86a5..27b4151 100644 --- a/hw/ssd0323.c +++ b/hw/ssd0323.c @@ -10,7 +10,7 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ -#include "ssi.h" +#include "hw/ssi.h" #include "ui/console.h" //#define DEBUG_SSD0323 1 diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c index dca8906..4d3c4f6 100644 --- a/hw/ssi-sd.c +++ b/hw/ssi-sd.c @@ -11,8 +11,8 @@ */ #include "sysemu/blockdev.h" -#include "ssi.h" -#include "sd.h" +#include "hw/ssi.h" +#include "hw/sd.h" //#define DEBUG_SSI_SD 1 @@ -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; diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index 6c701fb..59b8456 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -6,7 +6,7 @@ * * This code is licensed under the GPL. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "net/net.h" #include <zlib.h> diff --git a/hw/stellaris_input.c b/hw/stellaris_input.c index 7a95c3f..4e40792 100644 --- a/hw/stellaris_input.c +++ b/hw/stellaris_input.c @@ -6,8 +6,8 @@ * * This code is licensed under the GPL. */ -#include "hw.h" -#include "devices.h" +#include "hw/hw.h" +#include "hw/devices.h" #include "ui/console.h" typedef struct { diff --git a/hw/stream.c b/hw/stream.c index d4cf84d..a07d6a5 100644 --- a/hw/stream.c +++ b/hw/stream.c @@ -1,4 +1,4 @@ -#include "stream.h" +#include "hw/stream.h" void stream_push(StreamSlave *sink, uint8_t *buf, size_t len, uint32_t *app) diff --git a/hw/strongarm.c b/hw/strongarm.c index ab736e3..49f9577 100644 --- a/hw/strongarm.c +++ b/hw/strongarm.c @@ -26,13 +26,13 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "sysbus.h" -#include "strongarm.h" +#include "hw/sysbus.h" +#include "hw/strongarm.h" #include "qemu/error-report.h" -#include "arm-misc.h" +#include "hw/arm-misc.h" #include "char/char.h" #include "sysemu/sysemu.h" -#include "ssi.h" +#include "hw/ssi.h" //#define DEBUG diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c index f8f4d02..9d443d1 100644 --- a/hw/sun4c_intctl.c +++ b/hw/sun4c_intctl.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "sun4m.h" +#include "hw/hw.h" +#include "hw/sun4m.h" #include "monitor/monitor.h" -#include "sysbus.h" +#include "hw/sysbus.h" //#define DEBUG_IRQ_COUNT //#define DEBUG_IRQ @@ -31,6 +31,6 @@ void sun4m_pic_info(Monitor *mon, const QDict *qdict); void sun4m_irq_info(Monitor *mon, const QDict *qdict); /* sparc32_dma.c */ -#include "sparc32_dma.h" +#include "hw/sparc32_dma.h" #endif diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c index 8f9635f..33e77b0 100644 --- a/hw/sun4m_iommu.c +++ b/hw/sun4m_iommu.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "sun4m.h" -#include "sysbus.h" +#include "hw/sun4m.h" +#include "hw/sysbus.h" #include "trace.h" /* diff --git a/hw/sysbus.c b/hw/sysbus.c index 50c7232..702fc72 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -17,7 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "monitor/monitor.h" #include "exec/address-spaces.h" diff --git a/hw/sysbus.h b/hw/sysbus.h index 2100bd7..5d90a52 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -3,7 +3,7 @@ /* Devices attached directly to the main system bus. */ -#include "qdev.h" +#include "hw/qdev.h" #include "exec/memory.h" #define QDEV_MAX_MMIO 32 diff --git a/hw/tc58128.c b/hw/tc58128.c index 4ce80b1..f76f96d 100644 --- a/hw/tc58128.c +++ b/hw/tc58128.c @@ -1,6 +1,6 @@ -#include "hw.h" -#include "sh.h" -#include "loader.h" +#include "hw/hw.h" +#include "hw/sh.h" +#include "hw/loader.h" #define CE1 0x0100 #define CE2 0x0200 diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c index e815f83..0755463 100644 --- a/hw/tc6393xb.c +++ b/hw/tc6393xb.c @@ -10,9 +10,9 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" -#include "devices.h" -#include "flash.h" +#include "hw/hw.h" +#include "hw/devices.h" +#include "hw/flash.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "sysemu/blockdev.h" @@ -421,15 +421,15 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value) } #define BITS 8 -#include "tc6393xb_template.h" +#include "hw/tc6393xb_template.h" #define BITS 15 -#include "tc6393xb_template.h" +#include "hw/tc6393xb_template.h" #define BITS 16 -#include "tc6393xb_template.h" +#include "hw/tc6393xb_template.h" #define BITS 24 -#include "tc6393xb_template.h" +#include "hw/tc6393xb_template.h" #define BITS 32 -#include "tc6393xb_template.h" +#include "hw/tc6393xb_template.h" static void tc6393xb_draw_graphic(TC6393xbState *s, int full_update) { @@ -25,8 +25,8 @@ #include "qemu-common.h" #include "ui/console.h" #include "ui/pixel_ops.h" -#include "sysbus.h" -#include "qdev-addr.h" +#include "hw/sysbus.h" +#include "hw/qdev-addr.h" #define MAXX 1024 #define MAXY 768 diff --git a/hw/tmp105.c b/hw/tmp105.c index 3ad2d2f..47e5437 100644 --- a/hw/tmp105.c +++ b/hw/tmp105.c @@ -18,9 +18,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "i2c.h" -#include "tmp105.h" +#include "hw/hw.h" +#include "hw/i2c.h" +#include "hw/tmp105.h" #include "qapi/visitor.h" static void tmp105_interrupt_update(TMP105State *s) diff --git a/hw/tmp105.h b/hw/tmp105.h index d218919..9a9632c 100644 --- a/hw/tmp105.h +++ b/hw/tmp105.h @@ -14,8 +14,8 @@ #ifndef QEMU_TMP105_H #define QEMU_TMP105_H -#include "i2c.h" -#include "tmp105_regs.h" +#include "hw/i2c.h" +#include "hw/tmp105_regs.h" #define TYPE_TMP105 "tmp105" #define TMP105(obj) OBJECT_CHECK(TMP105State, (obj), TYPE_TMP105) diff --git a/hw/tpci200.c b/hw/tpci200.c index a4823fb..e3408ef 100644 --- a/hw/tpci200.c +++ b/hw/tpci200.c @@ -8,8 +8,8 @@ * later version. */ -#include "ipack.h" -#include "pci/pci.h" +#include "hw/ipack.h" +#include "hw/pci/pci.h" #include "qemu/bitops.h" #include <stdio.h> diff --git a/hw/tsc2005.c b/hw/tsc2005.c index 740ff86..a771cd5 100644 --- a/hw/tsc2005.c +++ b/hw/tsc2005.c @@ -18,10 +18,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "ui/console.h" -#include "devices.h" +#include "hw/devices.h" #define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10))) diff --git a/hw/tsc210x.c b/hw/tsc210x.c index 2076c35..b93e502 100644 --- a/hw/tsc210x.c +++ b/hw/tsc210x.c @@ -19,12 +19,12 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "audio/audio.h" #include "qemu/timer.h" #include "ui/console.h" -#include "omap.h" /* For I2SCodec and uWireSlave */ -#include "devices.h" +#include "hw/omap.h" /* For I2SCodec and uWireSlave */ +#include "hw/devices.h" #define TSC_DATA_REGISTERS_PAGE 0x0 #define TSC_CONTROL_REGISTERS_PAGE 0x1 diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 2c7d033..a5251a3 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -20,11 +20,11 @@ */ #include "qemu-common.h" #include "qemu/timer.h" -#include "usb.h" -#include "omap.h" -#include "irq.h" -#include "devices.h" -#include "sysbus.h" +#include "hw/usb.h" +#include "hw/omap.h" +#include "hw/irq.h" +#include "hw/devices.h" +#include "hw/sysbus.h" typedef struct TUSBState { SysBusDevice busdev; diff --git a/hw/twl92230.c b/hw/twl92230.c index 70d9b03..7d020c4 100644 --- a/hw/twl92230.c +++ b/hw/twl92230.c @@ -19,9 +19,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "i2c.h" +#include "hw/i2c.h" #include "sysemu/sysemu.h" #include "ui/console.h" diff --git a/hw/unicore32/Makefile.objs b/hw/unicore32/Makefile.objs index 0725ce3..e0fd628 100644 --- a/hw/unicore32/Makefile.objs +++ b/hw/unicore32/Makefile.objs @@ -2,5 +2,3 @@ # PKUnity-v3 SoC and board information obj-${CONFIG_PUV3} += puv3.o - -obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/puv3.c b/hw/unicore32/puv3.c index c722510..f9d0c2b 100644 --- a/hw/puv3.c +++ b/hw/unicore32/puv3.c @@ -13,13 +13,13 @@ #include "ui/console.h" #include "elf.h" #include "exec/address-spaces.h" -#include "sysbus.h" -#include "boards.h" -#include "loader.h" -#include "pc.h" +#include "hw/sysbus.h" +#include "hw/boards.h" +#include "hw/loader.h" +#include "hw/pc.h" #undef DEBUG_PUV3 -#include "puv3.h" +#include "hw/puv3.h" #define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ diff --git a/hw/unin_pci.c b/hw/unin_pci.c index f1c3c20..cb95ad1 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "ppc/mac.h" -#include "pci/pci.h" -#include "pci/pci_host.h" +#include "hw/hw.h" +#include "hw/ppc/mac.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" /* debug UniNorth */ //#define DEBUG_UNIN @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -#include "qdev.h" +#include "hw/qdev.h" #include "qemu/queue.h" /* Constants related to the USB / PCI interaction */ diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index c08718b..5473ac2 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -27,6 +27,7 @@ #include "hw/usb.h" #include "hw/usb/desc.h" #include "net/net.h" +#include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/config-file.h" #include "sysemu/sysemu.h" diff --git a/hw/versatile_i2c.c b/hw/versatile_i2c.c index ad71e9d..d0444ae 100644 --- a/hw/versatile_i2c.c +++ b/hw/versatile_i2c.c @@ -21,8 +21,8 @@ * */ -#include "sysbus.h" -#include "bitbang_i2c.h" +#include "hw/sysbus.h" +#include "hw/bitbang_i2c.h" typedef struct { SysBusDevice busdev; diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index 9d99159..0b97a40 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -7,9 +7,9 @@ * This code is licensed under the LGPL. */ -#include "sysbus.h" -#include "pci/pci.h" -#include "pci/pci_host.h" +#include "hw/sysbus.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "exec/address-spaces.h" typedef struct { diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index ad9ae36..288361d 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c @@ -31,9 +31,9 @@ #include "exec/address-spaces.h" #include "sysemu/kvm.h" #include "exec/memory.h" -#include "pci/msi.h" -#include "pci/msix.h" -#include "pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/pci/msix.h" +#include "hw/pci/pci.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/queue.h" diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c index 311c966..4aa62bf 100644 --- a/hw/vga-isa-mm.c +++ b/hw/vga-isa-mm.c @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "pc.h" -#include "vga_int.h" +#include "hw/pc.h" +#include "hw/vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" diff --git a/hw/vga-isa.c b/hw/vga-isa.c index 762e45a..ffad522 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -23,13 +23,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "pc.h" -#include "vga_int.h" +#include "hw/pc.h" +#include "hw/vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" -#include "loader.h" +#include "hw/loader.h" typedef struct ISAVGAState { ISADevice dev; diff --git a/hw/vga-pci.c b/hw/vga-pci.c index c491af2..18018ff 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -23,13 +23,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "pci/pci.h" -#include "vga_int.h" +#include "hw/pci/pci.h" +#include "hw/vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" -#include "loader.h" +#include "hw/loader.h" #define PCI_VGA_IOPORT_OFFSET 0x400 #define PCI_VGA_IOPORT_SIZE (0x3e0 - 0x3c0) @@ -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> diff --git a/hw/vhost_net.c b/hw/vhost_net.c index d1df0e2..d3218a0 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -16,8 +16,8 @@ #include "net/net.h" #include "net/tap.h" -#include "virtio-net.h" -#include "vhost_net.h" +#include "hw/virtio-net.h" +#include "hw/vhost_net.h" #include "qemu/error-report.h" #include "config.h" @@ -36,7 +36,7 @@ #include <stdio.h> -#include "vhost.h" +#include "hw/vhost.h" struct vhost_net { struct vhost_dev dev; diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index c0a7902..6bfcddc 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -16,11 +16,11 @@ #include "qemu/iov.h" #include "qemu/timer.h" #include "qemu-common.h" -#include "virtio.h" -#include "pc.h" +#include "hw/virtio.h" +#include "hw/pc.h" #include "cpu.h" #include "sysemu/balloon.h" -#include "virtio-balloon.h" +#include "hw/virtio-balloon.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" #include "qapi/visitor.h" diff --git a/hw/virtio-balloon.h b/hw/virtio-balloon.h index b1828f4..f37f31b 100644 --- a/hw/virtio-balloon.h +++ b/hw/virtio-balloon.h @@ -15,8 +15,8 @@ #ifndef _QEMU_VIRTIO_BALLOON_H #define _QEMU_VIRTIO_BALLOON_H -#include "virtio.h" -#include "pci/pci.h" +#include "hw/virtio.h" +#include "hw/pci/pci.h" /* from Linux's linux/virtio_balloon.h */ diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index f5e6ee9..6b69236 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -16,11 +16,11 @@ #include "trace.h" #include "hw/block-common.h" #include "sysemu/blockdev.h" -#include "virtio-blk.h" +#include "hw/virtio-blk.h" #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE -#include "hw/dataplane/virtio-blk.h" +#include "dataplane/virtio-blk.h" #endif -#include "scsi-defs.h" +#include "hw/scsi-defs.h" #ifdef __linux__ # include <scsi/sg.h> #endif diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 43ca492..7ef2f35 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -14,7 +14,7 @@ #ifndef _QEMU_VIRTIO_BLK_H #define _QEMU_VIRTIO_BLK_H -#include "virtio.h" +#include "hw/virtio.h" #include "hw/block-common.h" /* from Linux's linux/virtio_blk.h */ diff --git a/hw/virtio-bus.c b/hw/virtio-bus.c index 6045d8a..6c2aab0 100644 --- a/hw/virtio-bus.c +++ b/hw/virtio-bus.c @@ -22,11 +22,11 @@ * */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/error-report.h" -#include "qdev.h" -#include "virtio-bus.h" -#include "virtio.h" +#include "hw/qdev.h" +#include "hw/virtio-bus.h" +#include "hw/virtio.h" /* #define DEBUG_VIRTIO_BUS */ diff --git a/hw/virtio-bus.h b/hw/virtio-bus.h index 7584a0e..ae0f707 100644 --- a/hw/virtio-bus.h +++ b/hw/virtio-bus.h @@ -25,9 +25,9 @@ #ifndef VIRTIO_BUS_H #define VIRTIO_BUS_H -#include "qdev.h" +#include "hw/qdev.h" #include "sysemu/sysemu.h" -#include "virtio.h" +#include "hw/virtio.h" #define TYPE_VIRTIO_BUS "virtio-bus" #define VIRTIO_BUS_GET_CLASS(obj) \ diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 194de64..e2d1c58 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -13,7 +13,7 @@ #include "char/char.h" #include "qemu/error-report.h" #include "trace.h" -#include "virtio-serial.h" +#include "hw/virtio-serial.h" typedef struct VirtConsole { VirtIOSerialPort port; diff --git a/hw/virtio-net.c b/hw/virtio-net.c index bb2c26c..8c9d871 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -12,14 +12,14 @@ */ #include "qemu/iov.h" -#include "virtio.h" +#include "hw/virtio.h" #include "net/net.h" #include "net/checksum.h" #include "net/tap.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "virtio-net.h" -#include "vhost_net.h" +#include "hw/virtio-net.h" +#include "hw/vhost_net.h" #define VIRTIO_NET_VM_VERSION 11 diff --git a/hw/virtio-net.h b/hw/virtio-net.h index e654c13..0c83ca5 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -14,8 +14,8 @@ #ifndef _QEMU_VIRTIO_NET_H #define _QEMU_VIRTIO_NET_H -#include "virtio.h" -#include "pci/pci.h" +#include "hw/virtio.h" +#include "hw/pci/pci.h" #define ETH_ALEN 6 diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index ba56ab2..39c1966 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -17,21 +17,21 @@ #include <inttypes.h> -#include "virtio.h" -#include "virtio-blk.h" -#include "virtio-net.h" -#include "virtio-serial.h" -#include "virtio-scsi.h" -#include "pci/pci.h" +#include "hw/virtio.h" +#include "hw/virtio-blk.h" +#include "hw/virtio-net.h" +#include "hw/virtio-serial.h" +#include "hw/virtio-scsi.h" +#include "hw/pci/pci.h" #include "qemu/error-report.h" -#include "pci/msi.h" -#include "pci/msix.h" -#include "loader.h" +#include "hw/pci/msi.h" +#include "hw/pci/msix.h" +#include "hw/loader.h" #include "sysemu/kvm.h" #include "sysemu/blockdev.h" -#include "virtio-pci.h" +#include "hw/virtio-pci.h" #include "qemu/range.h" -#include "virtio-bus.h" +#include "hw/virtio-bus.h" /* from Linux's linux/virtio_pci.h */ @@ -255,7 +255,7 @@ static void virtio_pci_stop_ioeventfd(VirtIOPCIProxy *proxy) proxy->ioeventfd_started = false; } -void virtio_pci_reset(DeviceState *d) +static void virtio_pci_reset(DeviceState *d) { VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); virtio_pci_stop_ioeventfd(proxy); @@ -1316,6 +1316,51 @@ static const TypeInfo virtio_scsi_info = { .class_init = virtio_scsi_class_init, }; +#ifdef CONFIG_VIRTFS +static int virtio_9p_init_pci(PCIDevice *pci_dev) +{ + VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIODevice *vdev; + + vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf); + vdev->nvectors = proxy->nvectors; + virtio_init_pci(proxy, vdev); + /* make the actual value visible */ + proxy->nvectors = vdev->nvectors; + return 0; +} + +static Property virtio_9p_properties[] = { + DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), + DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), + DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag), + DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_9p_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = virtio_9p_init_pci; + k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; + k->device_id = PCI_DEVICE_ID_VIRTIO_9P; + k->revision = VIRTIO_PCI_ABI_VERSION; + k->class_id = 0x2; + dc->props = virtio_9p_properties; + dc->reset = virtio_pci_reset; +} + +static const TypeInfo virtio_9p_info = { + .name = "virtio-9p-pci", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(VirtIOPCIProxy), + .class_init = virtio_9p_class_init, +}; +#endif + /* * virtio-pci: This is the PCIDevice which has a virtio-pci-bus. */ @@ -1478,6 +1523,9 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_rng_info); type_register_static(&virtio_pci_bus_info); type_register_static(&virtio_pci_info); +#ifdef CONFIG_VIRTFS + type_register_static(&virtio_9p_info); +#endif } type_init(virtio_pci_register_types) diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index d24957c..2ae96f8 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -16,12 +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 "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; @@ -75,7 +76,7 @@ struct VirtIOPCIProxy { VirtIOBlkConf blk; NICConf nic; uint32_t host_features; -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS V9fsConf fsconf; #endif virtio_serial_conf serial; @@ -90,7 +91,6 @@ struct VirtIOPCIProxy { }; void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); -void virtio_pci_reset(DeviceState *d); void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev); /* Virtio ABI version, if we increment this, we break the guest driver. */ diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c index e063127..54c1421 100644 --- a/hw/virtio-rng.c +++ b/hw/virtio-rng.c @@ -10,9 +10,10 @@ */ #include "qemu/iov.h" -#include "qdev.h" -#include "virtio.h" -#include "virtio-rng.h" +#include "hw/qdev.h" +#include "qapi/qmp/qerror.h" +#include "hw/virtio.h" +#include "hw/virtio-rng.h" #include "qemu/rng.h" typedef struct VirtIORNG { diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 0715865..72cc519 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -13,7 +13,8 @@ * */ -#include "virtio-scsi.h" +#include "hw/virtio-scsi.h" +#include "qemu/error-report.h" #include <hw/scsi.h> #include <hw/scsi-defs.h> diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h index 8d9d15f..81b3279 100644 --- a/hw/virtio-scsi.h +++ b/hw/virtio-scsi.h @@ -14,8 +14,8 @@ #ifndef _QEMU_VIRTIO_SCSI_H #define _QEMU_VIRTIO_SCSI_H -#include "virtio.h" -#include "pci/pci.h" +#include "hw/virtio.h" +#include "hw/pci/pci.h" /* The ID for virtio_scsi */ #define VIRTIO_ID_SCSI 8 diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index f76c505..7d0515f 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -21,9 +21,9 @@ #include "qemu/iov.h" #include "monitor/monitor.h" #include "qemu/queue.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "trace.h" -#include "virtio-serial.h" +#include "hw/virtio-serial.h" /* The virtio-serial bus on top of which the ports will ride as devices */ struct VirtIOSerialBus { diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index 16e3982..d2d9fb7 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -15,8 +15,8 @@ #ifndef _QEMU_VIRTIO_SERIAL_H #define _QEMU_VIRTIO_SERIAL_H -#include "qdev.h" -#include "virtio.h" +#include "hw/qdev.h" +#include "hw/virtio.h" /* == Interface shared between the guest kernel and qemu == */ diff --git a/hw/virtio.c b/hw/virtio.c index e259348..26fbc79 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -15,9 +15,9 @@ #include "trace.h" #include "qemu/error-report.h" -#include "virtio.h" +#include "hw/virtio.h" #include "qemu/atomic.h" -#include "virtio-bus.h" +#include "hw/virtio-bus.h" /* The alignment to use between consumer and producer parts of vring. * x86 pagesize again. */ diff --git a/hw/virtio.h b/hw/virtio.h index 1e206b8..ca43fd7 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -14,13 +14,13 @@ #ifndef _QEMU_VIRTIO_H #define _QEMU_VIRTIO_H -#include "hw.h" +#include "hw/hw.h" #include "net/net.h" -#include "qdev.h" +#include "hw/qdev.h" #include "sysemu/sysemu.h" #include "qemu/event_notifier.h" -#ifdef CONFIG_LINUX -#include "9p.h" +#ifdef CONFIG_VIRTFS +#include "hw/9pfs/virtio-9p-device.h" #endif /* from Linux's linux/virtio_config.h */ @@ -252,7 +252,7 @@ typedef struct VirtIOSCSIConf VirtIOSCSIConf; VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *conf); typedef struct VirtIORNGConf VirtIORNGConf; VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf); -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); #endif diff --git a/hw/vmmouse.c b/hw/vmmouse.c index b9afc2c..a9d227e 100644 --- a/hw/vmmouse.c +++ b/hw/vmmouse.c @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "ui/console.h" -#include "ps2.h" -#include "pc.h" -#include "qdev.h" +#include "hw/ps2.h" +#include "hw/pc.h" +#include "hw/qdev.h" /* debug only vmmouse */ //#define DEBUG_VMMOUSE diff --git a/hw/vmport.c b/hw/vmport.c index faead3a..cc1466a 100644 --- a/hw/vmport.c +++ b/hw/vmport.c @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "isa.h" -#include "pc.h" +#include "hw/hw.h" +#include "hw/isa.h" +#include "hw/pc.h" #include "sysemu/kvm.h" -#include "qdev.h" +#include "hw/qdev.h" //#define VMPORT_DEBUG diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 8fc201b..db2f187 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -21,17 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "loader.h" +#include "hw/hw.h" +#include "hw/loader.h" #include "ui/console.h" -#include "pci/pci.h" +#include "hw/pci/pci.h" #undef VERBOSE #define HW_RECT_ACCEL #define HW_FILL_ACCEL #define HW_MOUSE_ACCEL -#include "vga_int.h" +#include "hw/vga_int.h" /* See http://vmware-svga.sf.net/ for some documentation on VMWare SVGA */ diff --git a/hw/vt82c686.c b/hw/vt82c686.c index 2d8e398..4529508 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c @@ -10,24 +10,22 @@ * 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" -typedef uint32_t pci_addr_t; -#include "pci/pci_host.h" //#define DEBUG_VT82C686B #ifdef DEBUG_VT82C686B diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c index 37ce362..f13e507 100644 --- a/hw/wdt_i6300esb.c +++ b/hw/wdt_i6300esb.c @@ -23,9 +23,9 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "watchdog.h" -#include "hw.h" -#include "pci/pci.h" +#include "hw/watchdog.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" /*#define I6300ESB_DEBUG 1*/ diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c index 599a86f..6c52808 100644 --- a/hw/wdt_ib700.c +++ b/hw/wdt_ib700.c @@ -21,10 +21,10 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "watchdog.h" -#include "hw.h" -#include "isa.h" -#include "pc.h" +#include "hw/watchdog.h" +#include "hw/hw.h" +#include "hw/isa.h" +#include "hw/pc.h" /*#define IB700_DEBUG 1*/ diff --git a/hw/wm8750.c b/hw/wm8750.c index d3ea5ba..0904cf4 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -7,8 +7,8 @@ * This file is licensed under GNU GPL. */ -#include "hw.h" -#include "i2c.h" +#include "hw/hw.h" +#include "hw/i2c.h" #include "audio/audio.h" #define IN_PORT_N 3 diff --git a/hw/xen-host-pci-device.c b/hw/xen-host-pci-device.c index 743b37b..ff2e876 100644 --- a/hw/xen-host-pci-device.c +++ b/hw/xen-host-pci-device.c @@ -7,7 +7,7 @@ */ #include "qemu-common.h" -#include "xen-host-pci-device.h" +#include "hw/xen-host-pci-device.h" #define XEN_HOST_PCI_MAX_EXT_CAP \ ((PCIE_CONFIG_SPACE_SIZE - PCI_CONFIG_SPACE_SIZE) / (PCI_CAP_SIZEOF + 4)) diff --git a/hw/xen-host-pci-device.h b/hw/xen-host-pci-device.h index 942b24d..c2486f0 100644 --- a/hw/xen-host-pci-device.h +++ b/hw/xen-host-pci-device.h @@ -1,7 +1,7 @@ #ifndef XEN_HOST_PCI_DEVICE_H #define XEN_HOST_PCI_DEVICE_H -#include "pci/pci.h" +#include "hw/pci/pci.h" enum { XEN_HOST_PCI_REGION_TYPE_IO = 1 << 1, diff --git a/hw/xen_apic.c b/hw/xen_apic.c index 1d1d15c..8f387b6 100644 --- a/hw/xen_apic.c +++ b/hw/xen_apic.c @@ -11,7 +11,7 @@ */ #include "hw/apic_internal.h" #include "hw/pci/msi.h" -#include "xen.h" +#include "hw/xen.h" static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/xen_backend.c b/hw/xen_backend.c index 3fa3009..24381b5 100644 --- a/hw/xen_backend.c +++ b/hw/xen_backend.c @@ -34,10 +34,10 @@ #include <sys/mman.h> #include <sys/signal.h> -#include "hw.h" +#include "hw/hw.h" #include "char/char.h" #include "qemu/log.h" -#include "xen_backend.h" +#include "hw/xen_backend.h" #include <xen/grant_table.h> diff --git a/hw/xen_backend.h b/hw/xen_backend.h index f37afb1..6d5c699 100644 --- a/hw/xen_backend.h +++ b/hw/xen_backend.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_XEN_BACKEND_H #define QEMU_HW_XEN_BACKEND_H 1 -#include "xen_common.h" +#include "hw/xen_common.h" #include "sysemu/sysemu.h" #include "net/net.h" diff --git a/hw/xen_common.h b/hw/xen_common.h index 95bc9a7..c37bde3 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -14,8 +14,8 @@ #endif #include <xen/io/xenbus.h> -#include "hw.h" -#include "xen.h" +#include "hw/hw.h" +#include "hw/xen.h" #include "qemu/queue.h" /* diff --git a/hw/xen_console.c b/hw/xen_console.c index 44141f8..a8db6f8 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -29,9 +29,9 @@ #include <stdarg.h> #include <sys/mman.h> -#include "hw.h" +#include "hw/hw.h" #include "char/char.h" -#include "xen_backend.h" +#include "hw/xen_backend.h" #include <xen/io/console.h> diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c index e2ba741..cdcaf62 100644 --- a/hw/xen_devconfig.c +++ b/hw/xen_devconfig.c @@ -1,4 +1,4 @@ -#include "xen_backend.h" +#include "hw/xen_backend.h" #include "sysemu/blockdev.h" /* ------------------------------------------------------------- */ diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 7fea871..cc09a2f 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -35,9 +35,9 @@ #include <sys/mman.h> #include <sys/uio.h> -#include "hw.h" -#include "xen_backend.h" -#include "xen_blkif.h" +#include "hw/hw.h" +#include "hw/xen_backend.h" +#include "hw/xen_blkif.h" #include "sysemu/blockdev.h" /* ------------------------------------------------------------- */ diff --git a/hw/xen_domainbuild.h b/hw/xen_domainbuild.h index dea0121..681cbe5 100644 --- a/hw/xen_domainbuild.h +++ b/hw/xen_domainbuild.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_XEN_DOMAINBUILD_H #define QEMU_HW_XEN_DOMAINBUILD_H 1 -#include "xen_common.h" +#include "hw/xen_common.h" int xenstore_domain_init1(const char *kernel, const char *ramdisk, const char *cmdline); diff --git a/hw/xen_nic.c b/hw/xen_nic.c index 34961c2..b6d3679 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -35,11 +35,11 @@ #include <sys/mman.h> #include <sys/wait.h> -#include "hw.h" +#include "hw/hw.h" #include "net/net.h" #include "net/checksum.h" #include "net/util.h" -#include "xen_backend.h" +#include "hw/xen_backend.h" #include <xen/io/netif.h> diff --git a/hw/xen_platform.c b/hw/xen_platform.c index 8866468..5e11c95 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -25,12 +25,12 @@ #include <assert.h> -#include "hw.h" -#include "pc.h" -#include "pci/pci.h" -#include "irq.h" -#include "xen_common.h" -#include "xen_backend.h" +#include "hw/hw.h" +#include "hw/pc.h" +#include "hw/pci/pci.h" +#include "hw/irq.h" +#include "hw/xen_common.h" +#include "hw/xen_backend.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/hw/xen_pt.c b/hw/xen_pt.c index 9db5f6e..ce695d0 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c @@ -54,10 +54,10 @@ #include <sys/ioctl.h> -#include "pci/pci.h" -#include "xen.h" -#include "xen_backend.h" -#include "xen_pt.h" +#include "hw/pci/pci.h" +#include "hw/xen.h" +#include "hw/xen_backend.h" +#include "hw/xen_pt.h" #include "qemu/range.h" #include "exec/address-spaces.h" diff --git a/hw/xen_pt.h b/hw/xen_pt.h index e349730..1cd9f44 100644 --- a/hw/xen_pt.h +++ b/hw/xen_pt.h @@ -2,9 +2,9 @@ #define XEN_PT_H #include "qemu-common.h" -#include "xen_common.h" -#include "pci/pci.h" -#include "xen-host-pci-device.h" +#include "hw/xen_common.h" +#include "hw/pci/pci.h" +#include "hw/xen-host-pci-device.h" void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3); diff --git a/hw/xen_pt_config_init.c b/hw/xen_pt_config_init.c index 54a179a..5583821 100644 --- a/hw/xen_pt_config_init.c +++ b/hw/xen_pt_config_init.c @@ -13,8 +13,8 @@ */ #include "qemu/timer.h" -#include "xen_backend.h" -#include "xen_pt.h" +#include "hw/xen_backend.h" +#include "hw/xen_pt.h" #define XEN_PT_MERGE_VALUE(value, data, val_mask) \ (((value) & (val_mask)) | ((data) & ~(val_mask))) diff --git a/hw/xen_pt_msi.c b/hw/xen_pt_msi.c index db757cd..a54ee2b 100644 --- a/hw/xen_pt_msi.c +++ b/hw/xen_pt_msi.c @@ -11,9 +11,9 @@ #include <sys/mman.h> -#include "xen_backend.h" -#include "xen_pt.h" -#include "apic-msidef.h" +#include "hw/xen_backend.h" +#include "hw/xen_pt.h" +#include "hw/apic-msidef.h" #define XEN_PT_AUTO_ASSIGN -1 @@ -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" diff --git a/hw/xilinx.h b/hw/xilinx.h index 09bc2e4..6c1ee21 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -2,8 +2,9 @@ #define HW_XILINX_H 1 -#include "stream.h" #include "qemu-common.h" +#include "qapi/qmp/qerror.h" +#include "hw/stream.h" #include "net/net.h" static inline DeviceState * diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c index cc51584..8db1a74 100644 --- a/hw/xilinx_axidma.c +++ b/hw/xilinx_axidma.c @@ -22,13 +22,13 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "qemu/log.h" -#include "qdev-addr.h" +#include "hw/qdev-addr.h" -#include "stream.h" +#include "hw/stream.h" #define D(x) diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c index e5d9251..5785290 100644 --- a/hw/xilinx_axienet.c +++ b/hw/xilinx_axienet.c @@ -22,12 +22,13 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/log.h" #include "net/net.h" #include "net/checksum.h" +#include "qapi/qmp/qerror.h" -#include "stream.h" +#include "hw/stream.h" #define DPHY(x) diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index 21c6f8c..b2e3523 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" +#include "hw/sysbus.h" +#include "hw/hw.h" #include "net/net.h" #define D(x) diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c index 0c34149..b106e72 100644 --- a/hw/xilinx_intc.c +++ b/hw/xilinx_intc.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "hw.h" +#include "hw/sysbus.h" +#include "hw/hw.h" #define D(x) diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c index be581c2..f6bd3ba 100644 --- a/hw/xilinx_spi.c +++ b/hw/xilinx_spi.c @@ -24,12 +24,12 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/log.h" -#include "fifo.h" +#include "qemu/fifo8.h" -#include "ssi.h" +#include "hw/ssi.h" #ifdef XILINX_SPI_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c index 42e019d..6c21b96 100644 --- a/hw/xilinx_spips.c +++ b/hw/xilinx_spips.c @@ -22,12 +22,12 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" -#include "ptimer.h" +#include "hw/ptimer.h" #include "qemu/log.h" -#include "fifo.h" -#include "ssi.h" +#include "qemu/fifo8.h" +#include "hw/ssi.h" #include "qemu/bitops.h" #ifdef XILINX_SPIPS_ERR_DEBUG diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index aa162ef..0c39cff 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#include "sysbus.h" -#include "ptimer.h" +#include "hw/sysbus.h" +#include "hw/ptimer.h" #include "qemu/log.h" #define D(x) diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c index 9963982..079f4d4 100644 --- a/hw/xilinx_uartlite.c +++ b/hw/xilinx_uartlite.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "char/char.h" #define DUART(x) diff --git a/hw/xio3130_downstream.c b/hw/xio3130_downstream.c index 7f00bc8..4bccd0d 100644 --- a/hw/xio3130_downstream.c +++ b/hw/xio3130_downstream.c @@ -19,10 +19,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci/pci_ids.h" -#include "pci/msi.h" -#include "pci/pcie.h" -#include "xio3130_downstream.h" +#include "hw/pci/pci_ids.h" +#include "hw/pci/msi.h" +#include "hw/pci/pcie.h" +#include "hw/xio3130_downstream.h" #define PCI_DEVICE_ID_TI_XIO3130D 0x8233 /* downstream port */ #define XIO3130_REVISION 0x1 diff --git a/hw/xio3130_downstream.h b/hw/xio3130_downstream.h index 559dff6..8426d9f 100644 --- a/hw/xio3130_downstream.h +++ b/hw/xio3130_downstream.h @@ -1,7 +1,7 @@ #ifndef QEMU_XIO3130_DOWNSTREAM_H #define QEMU_XIO3130_DOWNSTREAM_H -#include "pci/pcie_port.h" +#include "hw/pci/pcie_port.h" PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq, diff --git a/hw/xio3130_upstream.c b/hw/xio3130_upstream.c index 70b15d3..82556aa 100644 --- a/hw/xio3130_upstream.c +++ b/hw/xio3130_upstream.c @@ -19,10 +19,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci/pci_ids.h" -#include "pci/msi.h" -#include "pci/pcie.h" -#include "xio3130_upstream.h" +#include "hw/pci/pci_ids.h" +#include "hw/pci/msi.h" +#include "hw/pci/pcie.h" +#include "hw/xio3130_upstream.h" #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */ #define XIO3130_REVISION 0x2 diff --git a/hw/xio3130_upstream.h b/hw/xio3130_upstream.h index fa09656..08c1d5f 100644 --- a/hw/xio3130_upstream.h +++ b/hw/xio3130_upstream.h @@ -1,7 +1,7 @@ #ifndef QEMU_XIO3130_UPSTREAM_H #define QEMU_XIO3130_UPSTREAM_H -#include "pci/pcie_port.h" +#include "hw/pci/pcie_port.h" PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq, diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs index 79698e9..6ead782 100644 --- a/hw/xtensa/Makefile.objs +++ b/hw/xtensa/Makefile.objs @@ -1,5 +1,3 @@ -obj-y += xtensa_pic.o +obj-y += pic_cpu.o obj-y += xtensa_sim.o obj-y += xtensa_lx60.o - -obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/xtensa_pic.c b/hw/xtensa/pic_cpu.c index 97d36be..f485a14 100644 --- a/hw/xtensa_pic.c +++ b/hw/xtensa/pic_cpu.c @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/log.h" #include "qemu/timer.h" diff --git a/hw/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c index a810b9e..f2a63d8 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa/xtensa_lx60.c @@ -26,18 +26,18 @@ */ #include "sysemu/sysemu.h" -#include "boards.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "exec/memory.h" #include "exec/address-spaces.h" -#include "serial.h" +#include "hw/serial.h" #include "net/net.h" -#include "sysbus.h" -#include "flash.h" +#include "hw/sysbus.h" +#include "hw/flash.h" #include "sysemu/blockdev.h" #include "char/char.h" -#include "xtensa_bootparam.h" +#include "hw/xtensa_bootparam.h" typedef struct LxBoardDesc { size_t flash_size; diff --git a/hw/xtensa_sim.c b/hw/xtensa/xtensa_sim.c index 864e57c..5241f8d 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa/xtensa_sim.c @@ -26,8 +26,8 @@ */ #include "sysemu/sysemu.h" -#include "boards.h" -#include "loader.h" +#include "hw/boards.h" +#include "hw/loader.h" #include "elf.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/hw/zaurus.c b/hw/zaurus.c index 2defe3b..7d3258c 100644 --- a/hw/zaurus.c +++ b/hw/zaurus.c @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "sharpsl.h" -#include "sysbus.h" +#include "hw/hw.h" +#include "hw/sharpsl.h" +#include "hw/sysbus.h" #undef REG_FMT #define REG_FMT "0x%02lx" diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c index 27b00f0..8418327 100644 --- a/hw/zynq_slcr.c +++ b/hw/zynq_slcr.c @@ -14,9 +14,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu/timer.h" -#include "sysbus.h" +#include "hw/sysbus.h" #include "sysemu/sysemu.h" #ifdef ZYNQ_ARM_SLCR_ERR_DEBUG diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f27276c..94a409b 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -26,6 +26,8 @@ #ifndef QEMU_VMSTATE_H #define QEMU_VMSTATE_H 1 +#include <migration/qemu-file.h> + typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); diff --git a/hw/qdev-monitor.h b/include/monitor/qdev.h index 9ec4850..8d16e11 100644 --- a/hw/qdev-monitor.h +++ b/include/monitor/qdev.h @@ -1,7 +1,7 @@ #ifndef QEMU_QDEV_MONITOR_H #define QEMU_QDEV_MONITOR_H -#include "qdev-core.h" +#include "hw/qdev-core.h" #include "monitor/monitor.h" /*** monitor commands ***/ @@ -9,7 +9,6 @@ void do_info_qtree(Monitor *mon, const QDict *qdict); void do_info_qdm(Monitor *mon, const QDict *qdict); int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data); -int do_device_del(Monitor *mon, const QDict *qdict, QObject **ret_data); int qdev_device_help(QemuOpts *opts); DeviceState *qdev_device_add(QemuOpts *opts); diff --git a/hw/fifo.h b/include/qemu/fifo8.h index f23890a..d318f71 100644 --- a/hw/fifo.h +++ b/include/qemu/fifo8.h @@ -1,7 +1,7 @@ #ifndef FIFO_H #define FIFO_H -#include "hw.h" +#include "migration/vmstate.h" typedef struct { /* All fields are private */ @@ -23,7 +23,7 @@ */ #include <dirent.h> #include "hw/hw.h" -#include "hw/qdev.h" +#include "monitor/qdev.h" #include "hw/usb.h" #include "hw/pcmcia.h" #include "hw/pc.h" diff --git a/hw/qdev-monitor.c b/qdev-monitor.c index 4f9a6eb..9a78ccf 100644 --- a/hw/qdev-monitor.c +++ b/qdev-monitor.c @@ -17,8 +17,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "qdev.h" +#include "hw/qdev.h" #include "monitor/monitor.h" +#include "monitor/qdev.h" #include "qmp-commands.h" #include "sysemu/arch_init.h" #include "qemu/config-file.h" diff --git a/qemu-char.c b/qemu-char.c index b82d643..04aa589 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -535,8 +535,6 @@ int send_all(int fd, const void *_buf, int len1) } #endif /* !_WIN32 */ -#ifndef _WIN32 - typedef struct IOWatchPoll { GSource *src; @@ -634,6 +632,7 @@ static guint io_add_watch_poll(GIOChannel *channel, return tag; } +#ifndef _WIN32 static GIOChannel *io_channel_from_fd(int fd) { GIOChannel *chan; @@ -649,6 +648,7 @@ static GIOChannel *io_channel_from_fd(int fd) return chan; } +#endif static GIOChannel *io_channel_from_socket(int fd) { @@ -699,6 +699,8 @@ static int io_channel_send_all(GIOChannel *fd, const void *_buf, int len1) return len1 - len; } +#ifndef _WIN32 + typedef struct FDCharDriver { CharDriverState *chr; GIOChannel *fd_in, *fd_out; diff --git a/qemu-options.hx b/qemu-options.hx index 6f9334a..cd76f2a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2132,7 +2132,7 @@ gluster[+transport]://[server[:port]]/volname/image[?socket=...] Example @example -qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img +qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img @end example See also @url{http://www.gluster.org}. diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index a260394..9c55b34 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -15,6 +15,7 @@ stub-obj-y += mon-printf.o stub-obj-y += mon-print-filename.o stub-obj-y += mon-protocol-event.o stub-obj-y += mon-set-error.o +stub-obj-y += pci-drive-hot-add.o stub-obj-y += reset.o stub-obj-y += set-fd-handler.o stub-obj-y += slirp.o diff --git a/stubs/pci-drive-hot-add.c b/stubs/pci-drive-hot-add.c new file mode 100644 index 0000000..1d98145 --- /dev/null +++ b/stubs/pci-drive-hot-add.c @@ -0,0 +1,10 @@ +#include <monitor/monitor.h> +#include <sysemu/sysemu.h> +#include <sysemu/blockdev.h> + +int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo) +{ + /* On non-x86 we don't do PCI hotplug */ + monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type); + return -1; +} diff --git a/tests/rtc-test.c b/tests/rtc-test.c index c5fd042..9ab583b 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -565,8 +565,8 @@ int main(int argc, char **argv) qtest_add_func("/rtc/basic/bcd-12h", basic_12h_bcd); qtest_add_func("/rtc/set-year/20xx", set_year_20xx); qtest_add_func("/rtc/set-year/1980", set_year_1980); - qtest_add_func("/rtc/register_b_set_flag", register_b_set_flag); - qtest_add_func("/rtc/fuzz-registers", fuzz_registers); + qtest_add_func("/rtc/misc/register_b_set_flag", register_b_set_flag); + qtest_add_func("/rtc/misc/fuzz-registers", fuzz_registers); ret = g_test_run(); if (s) { diff --git a/trace-events b/trace-events index a27ae43..3064fc7 100644 --- a/trace-events +++ b/trace-events @@ -460,6 +460,7 @@ scsi_req_data(int target, int lun, int tag, int len) "target %d lun %d tag %d le scsi_req_data_canceled(int target, int lun, int tag, int len) "target %d lun %d tag %d len %d" scsi_req_dequeue(int target, int lun, int tag) "target %d lun %d tag %d" scsi_req_continue(int target, int lun, int tag) "target %d lun %d tag %d" +scsi_req_continue_canceled(int target, int lun, int tag) "target %d lun %d tag %d" scsi_req_parsed(int target, int lun, int tag, int cmd, int mode, int xfer) "target %d lun %d tag %d command %d dir %d length %d" scsi_req_parsed_lba(int target, int lun, int tag, int cmd, uint64_t lba) "target %d lun %d tag %d command %d lba %"PRIu64 scsi_req_parse_bad(int target, int lun, int tag, int cmd) "target %d lun %d tag %d command %d" diff --git a/util/Makefile.objs b/util/Makefile.objs index 495a178..cad5ce8 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -3,6 +3,7 @@ util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o util-obj-y += bitmap.o bitops.o hbitmap.o +util-obj-y += fifo8.o util-obj-y += acl.o util-obj-y += error.o qemu-error.o util-obj-$(CONFIG_POSIX) += compatfd.o @@ -12,7 +12,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "fifo.h" +#include "qemu-common.h" +#include "qemu/fifo8.h" void fifo8_create(Fifo8 *fifo, uint32_t capacity) { diff --git a/util/osdep.c b/util/osdep.c index c408261..bd59ac9 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -57,7 +57,7 @@ static const char *qemu_version = QEMU_VERSION; int socket_set_cork(int fd, int v) { #if defined(SOL_TCP) && defined(TCP_CORK) - return setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v)); + return qemu_setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v)); #else return 0; #endif @@ -66,7 +66,7 @@ int socket_set_cork(int fd, int v) int socket_set_nodelay(int fd) { int v = 1; - return setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v)); + return qemu_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v)); } int qemu_madvise(void *addr, size_t len, int advice) diff --git a/util/qemu-config.c b/util/qemu-config.c index db6ec03..01ca890 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -2,6 +2,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" +#include "qapi/qmp/qerror.h" #include "hw/qdev.h" #include "qapi/error.h" @@ -125,6 +125,7 @@ int main(int argc, char **argv) #include "hw/xen.h" #include "hw/qdev.h" #include "hw/loader.h" +#include "monitor/qdev.h" #include "bt/bt.h" #include "net/net.h" #include "net/slirp.h" |