jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
hw: move headers to include/
Many of these should be cleaned up with proper qdev-/QOM-ification.
Right now there are many catch-all headers in include/hw/ARCH depending
on cpu.h, and this makes it necessary to compile these files per-target.
However, fixing this does not belong in these patches.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+829
-830
+4
-4
arch_init.c
+4
-4
arch_init.c
···
35
35
#include "qemu/bitmap.h"
36
36
#include "sysemu/arch_init.h"
37
37
#include "audio/audio.h"
38
-
#include "hw/pc.h"
38
+
#include "hw/i386/pc.h"
39
39
#include "hw/pci/pci.h"
40
-
#include "hw/audiodev.h"
40
+
#include "hw/audio/audio.h"
41
41
#include "sysemu/kvm.h"
42
42
#include "migration/migration.h"
43
43
#include "exec/gdbstub.h"
44
-
#include "hw/smbios.h"
44
+
#include "hw/i386/smbios.h"
45
45
#include "exec/address-spaces.h"
46
-
#include "hw/pcspk.h"
46
+
#include "hw/audio/pcspk.h"
47
47
#include "migration/page_cache.h"
48
48
#include "qemu/config-file.h"
49
49
#include "qmp-commands.h"
+2
-2
block/iscsi.c
+2
-2
block/iscsi.c
···
31
31
#include "qemu/error-report.h"
32
32
#include "block/block_int.h"
33
33
#include "trace.h"
34
-
#include "hw/scsi-defs.h"
34
+
#include "block/scsi.h"
35
35
36
36
#include <iscsi/iscsi.h>
37
37
#include <iscsi/scsi-lowlevel.h>
38
38
39
39
#ifdef __linux__
40
40
#include <scsi/sg.h>
41
-
#include <hw/scsi-defs.h>
41
+
#include <block/scsi.h>
42
42
#endif
43
43
44
44
typedef struct IscsiLun {
+1
-1
blockdev-nbd.c
+1
-1
blockdev-nbd.c
+1
-1
blockdev.c
+1
-1
blockdev.c
+1
-1
exec.c
+1
-1
exec.c
+1
-1
gdbstub.c
+1
-1
gdbstub.c
+2
-2
hw/9pfs/virtio-9p-device.c
+2
-2
hw/9pfs/virtio-9p-device.c
hw/9pfs/virtio-9p-device.h
include/hw/virtio/virtio-9p.h
hw/9pfs/virtio-9p-device.h
include/hw/virtio/virtio-9p.h
+1
-1
hw/9pfs/virtio-9p-handle.c
+1
-1
hw/9pfs/virtio-9p-handle.c
+1
-1
hw/9pfs/virtio-9p-local.c
+1
-1
hw/9pfs/virtio-9p-local.c
+1
-1
hw/9pfs/virtio-9p-posix-acl.c
+1
-1
hw/9pfs/virtio-9p-posix-acl.c
+1
-1
hw/9pfs/virtio-9p-proxy.c
+1
-1
hw/9pfs/virtio-9p-proxy.c
+1
-1
hw/9pfs/virtio-9p-synth.c
+1
-1
hw/9pfs/virtio-9p-synth.c
+1
-1
hw/9pfs/virtio-9p-xattr-user.c
+1
-1
hw/9pfs/virtio-9p-xattr-user.c
+1
-1
hw/9pfs/virtio-9p-xattr.c
+1
-1
hw/9pfs/virtio-9p-xattr.c
+2
-2
hw/9pfs/virtio-9p.c
+2
-2
hw/9pfs/virtio-9p.c
+1
-1
hw/9pfs/virtio-9p.h
+1
-1
hw/9pfs/virtio-9p.h
+1
-1
hw/ac97.c
+1
-1
hw/ac97.c
+2
-2
hw/acpi.c
+2
-2
hw/acpi.c
hw/acpi.h
include/hw/acpi/acpi.h
hw/acpi.h
include/hw/acpi/acpi.h
+3
-3
hw/acpi_ich9.c
+3
-3
hw/acpi_ich9.c
···
24
24
* GNU GPL, version 2 or (at your option) any later version.
25
25
*/
26
26
#include "hw/hw.h"
27
-
#include "hw/pc.h"
27
+
#include "hw/i386/pc.h"
28
28
#include "hw/pci/pci.h"
29
29
#include "qemu/timer.h"
30
30
#include "sysemu/sysemu.h"
31
-
#include "hw/acpi.h"
31
+
#include "hw/acpi/acpi.h"
32
32
#include "sysemu/kvm.h"
33
33
#include "exec/address-spaces.h"
34
34
35
-
#include "hw/ich9.h"
35
+
#include "hw/i386/ich9.h"
36
36
37
37
//#define DEBUG
38
38
+1
-1
hw/acpi_ich9.h
include/hw/acpi/ich9.h
+1
-1
hw/acpi_ich9.h
include/hw/acpi/ich9.h
+5
-5
hw/acpi_piix4.c
+5
-5
hw/acpi_piix4.c
···
19
19
* GNU GPL, version 2 or (at your option) any later version.
20
20
*/
21
21
#include "hw/hw.h"
22
-
#include "hw/pc.h"
23
-
#include "hw/apm.h"
24
-
#include "hw/pm_smbus.h"
22
+
#include "hw/i386/pc.h"
23
+
#include "hw/isa/apm.h"
24
+
#include "hw/i2c/pm_smbus.h"
25
25
#include "hw/pci/pci.h"
26
-
#include "hw/acpi.h"
26
+
#include "hw/acpi/acpi.h"
27
27
#include "sysemu/sysemu.h"
28
28
#include "qemu/range.h"
29
29
#include "exec/ioport.h"
30
-
#include "hw/fw_cfg.h"
30
+
#include "hw/nvram/fw_cfg.h"
31
31
#include "exec/address-spaces.h"
32
32
33
33
//#define DEBUG
+1
-1
hw/adb.c
+1
-1
hw/adb.c
hw/adb.h
include/hw/input/adb.h
hw/adb.h
include/hw/input/adb.h
+2
-2
hw/adlib.c
+2
-2
hw/adlib.c
+3
-3
hw/alpha/dp264.c
+3
-3
hw/alpha/dp264.c
···
12
12
#include "hw/boards.h"
13
13
#include "hw/alpha_sys.h"
14
14
#include "sysemu/sysemu.h"
15
-
#include "hw/mc146818rtc.h"
15
+
#include "hw/timer/mc146818rtc.h"
16
16
#include "hw/ide.h"
17
-
#include "hw/i8254.h"
18
-
#include "hw/serial.h"
17
+
#include "hw/timer/i8254.h"
18
+
#include "hw/char/serial.h"
19
19
20
20
#define MAX_IDE_BUS 2
21
21
+1
-1
hw/alpha_sys.h
+1
-1
hw/alpha_sys.h
+1
-1
hw/alpha_typhoon.c
+1
-1
hw/alpha_typhoon.c
+1
-1
hw/apb_pci.c
+1
-1
hw/apb_pci.c
hw/apb_pci.h
include/hw/pci-host/apb.h
hw/apb_pci.h
include/hw/pci-host/apb.h
hw/apic-msidef.h
include/hw/i386/apic-msidef.h
hw/apic-msidef.h
include/hw/i386/apic-msidef.h
+5
-5
hw/apic.c
+5
-5
hw/apic.c
···
17
17
* License along with this library; if not, see <http://www.gnu.org/licenses/>
18
18
*/
19
19
#include "qemu/thread.h"
20
-
#include "hw/apic_internal.h"
21
-
#include "hw/apic.h"
22
-
#include "hw/ioapic.h"
20
+
#include "hw/i386/apic_internal.h"
21
+
#include "hw/i386/apic.h"
22
+
#include "hw/i386/ioapic.h"
23
23
#include "hw/pci/msi.h"
24
24
#include "qemu/host-utils.h"
25
25
#include "trace.h"
26
-
#include "hw/pc.h"
27
-
#include "hw/apic-msidef.h"
26
+
#include "hw/i386/pc.h"
27
+
#include "hw/i386/apic-msidef.h"
28
28
29
29
#define MAX_APIC_WORDS 8
30
30
hw/apic.h
include/hw/i386/apic.h
hw/apic.h
include/hw/i386/apic.h
+2
-2
hw/apic_common.c
+2
-2
hw/apic_common.c
···
17
17
* You should have received a copy of the GNU Lesser General Public
18
18
* License along with this library; if not, see <http://www.gnu.org/licenses/>
19
19
*/
20
-
#include "hw/apic.h"
21
-
#include "hw/apic_internal.h"
20
+
#include "hw/i386/apic.h"
21
+
#include "hw/i386/apic_internal.h"
22
22
#include "trace.h"
23
23
#include "sysemu/kvm.h"
24
24
hw/apic_internal.h
include/hw/i386/apic_internal.h
hw/apic_internal.h
include/hw/i386/apic_internal.h
+1
-1
hw/apm.c
+1
-1
hw/apm.c
hw/apm.h
include/hw/isa/apm.h
hw/apm.h
include/hw/isa/apm.h
+1
-1
hw/applesmc.c
+1
-1
hw/applesmc.c
hw/arm-misc.h
include/hw/arm.h
hw/arm-misc.h
include/hw/arm.h
+1
-1
hw/arm/armv7m.c
+1
-1
hw/arm/armv7m.c
+1
-1
hw/arm/boot.c
+1
-1
hw/arm/boot.c
+3
-3
hw/arm/collie.c
+3
-3
hw/arm/collie.c
···
11
11
#include "hw/hw.h"
12
12
#include "hw/sysbus.h"
13
13
#include "hw/boards.h"
14
-
#include "hw/devices.h"
14
+
#include "hw/arm/devices.h"
15
15
#include "hw/strongarm.h"
16
-
#include "hw/arm-misc.h"
17
-
#include "hw/flash.h"
16
+
#include "hw/arm.h"
17
+
#include "hw/block/flash.h"
18
18
#include "sysemu/blockdev.h"
19
19
#include "exec/address-spaces.h"
20
20
+2
-2
hw/arm/exynos4210.c
+2
-2
hw/arm/exynos4210.c
···
24
24
#include "hw/boards.h"
25
25
#include "sysemu/sysemu.h"
26
26
#include "hw/sysbus.h"
27
-
#include "hw/arm-misc.h"
27
+
#include "hw/arm.h"
28
28
#include "hw/loader.h"
29
-
#include "hw/exynos4210.h"
29
+
#include "hw/arm/exynos4210.h"
30
30
#include "hw/usb/hcd-ehci.h"
31
31
32
32
#define EXYNOS4210_CHIPID_ADDR 0x10000000
+2
-2
hw/arm/exynos4_boards.c
+2
-2
hw/arm/exynos4_boards.c
···
24
24
#include "sysemu/sysemu.h"
25
25
#include "hw/sysbus.h"
26
26
#include "net/net.h"
27
-
#include "hw/arm-misc.h"
27
+
#include "hw/arm.h"
28
28
#include "exec/address-spaces.h"
29
-
#include "hw/exynos4210.h"
29
+
#include "hw/arm/exynos4210.h"
30
30
#include "hw/boards.h"
31
31
32
32
#undef DEBUG
+3
-3
hw/arm/gumstix.c
+3
-3
hw/arm/gumstix.c
···
35
35
*/
36
36
37
37
#include "hw/hw.h"
38
-
#include "hw/pxa.h"
38
+
#include "hw/arm/pxa.h"
39
39
#include "net/net.h"
40
-
#include "hw/flash.h"
41
-
#include "hw/devices.h"
40
+
#include "hw/block/flash.h"
41
+
#include "hw/arm/devices.h"
42
42
#include "hw/boards.h"
43
43
#include "sysemu/blockdev.h"
44
44
#include "exec/address-spaces.h"
+2
-2
hw/arm/highbank.c
+2
-2
hw/arm/highbank.c
+2
-2
hw/arm/integratorcp.c
+2
-2
hw/arm/integratorcp.c
+4
-4
hw/arm/kzm.c
+4
-4
hw/arm/kzm.c
···
16
16
#include "hw/sysbus.h"
17
17
#include "exec/address-spaces.h"
18
18
#include "hw/hw.h"
19
-
#include "hw/arm-misc.h"
20
-
#include "hw/devices.h"
19
+
#include "hw/arm.h"
20
+
#include "hw/arm/devices.h"
21
21
#include "net/net.h"
22
22
#include "sysemu/sysemu.h"
23
23
#include "hw/boards.h"
24
-
#include "hw/serial.h"
25
-
#include "hw/imx.h"
24
+
#include "hw/char/serial.h"
25
+
#include "hw/arm/imx.h"
26
26
27
27
/* Memory map for Kzm Emulation Baseboard:
28
28
* 0x00000000-0x00003fff 16k secure ROM IGNORED
+4
-4
hw/arm/mainstone.c
+4
-4
hw/arm/mainstone.c
···
12
12
* GNU GPL, version 2 or (at your option) any later version.
13
13
*/
14
14
#include "hw/hw.h"
15
-
#include "hw/pxa.h"
16
-
#include "hw/arm-misc.h"
15
+
#include "hw/arm/pxa.h"
16
+
#include "hw/arm.h"
17
17
#include "net/net.h"
18
-
#include "hw/devices.h"
18
+
#include "hw/arm/devices.h"
19
19
#include "hw/boards.h"
20
-
#include "hw/flash.h"
20
+
#include "hw/block/flash.h"
21
21
#include "sysemu/blockdev.h"
22
22
#include "hw/sysbus.h"
23
23
#include "exec/address-spaces.h"
+5
-5
hw/arm/musicpal.c
+5
-5
hw/arm/musicpal.c
···
10
10
*/
11
11
12
12
#include "hw/sysbus.h"
13
-
#include "hw/arm-misc.h"
14
-
#include "hw/devices.h"
13
+
#include "hw/arm.h"
14
+
#include "hw/arm/devices.h"
15
15
#include "net/net.h"
16
16
#include "sysemu/sysemu.h"
17
17
#include "hw/boards.h"
18
-
#include "hw/serial.h"
18
+
#include "hw/char/serial.h"
19
19
#include "qemu/timer.h"
20
20
#include "hw/ptimer.h"
21
21
#include "block/block.h"
22
-
#include "hw/flash.h"
22
+
#include "hw/block/flash.h"
23
23
#include "ui/console.h"
24
-
#include "hw/i2c.h"
24
+
#include "hw/i2c/i2c.h"
25
25
#include "sysemu/blockdev.h"
26
26
#include "exec/address-spaces.h"
27
27
#include "ui/pixel_ops.h"
+5
-5
hw/arm/nseries.c
+5
-5
hw/arm/nseries.c
···
20
20
21
21
#include "qemu-common.h"
22
22
#include "sysemu/sysemu.h"
23
-
#include "hw/omap.h"
24
-
#include "hw/arm-misc.h"
23
+
#include "hw/arm/omap.h"
24
+
#include "hw/arm.h"
25
25
#include "hw/irq.h"
26
26
#include "ui/console.h"
27
27
#include "hw/boards.h"
28
-
#include "hw/i2c.h"
29
-
#include "hw/devices.h"
30
-
#include "hw/flash.h"
28
+
#include "hw/i2c/i2c.h"
29
+
#include "hw/arm/devices.h"
30
+
#include "hw/block/flash.h"
31
31
#include "hw/hw.h"
32
32
#include "hw/bt.h"
33
33
#include "hw/loader.h"
+3
-3
hw/arm/omap1.c
+3
-3
hw/arm/omap1.c
···
17
17
* with this program; if not, see <http://www.gnu.org/licenses/>.
18
18
*/
19
19
#include "hw/hw.h"
20
-
#include "hw/arm-misc.h"
21
-
#include "hw/omap.h"
20
+
#include "hw/arm.h"
21
+
#include "hw/arm/omap.h"
22
22
#include "sysemu/sysemu.h"
23
-
#include "hw/soc_dma.h"
23
+
#include "hw/arm/soc_dma.h"
24
24
#include "sysemu/blockdev.h"
25
25
#include "qemu/range.h"
26
26
#include "hw/sysbus.h"
+4
-4
hw/arm/omap2.c
+4
-4
hw/arm/omap2.c
···
20
20
21
21
#include "sysemu/blockdev.h"
22
22
#include "hw/hw.h"
23
-
#include "hw/arm-misc.h"
24
-
#include "hw/omap.h"
23
+
#include "hw/arm.h"
24
+
#include "hw/arm/omap.h"
25
25
#include "sysemu/sysemu.h"
26
26
#include "qemu/timer.h"
27
27
#include "char/char.h"
28
-
#include "hw/flash.h"
29
-
#include "hw/soc_dma.h"
28
+
#include "hw/block/flash.h"
29
+
#include "hw/arm/soc_dma.h"
30
30
#include "hw/sysbus.h"
31
31
#include "audio/audio.h"
32
32
+3
-3
hw/arm/omap_sx1.c
+3
-3
hw/arm/omap_sx1.c
···
27
27
*/
28
28
#include "hw/hw.h"
29
29
#include "ui/console.h"
30
-
#include "hw/omap.h"
30
+
#include "hw/arm/omap.h"
31
31
#include "hw/boards.h"
32
-
#include "hw/arm-misc.h"
33
-
#include "hw/flash.h"
32
+
#include "hw/arm.h"
33
+
#include "hw/block/flash.h"
34
34
#include "sysemu/blockdev.h"
35
35
#include "exec/address-spaces.h"
36
36
+3
-3
hw/arm/palm.c
+3
-3
hw/arm/palm.c
···
20
20
#include "audio/audio.h"
21
21
#include "sysemu/sysemu.h"
22
22
#include "ui/console.h"
23
-
#include "hw/omap.h"
23
+
#include "hw/arm/omap.h"
24
24
#include "hw/boards.h"
25
-
#include "hw/arm-misc.h"
26
-
#include "hw/devices.h"
25
+
#include "hw/arm.h"
26
+
#include "hw/arm/devices.h"
27
27
#include "hw/loader.h"
28
28
#include "exec/address-spaces.h"
29
29
+1
-1
hw/arm/pic_cpu.c
+1
-1
hw/arm/pic_cpu.c
+3
-3
hw/arm/pxa2xx.c
+3
-3
hw/arm/pxa2xx.c
···
8
8
*/
9
9
10
10
#include "hw/sysbus.h"
11
-
#include "hw/pxa.h"
11
+
#include "hw/arm/pxa.h"
12
12
#include "sysemu/sysemu.h"
13
-
#include "hw/serial.h"
14
-
#include "hw/i2c.h"
13
+
#include "hw/char/serial.h"
14
+
#include "hw/i2c/i2c.h"
15
15
#include "hw/ssi.h"
16
16
#include "char/char.h"
17
17
#include "sysemu/blockdev.h"
+1
-1
hw/arm/pxa2xx_gpio.c
+1
-1
hw/arm/pxa2xx_gpio.c
+1
-1
hw/arm/pxa2xx_pic.c
+1
-1
hw/arm/pxa2xx_pic.c
+4
-4
hw/arm/realview.c
+4
-4
hw/arm/realview.c
···
8
8
*/
9
9
10
10
#include "hw/sysbus.h"
11
-
#include "hw/arm-misc.h"
12
-
#include "hw/primecell.h"
13
-
#include "hw/devices.h"
11
+
#include "hw/arm.h"
12
+
#include "hw/arm/primecell.h"
13
+
#include "hw/arm/devices.h"
14
14
#include "hw/pci/pci.h"
15
15
#include "net/net.h"
16
16
#include "sysemu/sysemu.h"
17
17
#include "hw/boards.h"
18
-
#include "hw/i2c.h"
18
+
#include "hw/i2c/i2c.h"
19
19
#include "sysemu/blockdev.h"
20
20
#include "exec/address-spaces.h"
21
21
+6
-6
hw/arm/spitz.c
+6
-6
hw/arm/spitz.c
···
11
11
*/
12
12
13
13
#include "hw/hw.h"
14
-
#include "hw/pxa.h"
15
-
#include "hw/arm-misc.h"
14
+
#include "hw/arm/pxa.h"
15
+
#include "hw/arm.h"
16
16
#include "sysemu/sysemu.h"
17
17
#include "hw/pcmcia.h"
18
-
#include "hw/i2c.h"
18
+
#include "hw/i2c/i2c.h"
19
19
#include "hw/ssi.h"
20
-
#include "hw/flash.h"
20
+
#include "hw/block/flash.h"
21
21
#include "qemu/timer.h"
22
-
#include "hw/devices.h"
23
-
#include "hw/sharpsl.h"
22
+
#include "hw/arm/devices.h"
23
+
#include "hw/arm/sharpsl.h"
24
24
#include "ui/console.h"
25
25
#include "block/block.h"
26
26
#include "audio/audio.h"
+3
-3
hw/arm/stellaris.c
+3
-3
hw/arm/stellaris.c
···
9
9
10
10
#include "hw/sysbus.h"
11
11
#include "hw/ssi.h"
12
-
#include "hw/arm-misc.h"
13
-
#include "hw/devices.h"
12
+
#include "hw/arm.h"
13
+
#include "hw/arm/devices.h"
14
14
#include "qemu/timer.h"
15
-
#include "hw/i2c.h"
15
+
#include "hw/i2c/i2c.h"
16
16
#include "net/net.h"
17
17
#include "hw/boards.h"
18
18
#include "exec/address-spaces.h"
+5
-5
hw/arm/tosa.c
+5
-5
hw/arm/tosa.c
···
12
12
*/
13
13
14
14
#include "hw/hw.h"
15
-
#include "hw/pxa.h"
16
-
#include "hw/arm-misc.h"
17
-
#include "hw/devices.h"
18
-
#include "hw/sharpsl.h"
15
+
#include "hw/arm/pxa.h"
16
+
#include "hw/arm.h"
17
+
#include "hw/arm/devices.h"
18
+
#include "hw/arm/sharpsl.h"
19
19
#include "hw/pcmcia.h"
20
20
#include "block/block.h"
21
21
#include "hw/boards.h"
22
-
#include "hw/i2c.h"
22
+
#include "hw/i2c/i2c.h"
23
23
#include "hw/ssi.h"
24
24
#include "sysemu/blockdev.h"
25
25
#include "hw/sysbus.h"
+4
-4
hw/arm/versatilepb.c
+4
-4
hw/arm/versatilepb.c
···
8
8
*/
9
9
10
10
#include "hw/sysbus.h"
11
-
#include "hw/arm-misc.h"
12
-
#include "hw/devices.h"
11
+
#include "hw/arm.h"
12
+
#include "hw/arm/devices.h"
13
13
#include "net/net.h"
14
14
#include "sysemu/sysemu.h"
15
15
#include "hw/pci/pci.h"
16
-
#include "hw/i2c.h"
16
+
#include "hw/i2c/i2c.h"
17
17
#include "hw/boards.h"
18
18
#include "sysemu/blockdev.h"
19
19
#include "exec/address-spaces.h"
20
-
#include "hw/flash.h"
20
+
#include "hw/block/flash.h"
21
21
22
22
#define VERSATILE_FLASH_ADDR 0x34000000
23
23
#define VERSATILE_FLASH_SIZE (64 * 1024 * 1024)
+4
-4
hw/arm/vexpress.c
+4
-4
hw/arm/vexpress.c
···
22
22
*/
23
23
24
24
#include "hw/sysbus.h"
25
-
#include "hw/arm-misc.h"
26
-
#include "hw/primecell.h"
27
-
#include "hw/devices.h"
25
+
#include "hw/arm.h"
26
+
#include "hw/arm/primecell.h"
27
+
#include "hw/arm/devices.h"
28
28
#include "net/net.h"
29
29
#include "sysemu/sysemu.h"
30
30
#include "hw/boards.h"
31
31
#include "exec/address-spaces.h"
32
32
#include "sysemu/blockdev.h"
33
-
#include "hw/flash.h"
33
+
#include "hw/block/flash.h"
34
34
35
35
#define VEXPRESS_BOARD_ID 0x8e0
36
36
#define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024)
+2
-2
hw/arm/xilinx_zynq.c
+2
-2
hw/arm/xilinx_zynq.c
···
16
16
*/
17
17
18
18
#include "hw/sysbus.h"
19
-
#include "hw/arm-misc.h"
19
+
#include "hw/arm.h"
20
20
#include "net/net.h"
21
21
#include "exec/address-spaces.h"
22
22
#include "sysemu/sysemu.h"
23
23
#include "hw/boards.h"
24
-
#include "hw/flash.h"
24
+
#include "hw/block/flash.h"
25
25
#include "sysemu/blockdev.h"
26
26
#include "hw/loader.h"
27
27
#include "hw/ssi.h"
+5
-5
hw/arm/z2.c
+5
-5
hw/arm/z2.c
···
12
12
*/
13
13
14
14
#include "hw/hw.h"
15
-
#include "hw/pxa.h"
16
-
#include "hw/arm-misc.h"
17
-
#include "hw/devices.h"
18
-
#include "hw/i2c.h"
15
+
#include "hw/arm/pxa.h"
16
+
#include "hw/arm.h"
17
+
#include "hw/arm/devices.h"
18
+
#include "hw/i2c/i2c.h"
19
19
#include "hw/ssi.h"
20
20
#include "hw/boards.h"
21
21
#include "sysemu/sysemu.h"
22
-
#include "hw/flash.h"
22
+
#include "hw/block/flash.h"
23
23
#include "sysemu/blockdev.h"
24
24
#include "ui/console.h"
25
25
#include "audio/audio.h"
+1
-1
hw/arm_sysctl.c
+1
-1
hw/arm_sysctl.c
+1
-1
hw/armv7m_nvic.c
+1
-1
hw/armv7m_nvic.c
hw/audiodev.h
include/hw/audio/audio.h
hw/audiodev.h
include/hw/audio/audio.h
+1
-1
hw/bitbang_i2c.h
+1
-1
hw/bitbang_i2c.h
+1
-1
hw/blizzard.c
+1
-1
hw/blizzard.c
+1
-1
hw/block-common.c
+1
-1
hw/block-common.c
hw/block-common.h
include/hw/block/block.h
hw/block-common.h
include/hw/block/block.h
hw/boards.h
include/hw/boards.h
hw/boards.h
include/hw/boards.h
+2
-2
hw/bonito.c
+2
-2
hw/bonito.c
+1
-1
hw/bt-hid.c
+1
-1
hw/bt-hid.c
hw/bt.h
include/hw/bt.h
hw/bt.h
include/hw/bt.h
+1
-1
hw/cbus.c
+1
-1
hw/cbus.c
+1
-1
hw/cdrom.c
+1
-1
hw/cdrom.c
+2
-2
hw/cris/axis_dev88.c
+2
-2
hw/cris/axis_dev88.c
···
24
24
25
25
#include "hw/sysbus.h"
26
26
#include "net/net.h"
27
-
#include "hw/flash.h"
27
+
#include "hw/block/flash.h"
28
28
#include "hw/boards.h"
29
-
#include "hw/etraxfs.h"
29
+
#include "hw/cris/etraxfs.h"
30
30
#include "hw/loader.h"
31
31
#include "elf.h"
32
32
#include "hw/cris-boot.h"
+1
-1
hw/cris/pic_cpu.c
+1
-1
hw/cris/pic_cpu.c
+2
-2
hw/cs4231a.c
+2
-2
hw/cs4231a.c
+1
-1
hw/cuda.c
+1
-1
hw/cuda.c
+1
-1
hw/dataplane/hostmem.c
+1
-1
hw/dataplane/hostmem.c
hw/dataplane/hostmem.h
include/hw/virtio/dataplane/hostmem.h
hw/dataplane/hostmem.h
include/hw/virtio/dataplane/hostmem.h
+3
-3
hw/dataplane/virtio-blk.c
+3
-3
hw/dataplane/virtio-blk.c
···
16
16
#include "qemu/iov.h"
17
17
#include "qemu/thread.h"
18
18
#include "qemu/error-report.h"
19
-
#include "vring.h"
19
+
#include "hw/virtio/dataplane/vring.h"
20
20
#include "ioq.h"
21
21
#include "migration/migration.h"
22
22
#include "block/block.h"
23
-
#include "hw/virtio-blk.h"
24
-
#include "hw/dataplane/virtio-blk.h"
23
+
#include "hw/virtio/virtio-blk.h"
24
+
#include "virtio-blk.h"
25
25
#include "block/aio.h"
26
26
27
27
enum {
+1
-1
hw/dataplane/virtio-blk.h
+1
-1
hw/dataplane/virtio-blk.h
+1
-1
hw/dataplane/vring.c
+1
-1
hw/dataplane/vring.c
+1
-1
hw/dataplane/vring.h
include/hw/virtio/dataplane/vring.h
+1
-1
hw/dataplane/vring.h
include/hw/virtio/dataplane/vring.h
+2
-2
hw/debugcon.c
+2
-2
hw/debugcon.c
+1
-1
hw/debugexit.c
+1
-1
hw/debugexit.c
hw/devices.h
include/hw/arm/devices.h
hw/devices.h
include/hw/arm/devices.h
+1
-1
hw/dma.c
+1
-1
hw/dma.c
+1
-1
hw/dp8393x.c
+1
-1
hw/dp8393x.c
+1
-1
hw/ds1338.c
+1
-1
hw/ds1338.c
+1
-1
hw/ecc.c
+1
-1
hw/ecc.c
+1
-1
hw/eepro100.c
+1
-1
hw/eepro100.c
+1
-1
hw/eeprom93xx.c
+1
-1
hw/eeprom93xx.c
hw/eeprom93xx.h
include/hw/nvram/eeprom93xx.h
hw/eeprom93xx.h
include/hw/nvram/eeprom93xx.h
hw/elf_ops.h
include/hw/elf_ops.h
hw/elf_ops.h
include/hw/elf_ops.h
hw/empty_slot.h
include/hw/empty_slot.h
hw/empty_slot.h
include/hw/empty_slot.h
+1
-1
hw/es1370.c
+1
-1
hw/es1370.c
+1
-1
hw/escc.c
+1
-1
hw/escc.c
hw/escc.h
include/hw/char/escc.h
hw/escc.h
include/hw/char/escc.h
+2
-2
hw/esp-pci.c
+2
-2
hw/esp-pci.c
+1
-1
hw/esp.c
+1
-1
hw/esp.c
+1
-1
hw/esp.h
include/hw/scsi/esp.h
+1
-1
hw/esp.h
include/hw/scsi/esp.h
+1
-1
hw/etraxfs.h
include/hw/cris/etraxfs.h
+1
-1
hw/etraxfs.h
include/hw/cris/etraxfs.h
+1
-1
hw/etraxfs_dma.c
+1
-1
hw/etraxfs_dma.c
hw/etraxfs_dma.h
include/hw/cris/etraxfs_dma.h
hw/etraxfs_dma.h
include/hw/cris/etraxfs_dma.h
+1
-1
hw/etraxfs_eth.c
+1
-1
hw/etraxfs_eth.c
hw/exynos4210.h
include/hw/arm/exynos4210.h
hw/exynos4210.h
include/hw/arm/exynos4210.h
+1
-1
hw/exynos4210_combiner.c
+1
-1
hw/exynos4210_combiner.c
+1
-1
hw/exynos4210_gic.c
+1
-1
hw/exynos4210_gic.c
+1
-1
hw/exynos4210_i2c.c
+1
-1
hw/exynos4210_i2c.c
+1
-1
hw/exynos4210_mct.c
+1
-1
hw/exynos4210_mct.c
+1
-1
hw/exynos4210_pwm.c
+1
-1
hw/exynos4210_pwm.c
+1
-1
hw/exynos4210_rtc.c
+1
-1
hw/exynos4210_rtc.c
+1
-1
hw/exynos4210_uart.c
+1
-1
hw/exynos4210_uart.c
+2
-2
hw/fdc.c
+2
-2
hw/fdc.c
···
28
28
*/
29
29
30
30
#include "hw/hw.h"
31
-
#include "hw/fdc.h"
31
+
#include "hw/block/fdc.h"
32
32
#include "qemu/error-report.h"
33
33
#include "qemu/timer.h"
34
-
#include "hw/isa.h"
34
+
#include "hw/isa/isa.h"
35
35
#include "hw/sysbus.h"
36
36
#include "hw/qdev-addr.h"
37
37
#include "sysemu/blockdev.h"
hw/fdc.h
include/hw/block/fdc.h
hw/fdc.h
include/hw/block/fdc.h
hw/firmware_abi.h
include/hw/sparc/firmware_abi.h
hw/firmware_abi.h
include/hw/sparc/firmware_abi.h
hw/flash.h
include/hw/block/flash.h
hw/flash.h
include/hw/block/flash.h
+2
-2
hw/fw_cfg.c
+2
-2
hw/fw_cfg.c
hw/fw_cfg.h
include/hw/nvram/fw_cfg.h
hw/fw_cfg.h
include/hw/nvram/fw_cfg.h
hw/grlib.h
include/hw/sparc/grlib.h
hw/grlib.h
include/hw/sparc/grlib.h
+1
-1
hw/grlib_irqmp.c
+1
-1
hw/grlib_irqmp.c
+2
-2
hw/gt64xxx.c
+2
-2
hw/gt64xxx.c
+2
-2
hw/gus.c
+2
-2
hw/gus.c
+1
-1
hw/hd-geometry.c
+1
-1
hw/hd-geometry.c
+1
-1
hw/hid.c
+1
-1
hw/hid.c
hw/hid.h
include/hw/input/hid.h
hw/hid.h
include/hw/input/hid.h
+4
-4
hw/hpet.c
+4
-4
hw/hpet.c
···
25
25
*/
26
26
27
27
#include "hw/hw.h"
28
-
#include "hw/pc.h"
28
+
#include "hw/i386/pc.h"
29
29
#include "ui/console.h"
30
30
#include "qemu/timer.h"
31
-
#include "hw/hpet_emul.h"
31
+
#include "hw/timer/hpet.h"
32
32
#include "hw/sysbus.h"
33
-
#include "hw/mc146818rtc.h"
34
-
#include "hw/i8254.h"
33
+
#include "hw/timer/mc146818rtc.h"
34
+
#include "hw/timer/i8254.h"
35
35
36
36
//#define HPET_DEBUG
37
37
#ifdef HPET_DEBUG
hw/hpet_emul.h
include/hw/timer/hpet.h
hw/hpet_emul.h
include/hw/timer/hpet.h
hw/hw.h
include/hw/hw.h
hw/hw.h
include/hw/hw.h
+1
-1
hw/i2c.c
+1
-1
hw/i2c.c
hw/i2c.h
include/hw/i2c/i2c.h
hw/i2c.h
include/hw/i2c/i2c.h
+1
-1
hw/i386/kvmvapic.c
+1
-1
hw/i386/kvmvapic.c
+1
-1
hw/i386/multiboot.c
+1
-1
hw/i386/multiboot.c
+12
-12
hw/i386/pc.c
+12
-12
hw/i386/pc.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/pc.h"
26
-
#include "hw/serial.h"
27
-
#include "hw/apic.h"
28
-
#include "hw/fdc.h"
25
+
#include "hw/i386/pc.h"
26
+
#include "hw/char/serial.h"
27
+
#include "hw/i386/apic.h"
28
+
#include "hw/block/fdc.h"
29
29
#include "hw/ide.h"
30
30
#include "hw/pci/pci.h"
31
31
#include "monitor/monitor.h"
32
-
#include "hw/fw_cfg.h"
33
-
#include "hw/hpet_emul.h"
34
-
#include "hw/smbios.h"
32
+
#include "hw/nvram/fw_cfg.h"
33
+
#include "hw/timer/hpet.h"
34
+
#include "hw/i386/smbios.h"
35
35
#include "hw/loader.h"
36
36
#include "elf.h"
37
37
#include "hw/multiboot.h"
38
-
#include "hw/mc146818rtc.h"
39
-
#include "hw/i8254.h"
40
-
#include "hw/pcspk.h"
38
+
#include "hw/timer/mc146818rtc.h"
39
+
#include "hw/timer/i8254.h"
40
+
#include "hw/audio/pcspk.h"
41
41
#include "hw/pci/msi.h"
42
42
#include "hw/sysbus.h"
43
43
#include "sysemu/sysemu.h"
44
44
#include "sysemu/kvm.h"
45
45
#include "kvm_i386.h"
46
-
#include "hw/xen.h"
46
+
#include "hw/xen/xen.h"
47
47
#include "sysemu/blockdev.h"
48
-
#include "hw/block-common.h"
48
+
#include "hw/block/block.h"
49
49
#include "ui/qemu-spice.h"
50
50
#include "exec/memory.h"
51
51
#include "exec/address-spaces.h"
+4
-4
hw/i386/pc_piix.c
+4
-4
hw/i386/pc_piix.c
···
25
25
#include <glib.h>
26
26
27
27
#include "hw/hw.h"
28
-
#include "hw/pc.h"
29
-
#include "hw/apic.h"
28
+
#include "hw/i386/pc.h"
29
+
#include "hw/i386/apic.h"
30
30
#include "hw/pci/pci.h"
31
31
#include "hw/pci/pci_ids.h"
32
32
#include "hw/usb.h"
···
39
39
#include "hw/sysbus.h"
40
40
#include "sysemu/arch_init.h"
41
41
#include "sysemu/blockdev.h"
42
-
#include "hw/smbus.h"
43
-
#include "hw/xen.h"
42
+
#include "hw/i2c/smbus.h"
43
+
#include "hw/xen/xen.h"
44
44
#include "exec/memory.h"
45
45
#include "exec/address-spaces.h"
46
46
#include "cpu.h"
+5
-5
hw/i386/pc_q35.c
+5
-5
hw/i386/pc_q35.c
···
29
29
*/
30
30
#include "hw/hw.h"
31
31
#include "sysemu/arch_init.h"
32
-
#include "hw/smbus.h"
32
+
#include "hw/i2c/smbus.h"
33
33
#include "hw/boards.h"
34
-
#include "hw/mc146818rtc.h"
35
-
#include "hw/xen.h"
34
+
#include "hw/timer/mc146818rtc.h"
35
+
#include "hw/xen/xen.h"
36
36
#include "sysemu/kvm.h"
37
37
#include "hw/kvm/clock.h"
38
-
#include "hw/q35.h"
38
+
#include "hw/pci-host/q35.h"
39
39
#include "exec/address-spaces.h"
40
-
#include "hw/ich9.h"
40
+
#include "hw/i386/ich9.h"
41
41
#include "hw/ide/pci.h"
42
42
#include "hw/ide/ahci.h"
43
43
#include "hw/usb.h"
+1
-1
hw/i386/smbios.c
+1
-1
hw/i386/smbios.c
+1
-1
hw/i386/xen_domainbuild.c
+1
-1
hw/i386/xen_domainbuild.c
+2
-2
hw/i386/xen_machine_pv.c
+2
-2
hw/i386/xen_machine_pv.c
+1
-1
hw/i82374.c
+1
-1
hw/i82374.c
+3
-3
hw/i82378.c
+3
-3
hw/i82378.c
+4
-4
hw/i8254.c
+4
-4
hw/i8254.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/pc.h"
26
-
#include "hw/isa.h"
25
+
#include "hw/i386/pc.h"
26
+
#include "hw/isa/isa.h"
27
27
#include "qemu/timer.h"
28
-
#include "hw/i8254.h"
29
-
#include "hw/i8254_internal.h"
28
+
#include "hw/timer/i8254.h"
29
+
#include "hw/timer/i8254_internal.h"
30
30
31
31
//#define DEBUG_PIT
32
32
+1
-1
hw/i8254.h
include/hw/timer/i8254.h
+1
-1
hw/i8254.h
include/hw/timer/i8254.h
+4
-4
hw/i8254_common.c
+4
-4
hw/i8254_common.c
···
23
23
* THE SOFTWARE.
24
24
*/
25
25
#include "hw/hw.h"
26
-
#include "hw/pc.h"
27
-
#include "hw/isa.h"
26
+
#include "hw/i386/pc.h"
27
+
#include "hw/isa/isa.h"
28
28
#include "qemu/timer.h"
29
-
#include "hw/i8254.h"
30
-
#include "hw/i8254_internal.h"
29
+
#include "hw/timer/i8254.h"
30
+
#include "hw/timer/i8254_internal.h"
31
31
32
32
/* val must be 0 or 1 */
33
33
void pit_set_gate(ISADevice *dev, int channel, int val)
+2
-2
hw/i8254_internal.h
include/hw/timer/i8254_internal.h
+2
-2
hw/i8254_internal.h
include/hw/timer/i8254_internal.h
+3
-3
hw/i8259.c
+3
-3
hw/i8259.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/pc.h"
26
-
#include "hw/isa.h"
25
+
#include "hw/i386/pc.h"
26
+
#include "hw/isa/isa.h"
27
27
#include "monitor/monitor.h"
28
28
#include "qemu/timer.h"
29
-
#include "hw/i8259_internal.h"
29
+
#include "hw/isa/i8259_internal.h"
30
30
31
31
/* debug PIC */
32
32
//#define DEBUG_PIC
+2
-2
hw/i8259_common.c
+2
-2
hw/i8259_common.c
···
22
22
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23
23
* THE SOFTWARE.
24
24
*/
25
-
#include "hw/pc.h"
26
-
#include "hw/i8259_internal.h"
25
+
#include "hw/i386/pc.h"
26
+
#include "hw/isa/i8259_internal.h"
27
27
28
28
void pic_reset_common(PICCommonState *s)
29
29
{
+2
-2
hw/i8259_internal.h
include/hw/isa/i8259_internal.h
+2
-2
hw/i8259_internal.h
include/hw/isa/i8259_internal.h
+1
-1
hw/i82801b11.c
+1
-1
hw/i82801b11.c
+6
-7
hw/ich9.h
include/hw/i386/ich9.h
+6
-7
hw/ich9.h
include/hw/i386/ich9.h
···
3
3
4
4
#include "hw/hw.h"
5
5
#include "qemu/range.h"
6
-
#include "hw/isa.h"
6
+
#include "hw/isa/isa.h"
7
7
#include "hw/sysbus.h"
8
-
#include "hw/pc.h"
9
-
#include "hw/apm.h"
10
-
#include "hw/ioapic.h"
8
+
#include "hw/i386/pc.h"
9
+
#include "hw/isa/apm.h"
10
+
#include "hw/i386/ioapic.h"
11
11
#include "hw/pci/pci.h"
12
12
#include "hw/pci/pcie_host.h"
13
13
#include "hw/pci/pci_bridge.h"
14
-
#include "hw/acpi.h"
15
-
#include "hw/acpi_ich9.h"
16
-
#include "hw/pam.h"
14
+
#include "hw/acpi/acpi.h"
15
+
#include "hw/acpi/ich9.h"
17
16
#include "hw/pci/pci_bus.h"
18
17
19
18
void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
+1
-1
hw/ide.h
include/hw/ide.h
+1
-1
hw/ide.h
include/hw/ide.h
+1
-1
hw/ide/ahci.c
+1
-1
hw/ide/ahci.c
+1
-1
hw/ide/atapi.c
+1
-1
hw/ide/atapi.c
+2
-2
hw/ide/cmd646.c
+2
-2
hw/ide/cmd646.c
+3
-3
hw/ide/core.c
+3
-3
hw/ide/core.c
···
23
23
* THE SOFTWARE.
24
24
*/
25
25
#include <hw/hw.h>
26
-
#include <hw/pc.h>
26
+
#include <hw/i386/pc.h>
27
27
#include <hw/pci/pci.h>
28
-
#include <hw/isa.h>
28
+
#include <hw/isa/isa.h>
29
29
#include "qemu/error-report.h"
30
30
#include "qemu/timer.h"
31
31
#include "sysemu/sysemu.h"
32
32
#include "sysemu/dma.h"
33
-
#include "hw/block-common.h"
33
+
#include "hw/block/block.h"
34
34
#include "sysemu/blockdev.h"
35
35
36
36
#include <hw/ide/internal.h>
+2
-2
hw/ide/ich.c
+2
-2
hw/ide/ich.c
+3
-3
hw/ide/internal.h
+3
-3
hw/ide/internal.h
···
7
7
* non-internal declarations are in hw/ide.h
8
8
*/
9
9
#include <hw/ide.h>
10
-
#include <hw/isa.h>
10
+
#include <hw/isa/isa.h>
11
11
#include "exec/iorange.h"
12
12
#include "sysemu/dma.h"
13
13
#include "sysemu/sysemu.h"
14
-
#include "hw/block-common.h"
15
-
#include "hw/scsi-defs.h"
14
+
#include "hw/block/block.h"
15
+
#include "block/scsi.h"
16
16
17
17
/* debug IDE devices */
18
18
//#define DEBUG_IDE
+2
-2
hw/ide/isa.c
+2
-2
hw/ide/isa.c
+1
-1
hw/ide/macio.c
+1
-1
hw/ide/macio.c
+1
-1
hw/ide/microdrive.c
+1
-1
hw/ide/microdrive.c
+2
-2
hw/ide/pci.c
+2
-2
hw/ide/pci.c
+2
-2
hw/ide/piix.c
+2
-2
hw/ide/piix.c
+1
-1
hw/ide/qdev.c
+1
-1
hw/ide/qdev.c
+2
-2
hw/ide/via.c
+2
-2
hw/ide/via.c
hw/imx.h
include/hw/arm/imx.h
hw/imx.h
include/hw/arm/imx.h
+1
-1
hw/imx_ccm.c
+1
-1
hw/imx_ccm.c
+1
-1
hw/imx_serial.c
+1
-1
hw/imx_serial.c
+1
-1
hw/imx_timer.c
+1
-1
hw/imx_timer.c
+1
-1
hw/intel-hda.c
+1
-1
hw/intel-hda.c
+4
-4
hw/ioapic.c
+4
-4
hw/ioapic.c
···
21
21
*/
22
22
23
23
#include "hw/hw.h"
24
-
#include "hw/pc.h"
25
-
#include "hw/apic.h"
26
-
#include "hw/ioapic.h"
27
-
#include "hw/ioapic_internal.h"
24
+
#include "hw/i386/pc.h"
25
+
#include "hw/i386/apic.h"
26
+
#include "hw/i386/ioapic.h"
27
+
#include "hw/i386/ioapic_internal.h"
28
28
29
29
//#define DEBUG_IOAPIC
30
30
hw/ioapic.h
include/hw/i386/ioapic.h
hw/ioapic.h
include/hw/i386/ioapic.h
+2
-2
hw/ioapic_common.c
+2
-2
hw/ioapic_common.c
···
19
19
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
20
20
*/
21
21
22
-
#include "hw/ioapic.h"
23
-
#include "hw/ioapic_internal.h"
22
+
#include "hw/i386/ioapic.h"
23
+
#include "hw/i386/ioapic_internal.h"
24
24
#include "hw/sysbus.h"
25
25
26
26
void ioapic_reset_common(DeviceState *dev)
hw/ioapic_internal.h
include/hw/i386/ioapic_internal.h
hw/ioapic_internal.h
include/hw/i386/ioapic_internal.h
hw/irq.h
include/hw/irq.h
hw/irq.h
include/hw/irq.h
+1
-1
hw/isa-bus.c
+1
-1
hw/isa-bus.c
hw/isa.h
include/hw/isa/isa.h
hw/isa.h
include/hw/isa/isa.h
+1
-1
hw/isa_mmio.c
+1
-1
hw/isa_mmio.c
+1
-1
hw/ivshmem.c
+1
-1
hw/ivshmem.c
+1
-1
hw/kvm/apic.c
+1
-1
hw/kvm/apic.c
hw/kvm/clock.h
include/hw/kvm/clock.h
hw/kvm/clock.h
include/hw/kvm/clock.h
+2
-2
hw/kvm/i8254.c
+2
-2
hw/kvm/i8254.c
+2
-2
hw/kvm/i8259.c
+2
-2
hw/kvm/i8259.c
···
9
9
* This work is licensed under the terms of the GNU GPL version 2.
10
10
* See the COPYING file in the top-level directory.
11
11
*/
12
-
#include "hw/i8259_internal.h"
13
-
#include "hw/apic_internal.h"
12
+
#include "hw/isa/i8259_internal.h"
13
+
#include "hw/i386/apic_internal.h"
14
14
#include "sysemu/kvm.h"
15
15
16
16
static void kvm_pic_get(PICCommonState *s)
+3
-3
hw/kvm/ioapic.c
+3
-3
hw/kvm/ioapic.c
···
10
10
* See the COPYING file in the top-level directory.
11
11
*/
12
12
13
-
#include "hw/pc.h"
14
-
#include "hw/ioapic_internal.h"
15
-
#include "hw/apic_internal.h"
13
+
#include "hw/i386/pc.h"
14
+
#include "hw/i386/ioapic_internal.h"
15
+
#include "hw/i386/apic_internal.h"
16
16
#include "sysemu/kvm.h"
17
17
18
18
/* PC Utility function */
+1
-1
hw/kvm/pci-assign.c
+1
-1
hw/kvm/pci-assign.c
+1
-1
hw/lan9118.c
+1
-1
hw/lan9118.c
+1
-1
hw/lance.c
+1
-1
hw/lance.c
+2
-2
hw/lm32/lm32_boards.c
+2
-2
hw/lm32/lm32_boards.c
+2
-2
hw/lm32/milkymist.c
+2
-2
hw/lm32/milkymist.c
+1
-1
hw/lm32_juart.c
+1
-1
hw/lm32_juart.c
hw/lm32_juart.h
include/hw/lm32/lm32_juart.h
hw/lm32_juart.h
include/hw/lm32/lm32_juart.h
+2
-2
hw/lm32_pic.c
+2
-2
hw/lm32_pic.c
···
20
20
#include <assert.h>
21
21
22
22
#include "hw/hw.h"
23
-
#include "hw/pc.h"
23
+
#include "hw/i386/pc.h"
24
24
#include "monitor/monitor.h"
25
25
#include "hw/sysbus.h"
26
26
#include "trace.h"
27
-
#include "hw/lm32_pic.h"
27
+
#include "hw/lm32/lm32_pic.h"
28
28
29
29
struct LM32PicState {
30
30
SysBusDevice busdev;
hw/lm32_pic.h
include/hw/lm32/lm32_pic.h
hw/lm32_pic.h
include/hw/lm32/lm32_pic.h
+1
-1
hw/lm832x.c
+1
-1
hw/lm832x.c
+1
-1
hw/loader.c
+1
-1
hw/loader.c
hw/loader.h
include/hw/loader.h
hw/loader.h
include/hw/loader.h
+7
-8
hw/lpc_ich9.c
+7
-8
hw/lpc_ich9.c
···
30
30
#include "qemu-common.h"
31
31
#include "hw/hw.h"
32
32
#include "qemu/range.h"
33
-
#include "hw/isa.h"
33
+
#include "hw/isa/isa.h"
34
34
#include "hw/sysbus.h"
35
-
#include "hw/pc.h"
36
-
#include "hw/apm.h"
37
-
#include "hw/ioapic.h"
35
+
#include "hw/i386/pc.h"
36
+
#include "hw/isa/apm.h"
37
+
#include "hw/i386/ioapic.h"
38
38
#include "hw/pci/pci.h"
39
39
#include "hw/pci/pcie_host.h"
40
40
#include "hw/pci/pci_bridge.h"
41
-
#include "hw/ich9.h"
42
-
#include "hw/acpi.h"
43
-
#include "hw/acpi_ich9.h"
44
-
#include "hw/pam.h"
41
+
#include "hw/i386/ich9.h"
42
+
#include "hw/acpi/acpi.h"
43
+
#include "hw/acpi/ich9.h"
45
44
#include "hw/pci/pci_bus.h"
46
45
#include "exec/address-spaces.h"
47
46
#include "sysemu/sysemu.h"
+1
-1
hw/lsi53c895a.c
+1
-1
hw/lsi53c895a.c
+1
-1
hw/m25p80.c
+1
-1
hw/m25p80.c
+2
-2
hw/m48t59.c
+2
-2
hw/m48t59.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/nvram.h"
25
+
#include "hw/timer/m48t59.h"
26
26
#include "qemu/timer.h"
27
27
#include "sysemu/sysemu.h"
28
28
#include "hw/sysbus.h"
29
-
#include "hw/isa.h"
29
+
#include "hw/isa/isa.h"
30
30
#include "exec/address-spaces.h"
31
31
32
32
//#define DEBUG_NVRAM
+1
-1
hw/m68k/an5206.c
+1
-1
hw/m68k/an5206.c
+1
-1
hw/m68k/mcf5206.c
+1
-1
hw/m68k/mcf5206.c
+1
-1
hw/m68k/mcf5208.c
+1
-1
hw/m68k/mcf5208.c
+1
-1
hw/m68k/mcf_intc.c
+1
-1
hw/m68k/mcf_intc.c
+2
-2
hw/mac_dbdma.c
+2
-2
hw/mac_dbdma.c
hw/mac_dbdma.h
include/hw/ppc/mac_dbdma.h
hw/mac_dbdma.h
include/hw/ppc/mac_dbdma.h
+1
-1
hw/mac_nvram.c
+1
-1
hw/mac_nvram.c
+2
-2
hw/macio.c
+2
-2
hw/macio.c
···
25
25
#include "hw/hw.h"
26
26
#include "hw/ppc/mac.h"
27
27
#include "hw/pci/pci.h"
28
-
#include "hw/mac_dbdma.h"
29
-
#include "hw/escc.h"
28
+
#include "hw/ppc/mac_dbdma.h"
29
+
#include "hw/char/escc.h"
30
30
31
31
#define TYPE_MACIO "macio"
32
32
#define MACIO(obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO)
+1
-1
hw/marvell_88w8618_audio.c
+1
-1
hw/marvell_88w8618_audio.c
+1
-1
hw/max7310.c
+1
-1
hw/max7310.c
+2
-2
hw/mc146818rtc.c
+2
-2
hw/mc146818rtc.c
···
24
24
#include "hw/hw.h"
25
25
#include "qemu/timer.h"
26
26
#include "sysemu/sysemu.h"
27
-
#include "hw/mc146818rtc.h"
27
+
#include "hw/timer/mc146818rtc.h"
28
28
#include "qapi/visitor.h"
29
29
30
30
#ifdef TARGET_I386
31
-
#include "hw/apic.h"
31
+
#include "hw/i386/apic.h"
32
32
#endif
33
33
34
34
//#define DEBUG_CMOS
+2
-2
hw/mc146818rtc.h
include/hw/timer/mc146818rtc.h
+2
-2
hw/mc146818rtc.h
include/hw/timer/mc146818rtc.h
···
1
1
#ifndef MC146818RTC_H
2
2
#define MC146818RTC_H
3
3
4
-
#include "hw/isa.h"
5
-
#include "hw/mc146818rtc_regs.h"
4
+
#include "hw/isa/isa.h"
5
+
#include "hw/timer/mc146818rtc_regs.h"
6
6
7
7
ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq);
8
8
void rtc_set_memory(ISADevice *dev, int addr, int val);
hw/mc146818rtc_regs.h
include/hw/timer/mc146818rtc_regs.h
hw/mc146818rtc_regs.h
include/hw/timer/mc146818rtc_regs.h
hw/mcf.h
include/hw/m68k/mcf.h
hw/mcf.h
include/hw/m68k/mcf.h
+1
-1
hw/mcf_fec.c
+1
-1
hw/mcf_fec.c
+1
-1
hw/mcf_uart.c
+1
-1
hw/mcf_uart.c
+2
-2
hw/megasas.c
+2
-2
hw/megasas.c
+3
-3
hw/microblaze/petalogix_ml605_mmu.c
+3
-3
hw/microblaze/petalogix_ml605_mmu.c
···
28
28
#include "hw/sysbus.h"
29
29
#include "hw/hw.h"
30
30
#include "net/net.h"
31
-
#include "hw/flash.h"
31
+
#include "hw/block/flash.h"
32
32
#include "sysemu/sysemu.h"
33
-
#include "hw/devices.h"
33
+
#include "hw/arm/devices.h"
34
34
#include "hw/boards.h"
35
35
#include "hw/xilinx.h"
36
36
#include "sysemu/blockdev.h"
37
-
#include "hw/serial.h"
37
+
#include "hw/char/serial.h"
38
38
#include "exec/address-spaces.h"
39
39
#include "hw/ssi.h"
40
40
+2
-2
hw/microblaze/petalogix_s3adsp1800_mmu.c
+2
-2
hw/microblaze/petalogix_s3adsp1800_mmu.c
···
26
26
#include "hw/sysbus.h"
27
27
#include "hw/hw.h"
28
28
#include "net/net.h"
29
-
#include "hw/flash.h"
29
+
#include "hw/block/flash.h"
30
30
#include "sysemu/sysemu.h"
31
-
#include "hw/devices.h"
31
+
#include "hw/arm/devices.h"
32
32
#include "hw/boards.h"
33
33
#include "hw/xilinx.h"
34
34
#include "sysemu/blockdev.h"
+1
-1
hw/milkymist-softusb.c
+1
-1
hw/milkymist-softusb.c
hw/mips-bios.h
include/hw/mips/bios.h
hw/mips-bios.h
include/hw/mips/bios.h
hw/mips.h
include/hw/mips/mips.h
hw/mips.h
include/hw/mips/mips.h
+1
-1
hw/mips/addr.c
+1
-1
hw/mips/addr.c
+1
-1
hw/mips/cputimer.c
+1
-1
hw/mips/cputimer.c
+11
-11
hw/mips/mips_fulong2e.c
+11
-11
hw/mips/mips_fulong2e.c
···
19
19
*/
20
20
21
21
#include "hw/hw.h"
22
-
#include "hw/pc.h"
23
-
#include "hw/serial.h"
24
-
#include "hw/fdc.h"
22
+
#include "hw/i386/pc.h"
23
+
#include "hw/char/serial.h"
24
+
#include "hw/block/fdc.h"
25
25
#include "net/net.h"
26
26
#include "hw/boards.h"
27
-
#include "hw/smbus.h"
27
+
#include "hw/i2c/smbus.h"
28
28
#include "block/block.h"
29
-
#include "hw/flash.h"
30
-
#include "hw/mips.h"
31
-
#include "hw/mips_cpudevs.h"
29
+
#include "hw/block/flash.h"
30
+
#include "hw/mips/mips.h"
31
+
#include "hw/mips/cpudevs.h"
32
32
#include "hw/pci/pci.h"
33
33
#include "char/char.h"
34
34
#include "sysemu/sysemu.h"
35
35
#include "audio/audio.h"
36
36
#include "qemu/log.h"
37
37
#include "hw/loader.h"
38
-
#include "hw/mips-bios.h"
38
+
#include "hw/mips/bios.h"
39
39
#include "hw/ide.h"
40
40
#include "elf.h"
41
-
#include "hw/vt82c686.h"
42
-
#include "hw/mc146818rtc.h"
43
-
#include "hw/i8254.h"
41
+
#include "hw/isa/vt82c686.h"
42
+
#include "hw/timer/mc146818rtc.h"
43
+
#include "hw/timer/i8254.h"
44
44
#include "sysemu/blockdev.h"
45
45
#include "exec/address-spaces.h"
46
46
+1
-1
hw/mips/mips_int.c
+1
-1
hw/mips/mips_int.c
+11
-11
hw/mips/mips_jazz.c
+11
-11
hw/mips/mips_jazz.c
···
23
23
*/
24
24
25
25
#include "hw/hw.h"
26
-
#include "hw/mips.h"
27
-
#include "hw/mips_cpudevs.h"
28
-
#include "hw/pc.h"
29
-
#include "hw/serial.h"
30
-
#include "hw/isa.h"
31
-
#include "hw/fdc.h"
26
+
#include "hw/mips/mips.h"
27
+
#include "hw/mips/cpudevs.h"
28
+
#include "hw/i386/pc.h"
29
+
#include "hw/char/serial.h"
30
+
#include "hw/isa/isa.h"
31
+
#include "hw/block/fdc.h"
32
32
#include "sysemu/sysemu.h"
33
33
#include "sysemu/arch_init.h"
34
34
#include "hw/boards.h"
35
35
#include "net/net.h"
36
-
#include "hw/esp.h"
37
-
#include "hw/mips-bios.h"
36
+
#include "hw/scsi/esp.h"
37
+
#include "hw/mips/bios.h"
38
38
#include "hw/loader.h"
39
-
#include "hw/mc146818rtc.h"
40
-
#include "hw/i8254.h"
41
-
#include "hw/pcspk.h"
39
+
#include "hw/timer/mc146818rtc.h"
40
+
#include "hw/timer/i8254.h"
41
+
#include "hw/audio/pcspk.h"
42
42
#include "sysemu/blockdev.h"
43
43
#include "hw/sysbus.h"
44
44
#include "exec/address-spaces.h"
+10
-10
hw/mips/mips_malta.c
+10
-10
hw/mips/mips_malta.c
···
23
23
*/
24
24
25
25
#include "hw/hw.h"
26
-
#include "hw/pc.h"
27
-
#include "hw/serial.h"
28
-
#include "hw/fdc.h"
26
+
#include "hw/i386/pc.h"
27
+
#include "hw/char/serial.h"
28
+
#include "hw/block/fdc.h"
29
29
#include "net/net.h"
30
30
#include "hw/boards.h"
31
-
#include "hw/smbus.h"
31
+
#include "hw/i2c/smbus.h"
32
32
#include "block/block.h"
33
-
#include "hw/flash.h"
34
-
#include "hw/mips.h"
35
-
#include "hw/mips_cpudevs.h"
33
+
#include "hw/block/flash.h"
34
+
#include "hw/mips/mips.h"
35
+
#include "hw/mips/cpudevs.h"
36
36
#include "hw/pci/pci.h"
37
37
#include "char/char.h"
38
38
#include "sysemu/sysemu.h"
39
39
#include "sysemu/arch_init.h"
40
40
#include "hw/boards.h"
41
41
#include "qemu/log.h"
42
-
#include "hw/mips-bios.h"
42
+
#include "hw/mips/bios.h"
43
43
#include "hw/ide.h"
44
44
#include "hw/loader.h"
45
45
#include "elf.h"
46
-
#include "hw/mc146818rtc.h"
47
-
#include "hw/i8254.h"
46
+
#include "hw/timer/mc146818rtc.h"
47
+
#include "hw/timer/i8254.h"
48
48
#include "sysemu/blockdev.h"
49
49
#include "exec/address-spaces.h"
50
50
#include "hw/sysbus.h" /* SysBusDevice */
+5
-5
hw/mips/mips_mipssim.c
+5
-5
hw/mips/mips_mipssim.c
···
25
25
* THE SOFTWARE.
26
26
*/
27
27
#include "hw/hw.h"
28
-
#include "hw/mips.h"
29
-
#include "hw/mips_cpudevs.h"
30
-
#include "hw/serial.h"
31
-
#include "hw/isa.h"
28
+
#include "hw/mips/mips.h"
29
+
#include "hw/mips/cpudevs.h"
30
+
#include "hw/char/serial.h"
31
+
#include "hw/isa/isa.h"
32
32
#include "net/net.h"
33
33
#include "sysemu/sysemu.h"
34
34
#include "hw/boards.h"
35
-
#include "hw/mips-bios.h"
35
+
#include "hw/mips/bios.h"
36
36
#include "hw/loader.h"
37
37
#include "elf.h"
38
38
#include "hw/sysbus.h"
+9
-9
hw/mips/mips_r4k.c
+9
-9
hw/mips/mips_r4k.c
···
8
8
* the standard PC ISA addresses.
9
9
*/
10
10
#include "hw/hw.h"
11
-
#include "hw/mips.h"
12
-
#include "hw/mips_cpudevs.h"
13
-
#include "hw/pc.h"
14
-
#include "hw/serial.h"
15
-
#include "hw/isa.h"
11
+
#include "hw/mips/mips.h"
12
+
#include "hw/mips/cpudevs.h"
13
+
#include "hw/i386/pc.h"
14
+
#include "hw/char/serial.h"
15
+
#include "hw/isa/isa.h"
16
16
#include "net/net.h"
17
17
#include "sysemu/sysemu.h"
18
18
#include "hw/boards.h"
19
-
#include "hw/flash.h"
19
+
#include "hw/block/flash.h"
20
20
#include "qemu/log.h"
21
-
#include "hw/mips-bios.h"
21
+
#include "hw/mips/bios.h"
22
22
#include "hw/ide.h"
23
23
#include "hw/loader.h"
24
24
#include "elf.h"
25
-
#include "hw/mc146818rtc.h"
26
-
#include "hw/i8254.h"
25
+
#include "hw/timer/mc146818rtc.h"
26
+
#include "hw/timer/i8254.h"
27
27
#include "sysemu/blockdev.h"
28
28
#include "exec/address-spaces.h"
29
29
hw/mips_cpudevs.h
include/hw/mips/cpudevs.h
hw/mips_cpudevs.h
include/hw/mips/cpudevs.h
+3
-3
hw/moxie/moxiesim.c
+3
-3
hw/moxie/moxiesim.c
···
26
26
*/
27
27
#include "hw/sysbus.h"
28
28
#include "hw/hw.h"
29
-
#include "hw/pc.h"
30
-
#include "hw/isa.h"
29
+
#include "hw/i386/pc.h"
30
+
#include "hw/isa/isa.h"
31
31
#include "net/net.h"
32
32
#include "sysemu/sysemu.h"
33
33
#include "hw/boards.h"
34
34
#include "hw/loader.h"
35
-
#include "hw/serial.h"
35
+
#include "hw/char/serial.h"
36
36
#include "exec/address-spaces.h"
37
37
38
38
#define PHYS_MEM_BASE 0x80000000
+1
-1
hw/nand.c
+1
-1
hw/nand.c
+2
-2
hw/ne2000-isa.c
+2
-2
hw/ne2000-isa.c
hw/nvram.h
include/hw/timer/m48t59.h
hw/nvram.h
include/hw/timer/m48t59.h
hw/omap.h
include/hw/arm/omap.h
hw/omap.h
include/hw/arm/omap.h
+1
-1
hw/omap_clk.c
+1
-1
hw/omap_clk.c
+2
-2
hw/omap_dma.c
+2
-2
hw/omap_dma.c
+1
-1
hw/omap_dss.c
+1
-1
hw/omap_dss.c
+1
-1
hw/omap_gpio.c
+1
-1
hw/omap_gpio.c
+2
-2
hw/omap_gpmc.c
+2
-2
hw/omap_gpmc.c
···
19
19
* with this program; if not, see <http://www.gnu.org/licenses/>.
20
20
*/
21
21
#include "hw/hw.h"
22
-
#include "hw/flash.h"
23
-
#include "hw/omap.h"
22
+
#include "hw/block/flash.h"
23
+
#include "hw/arm/omap.h"
24
24
#include "exec/memory.h"
25
25
#include "exec/address-spaces.h"
26
26
+1
-1
hw/omap_gptimer.c
+1
-1
hw/omap_gptimer.c
+2
-2
hw/omap_i2c.c
+2
-2
hw/omap_i2c.c
+1
-1
hw/omap_intc.c
+1
-1
hw/omap_intc.c
+1
-1
hw/omap_l4.c
+1
-1
hw/omap_l4.c
+1
-1
hw/omap_lcdc.c
+1
-1
hw/omap_lcdc.c
+1
-1
hw/omap_mmc.c
+1
-1
hw/omap_mmc.c
+1
-1
hw/omap_sdrc.c
+1
-1
hw/omap_sdrc.c
+1
-1
hw/omap_spi.c
+1
-1
hw/omap_spi.c
+1
-1
hw/omap_synctimer.c
+1
-1
hw/omap_synctimer.c
+1
-1
hw/omap_tap.c
+1
-1
hw/omap_tap.c
+2
-2
hw/omap_uart.c
+2
-2
hw/omap_uart.c
+1
-1
hw/onenand.c
+1
-1
hw/onenand.c
+2
-2
hw/openpic.c
+2
-2
hw/openpic.c
···
36
36
#include "hw/hw.h"
37
37
#include "hw/ppc/mac.h"
38
38
#include "hw/pci/pci.h"
39
-
#include "hw/openpic.h"
39
+
#include "hw/ppc/openpic.h"
40
40
#include "hw/sysbus.h"
41
41
#include "hw/pci/msi.h"
42
42
#include "qemu/bitops.h"
43
-
#include "hw/ppc.h"
43
+
#include "hw/ppc/ppc.h"
44
44
45
45
//#define DEBUG_OPENPIC
46
46
hw/openpic.h
include/hw/ppc/openpic.h
hw/openpic.h
include/hw/ppc/openpic.h
+1
-1
hw/openrisc/openrisc_sim.c
+1
-1
hw/openrisc/openrisc_sim.c
+1
-1
hw/pam.c
+1
-1
hw/pam.c
hw/pam.h
include/hw/pci-host/pam.h
hw/pam.h
include/hw/pci-host/pam.h
+2
-2
hw/parallel.c
+2
-2
hw/parallel.c
+1
-1
hw/pc-testdev.c
+1
-1
hw/pc-testdev.c
+3
-3
hw/pc.h
include/hw/i386/pc.h
+3
-3
hw/pc.h
include/hw/i386/pc.h
···
4
4
#include "qemu-common.h"
5
5
#include "exec/memory.h"
6
6
#include "exec/ioport.h"
7
-
#include "hw/isa.h"
8
-
#include "hw/fdc.h"
7
+
#include "hw/isa/isa.h"
8
+
#include "hw/block/fdc.h"
9
9
#include "net/net.h"
10
10
#include "exec/memory.h"
11
-
#include "hw/ioapic.h"
11
+
#include "hw/i386/ioapic.h"
12
12
13
13
/* PC-style peripherals (also used by other machines). */
14
14
+1
-1
hw/pc87312.c
+1
-1
hw/pc87312.c
+1
-1
hw/pc87312.h
include/hw/isa/pc87312.h
+1
-1
hw/pc87312.h
include/hw/isa/pc87312.h
+2
-2
hw/pc_sysfw.c
+2
-2
hw/pc_sysfw.c
···
27
27
#include "qemu/error-report.h"
28
28
#include "hw/sysbus.h"
29
29
#include "hw/hw.h"
30
-
#include "hw/pc.h"
30
+
#include "hw/i386/pc.h"
31
31
#include "hw/boards.h"
32
32
#include "hw/loader.h"
33
33
#include "sysemu/sysemu.h"
34
-
#include "hw/flash.h"
34
+
#include "hw/block/flash.h"
35
35
#include "sysemu/kvm.h"
36
36
37
37
#define BIOS_FILENAME "bios.bin"
hw/pci/msi.h
include/hw/pci/msi.h
hw/pci/msi.h
include/hw/pci/msi.h
hw/pci/msix.h
include/hw/pci/msix.h
hw/pci/msix.h
include/hw/pci/msix.h
+3
-3
hw/pci/pci-hotplug.c
+3
-3
hw/pci/pci-hotplug.c
···
26
26
#include "hw/boards.h"
27
27
#include "hw/pci/pci.h"
28
28
#include "net/net.h"
29
-
#include "hw/pc.h"
29
+
#include "hw/i386/pc.h"
30
30
#include "monitor/monitor.h"
31
-
#include "hw/scsi.h"
32
-
#include "hw/virtio-blk.h"
31
+
#include "hw/scsi/scsi.h"
32
+
#include "hw/virtio/virtio-blk.h"
33
33
#include "qemu/config-file.h"
34
34
#include "sysemu/blockdev.h"
35
35
#include "qapi/error.h"
+1
-1
hw/pci/pci.h
include/hw/pci/pci.h
+1
-1
hw/pci/pci.h
include/hw/pci/pci.h
hw/pci/pci_bridge.h
include/hw/pci/pci_bridge.h
hw/pci/pci_bridge.h
include/hw/pci/pci_bridge.h
hw/pci/pci_bus.h
include/hw/pci/pci_bus.h
hw/pci/pci_bus.h
include/hw/pci/pci_bus.h
hw/pci/pci_host.h
include/hw/pci/pci_host.h
hw/pci/pci_host.h
include/hw/pci/pci_host.h
hw/pci/pci_ids.h
include/hw/pci/pci_ids.h
hw/pci/pci_ids.h
include/hw/pci/pci_ids.h
hw/pci/pci_regs.h
include/hw/pci/pci_regs.h
hw/pci/pci_regs.h
include/hw/pci/pci_regs.h
hw/pci/pcie.h
include/hw/pci/pcie.h
hw/pci/pcie.h
include/hw/pci/pcie.h
hw/pci/pcie_aer.h
include/hw/pci/pcie_aer.h
hw/pci/pcie_aer.h
include/hw/pci/pcie_aer.h
hw/pci/pcie_host.h
include/hw/pci/pcie_host.h
hw/pci/pcie_host.h
include/hw/pci/pcie_host.h
hw/pci/pcie_port.h
include/hw/pci/pcie_port.h
hw/pci/pcie_port.h
include/hw/pci/pcie_port.h
hw/pci/pcie_regs.h
include/hw/pci/pcie_regs.h
hw/pci/pcie_regs.h
include/hw/pci/pcie_regs.h
hw/pci/shpc.h
include/hw/pci/shpc.h
hw/pci/shpc.h
include/hw/pci/shpc.h
hw/pci/slotid_cap.h
include/hw/pci/slotid_cap.h
hw/pci/slotid_cap.h
include/hw/pci/slotid_cap.h
+3
-3
hw/pckbd.c
+3
-3
hw/pckbd.c
hw/pcmcia.h
include/hw/pcmcia.h
hw/pcmcia.h
include/hw/pcmcia.h
+4
-4
hw/pcspk.c
+4
-4
hw/pcspk.c
···
23
23
*/
24
24
25
25
#include "hw/hw.h"
26
-
#include "hw/pc.h"
27
-
#include "hw/isa.h"
26
+
#include "hw/i386/pc.h"
27
+
#include "hw/isa/isa.h"
28
28
#include "audio/audio.h"
29
29
#include "qemu/timer.h"
30
-
#include "hw/i8254.h"
31
-
#include "hw/pcspk.h"
30
+
#include "hw/timer/i8254.h"
31
+
#include "hw/audio/pcspk.h"
32
32
33
33
#define PCSPK_BUF_LEN 1792
34
34
#define PCSPK_SAMPLE_RATE 32000
+1
-1
hw/pcspk.h
include/hw/audio/pcspk.h
+1
-1
hw/pcspk.h
include/hw/audio/pcspk.h
+1
-1
hw/pflash_cfi01.c
+1
-1
hw/pflash_cfi01.c
+1
-1
hw/pflash_cfi02.c
+1
-1
hw/pflash_cfi02.c
+2
-2
hw/piix4.c
+2
-2
hw/piix4.c
+4
-4
hw/piix_pci.c
+4
-4
hw/piix_pci.c
···
23
23
*/
24
24
25
25
#include "hw/hw.h"
26
-
#include "hw/pc.h"
26
+
#include "hw/i386/pc.h"
27
27
#include "hw/pci/pci.h"
28
28
#include "hw/pci/pci_host.h"
29
-
#include "hw/isa.h"
29
+
#include "hw/isa/isa.h"
30
30
#include "hw/sysbus.h"
31
31
#include "qemu/range.h"
32
-
#include "hw/xen.h"
33
-
#include "hw/pam.h"
32
+
#include "hw/xen/xen.h"
33
+
#include "hw/pci-host/pam.h"
34
34
#include "sysemu/sysemu.h"
35
35
36
36
/*
+1
-1
hw/pl050.c
+1
-1
hw/pl050.c
+1
-1
hw/pl330.c
+1
-1
hw/pl330.c
+3
-3
hw/pm_smbus.c
+3
-3
hw/pm_smbus.c
hw/pm_smbus.h
include/hw/i2c/pm_smbus.h
hw/pm_smbus.h
include/hw/i2c/pm_smbus.h
hw/ppc.h
include/hw/ppc/ppc.h
hw/ppc.h
include/hw/ppc/ppc.h
+4
-4
hw/ppc/e500.c
+4
-4
hw/ppc/e500.c
···
21
21
#include "net/net.h"
22
22
#include "qemu/config-file.h"
23
23
#include "hw/hw.h"
24
-
#include "hw/serial.h"
24
+
#include "hw/char/serial.h"
25
25
#include "hw/pci/pci.h"
26
26
#include "hw/boards.h"
27
27
#include "sysemu/sysemu.h"
28
28
#include "sysemu/kvm.h"
29
29
#include "kvm_ppc.h"
30
30
#include "sysemu/device_tree.h"
31
-
#include "hw/openpic.h"
32
-
#include "hw/ppc.h"
31
+
#include "hw/ppc/openpic.h"
32
+
#include "hw/ppc/ppc.h"
33
33
#include "hw/loader.h"
34
34
#include "elf.h"
35
35
#include "hw/sysbus.h"
36
36
#include "exec/address-spaces.h"
37
37
#include "qemu/host-utils.h"
38
-
#include "hw/ppce500_pci.h"
38
+
#include "hw/pci-host/ppce500.h"
39
39
40
40
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
41
41
#define UIMAGE_LOAD_BASE 0
+1
-1
hw/ppc/e500plat.c
+1
-1
hw/ppc/e500plat.c
+1
-1
hw/ppc/mac.h
+1
-1
hw/ppc/mac.h
+7
-7
hw/ppc/mac_newworld.c
+7
-7
hw/ppc/mac_newworld.c
···
47
47
*
48
48
*/
49
49
#include "hw/hw.h"
50
-
#include "hw/ppc.h"
50
+
#include "hw/ppc/ppc.h"
51
51
#include "hw/ppc/mac.h"
52
-
#include "hw/adb.h"
53
-
#include "hw/mac_dbdma.h"
54
-
#include "hw/nvram.h"
52
+
#include "hw/input/adb.h"
53
+
#include "hw/ppc/mac_dbdma.h"
54
+
#include "hw/timer/m48t59.h"
55
55
#include "hw/pci/pci.h"
56
56
#include "net/net.h"
57
57
#include "sysemu/sysemu.h"
58
58
#include "hw/boards.h"
59
-
#include "hw/fw_cfg.h"
60
-
#include "hw/escc.h"
61
-
#include "hw/openpic.h"
59
+
#include "hw/nvram/fw_cfg.h"
60
+
#include "hw/char/escc.h"
61
+
#include "hw/ppc/openpic.h"
62
62
#include "hw/ide.h"
63
63
#include "hw/loader.h"
64
64
#include "elf.h"
+6
-6
hw/ppc/mac_oldworld.c
+6
-6
hw/ppc/mac_oldworld.c
···
24
24
* THE SOFTWARE.
25
25
*/
26
26
#include "hw/hw.h"
27
-
#include "hw/ppc.h"
27
+
#include "hw/ppc/ppc.h"
28
28
#include "mac.h"
29
-
#include "hw/adb.h"
30
-
#include "hw/nvram.h"
29
+
#include "hw/input/adb.h"
30
+
#include "hw/timer/m48t59.h"
31
31
#include "sysemu/sysemu.h"
32
32
#include "net/net.h"
33
-
#include "hw/isa.h"
33
+
#include "hw/isa/isa.h"
34
34
#include "hw/pci/pci.h"
35
35
#include "hw/boards.h"
36
-
#include "hw/fw_cfg.h"
37
-
#include "hw/escc.h"
36
+
#include "hw/nvram/fw_cfg.h"
37
+
#include "hw/char/escc.h"
38
38
#include "hw/ide.h"
39
39
#include "hw/loader.h"
40
40
#include "elf.h"
+1
-1
hw/ppc/mpc8544ds.c
+1
-1
hw/ppc/mpc8544ds.c
+2
-2
hw/ppc/ppc.c
+2
-2
hw/ppc/ppc.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/ppc.h"
25
+
#include "hw/ppc/ppc.h"
26
26
#include "qemu/timer.h"
27
27
#include "sysemu/sysemu.h"
28
-
#include "hw/nvram.h"
28
+
#include "hw/timer/m48t59.h"
29
29
#include "qemu/log.h"
30
30
#include "hw/loader.h"
31
31
#include "sysemu/kvm.h"
+3
-3
hw/ppc/ppc405_boards.c
+3
-3
hw/ppc/ppc405_boards.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/ppc.h"
25
+
#include "hw/ppc/ppc.h"
26
26
#include "hw/ppc405.h"
27
-
#include "hw/nvram.h"
28
-
#include "hw/flash.h"
27
+
#include "hw/timer/m48t59.h"
28
+
#include "hw/block/flash.h"
29
29
#include "sysemu/sysemu.h"
30
30
#include "block/block.h"
31
31
#include "hw/boards.h"
+2
-2
hw/ppc/ppc405_uc.c
+2
-2
hw/ppc/ppc405_uc.c
+2
-2
hw/ppc/ppc440_bamboo.c
+2
-2
hw/ppc/ppc440_bamboo.c
···
23
23
#include "hw/loader.h"
24
24
#include "elf.h"
25
25
#include "exec/address-spaces.h"
26
-
#include "hw/serial.h"
27
-
#include "hw/ppc.h"
26
+
#include "hw/char/serial.h"
27
+
#include "hw/ppc/ppc.h"
28
28
#include "hw/ppc405.h"
29
29
#include "sysemu/sysemu.h"
30
30
#include "hw/sysbus.h"
+2
-2
hw/ppc/ppc4xx_devs.c
+2
-2
hw/ppc/ppc4xx_devs.c
+2
-2
hw/ppc/ppc_booke.c
+2
-2
hw/ppc/ppc_booke.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/ppc.h"
25
+
#include "hw/ppc/ppc.h"
26
26
#include "qemu/timer.h"
27
27
#include "sysemu/sysemu.h"
28
-
#include "hw/nvram.h"
28
+
#include "hw/timer/m48t59.h"
29
29
#include "qemu/log.h"
30
30
#include "hw/loader.h"
31
31
+8
-8
hw/ppc/prep.c
+8
-8
hw/ppc/prep.c
···
22
22
* THE SOFTWARE.
23
23
*/
24
24
#include "hw/hw.h"
25
-
#include "hw/nvram.h"
26
-
#include "hw/pc.h"
27
-
#include "hw/serial.h"
28
-
#include "hw/fdc.h"
25
+
#include "hw/timer/m48t59.h"
26
+
#include "hw/i386/pc.h"
27
+
#include "hw/char/serial.h"
28
+
#include "hw/block/fdc.h"
29
29
#include "net/net.h"
30
30
#include "sysemu/sysemu.h"
31
-
#include "hw/isa.h"
31
+
#include "hw/isa/isa.h"
32
32
#include "hw/pci/pci.h"
33
33
#include "hw/pci/pci_host.h"
34
-
#include "hw/ppc.h"
34
+
#include "hw/ppc/ppc.h"
35
35
#include "hw/boards.h"
36
36
#include "qemu/log.h"
37
37
#include "hw/ide.h"
38
38
#include "hw/loader.h"
39
-
#include "hw/mc146818rtc.h"
40
-
#include "hw/pc87312.h"
39
+
#include "hw/timer/mc146818rtc.h"
40
+
#include "hw/isa/pc87312.h"
41
41
#include "sysemu/blockdev.h"
42
42
#include "sysemu/arch_init.h"
43
43
#include "exec/address-spaces.h"
+5
-5
hw/ppc/spapr.c
+5
-5
hw/ppc/spapr.c
···
34
34
#include "kvm_ppc.h"
35
35
36
36
#include "hw/boards.h"
37
-
#include "hw/ppc.h"
37
+
#include "hw/ppc/ppc.h"
38
38
#include "hw/loader.h"
39
39
40
-
#include "hw/spapr.h"
41
-
#include "hw/spapr_vio.h"
42
-
#include "hw/spapr_pci.h"
43
-
#include "hw/xics.h"
40
+
#include "hw/ppc/spapr.h"
41
+
#include "hw/ppc/spapr_vio.h"
42
+
#include "hw/pci-host/spapr.h"
43
+
#include "hw/ppc/xics.h"
44
44
#include "hw/pci/msi.h"
45
45
46
46
#include "sysemu/kvm.h"
+2
-2
hw/ppc/spapr_events.c
+2
-2
hw/ppc/spapr_events.c
+1
-1
hw/ppc/spapr_hcall.c
+1
-1
hw/ppc/spapr_hcall.c
+1
-1
hw/ppc/spapr_iommu.c
+1
-1
hw/ppc/spapr_iommu.c
+2
-2
hw/ppc/spapr_rtas.c
+2
-2
hw/ppc/spapr_rtas.c
+3
-3
hw/ppc/spapr_vio.c
+3
-3
hw/ppc/spapr_vio.c
···
30
30
#include "sysemu/device_tree.h"
31
31
#include "kvm_ppc.h"
32
32
33
-
#include "hw/spapr.h"
34
-
#include "hw/spapr_vio.h"
35
-
#include "hw/xics.h"
33
+
#include "hw/ppc/spapr.h"
34
+
#include "hw/ppc/spapr_vio.h"
35
+
#include "hw/ppc/xics.h"
36
36
37
37
#ifdef CONFIG_FDT
38
38
#include <libfdt.h>
+5
-5
hw/ppc/virtex_ml507.c
+5
-5
hw/ppc/virtex_ml507.c
···
24
24
25
25
#include "hw/sysbus.h"
26
26
#include "hw/hw.h"
27
-
#include "hw/serial.h"
28
-
#include "hw/flash.h"
27
+
#include "hw/char/serial.h"
28
+
#include "hw/block/flash.h"
29
29
#include "sysemu/sysemu.h"
30
-
#include "hw/devices.h"
30
+
#include "hw/arm/devices.h"
31
31
#include "hw/boards.h"
32
32
#include "sysemu/device_tree.h"
33
33
#include "hw/loader.h"
···
35
35
#include "qemu/log.h"
36
36
#include "exec/address-spaces.h"
37
37
38
-
#include "hw/ppc.h"
39
-
#include "hw/ppc4xx.h"
38
+
#include "hw/ppc/ppc.h"
39
+
#include "hw/ppc/ppc4xx.h"
40
40
#include "hw/ppc405.h"
41
41
42
42
#include "sysemu/blockdev.h"
+2
-2
hw/ppc/xics.c
+2
-2
hw/ppc/xics.c
+1
-1
hw/ppc405.h
+1
-1
hw/ppc405.h
hw/ppc4xx.h
include/hw/ppc/ppc4xx.h
hw/ppc4xx.h
include/hw/ppc/ppc4xx.h
+2
-2
hw/ppc4xx_pci.c
+2
-2
hw/ppc4xx_pci.c
+1
-1
hw/ppce500_pci.c
+1
-1
hw/ppce500_pci.c
hw/ppce500_pci.h
include/hw/pci-host/ppce500.h
hw/ppce500_pci.h
include/hw/pci-host/ppce500.h
+1
-1
hw/prep_pci.c
+1
-1
hw/prep_pci.c
hw/primecell.h
include/hw/arm/primecell.h
hw/primecell.h
include/hw/arm/primecell.h
+1
-1
hw/ps2.c
+1
-1
hw/ps2.c
hw/ps2.h
include/hw/input/ps2.h
hw/ps2.h
include/hw/input/ps2.h
hw/ptimer.h
include/hw/ptimer.h
hw/ptimer.h
include/hw/ptimer.h
hw/puv3.h
include/hw/unicore32/puv3.h
hw/puv3.h
include/hw/unicore32/puv3.h
+1
-1
hw/puv3_dma.c
+1
-1
hw/puv3_dma.c
+1
-1
hw/puv3_gpio.c
+1
-1
hw/puv3_gpio.c
+1
-1
hw/puv3_intc.c
+1
-1
hw/puv3_intc.c
+1
-1
hw/puv3_ost.c
+1
-1
hw/puv3_ost.c
+1
-1
hw/puv3_pm.c
+1
-1
hw/puv3_pm.c
hw/pxa.h
include/hw/arm/pxa.h
hw/pxa.h
include/hw/arm/pxa.h
+1
-1
hw/pxa2xx_dma.c
+1
-1
hw/pxa2xx_dma.c
+1
-1
hw/pxa2xx_keypad.c
+1
-1
hw/pxa2xx_keypad.c
+1
-1
hw/pxa2xx_lcd.c
+1
-1
hw/pxa2xx_lcd.c
+1
-1
hw/pxa2xx_mmci.c
+1
-1
hw/pxa2xx_mmci.c
+1
-1
hw/pxa2xx_pcmcia.c
+1
-1
hw/pxa2xx_pcmcia.c
+1
-1
hw/pxa2xx_timer.c
+1
-1
hw/pxa2xx_timer.c
+1
-1
hw/q35.c
+1
-1
hw/q35.c
+7
-7
hw/q35.h
include/hw/pci-host/q35.h
+7
-7
hw/q35.h
include/hw/pci-host/q35.h
···
24
24
25
25
#include "hw/hw.h"
26
26
#include "qemu/range.h"
27
-
#include "hw/isa.h"
27
+
#include "hw/isa/isa.h"
28
28
#include "hw/sysbus.h"
29
-
#include "hw/pc.h"
30
-
#include "hw/apm.h"
31
-
#include "hw/apic.h"
29
+
#include "hw/i386/pc.h"
30
+
#include "hw/isa/apm.h"
31
+
#include "hw/i386/apic.h"
32
32
#include "hw/pci/pci.h"
33
33
#include "hw/pci/pcie_host.h"
34
-
#include "hw/acpi.h"
35
-
#include "hw/acpi_ich9.h"
36
-
#include "hw/pam.h"
34
+
#include "hw/acpi/acpi.h"
35
+
#include "hw/acpi/ich9.h"
36
+
#include "hw/pci-host/pam.h"
37
37
38
38
#define TYPE_Q35_HOST_DEVICE "q35-pcihost"
39
39
#define Q35_HOST_DEVICE(obj) \
hw/qdev-addr.h
include/hw/qdev-addr.h
hw/qdev-addr.h
include/hw/qdev-addr.h
hw/qdev-core.h
include/hw/qdev-core.h
hw/qdev-core.h
include/hw/qdev-core.h
hw/qdev-dma.h
include/hw/qdev-dma.h
hw/qdev-dma.h
include/hw/qdev-dma.h
+1
-1
hw/qdev-properties-system.c
+1
-1
hw/qdev-properties-system.c
+1
-1
hw/qdev-properties.c
+1
-1
hw/qdev-properties.c
hw/qdev-properties.h
include/hw/qdev-properties.h
hw/qdev-properties.h
include/hw/qdev-properties.h
hw/qdev.h
include/hw/qdev.h
hw/qdev.h
include/hw/qdev.h
+1
-1
hw/rc4030.c
+1
-1
hw/rc4030.c
hw/s390x/event-facility.h
include/hw/s390x/event-facility.h
hw/s390x/event-facility.h
include/hw/s390x/event-facility.h
+5
-5
hw/s390x/s390-virtio-bus.c
+5
-5
hw/s390x/s390-virtio-bus.c
···
24
24
#include "monitor/monitor.h"
25
25
#include "hw/loader.h"
26
26
#include "elf.h"
27
-
#include "hw/virtio.h"
28
-
#include "hw/virtio-rng.h"
29
-
#include "hw/virtio-serial.h"
30
-
#include "hw/virtio-net.h"
27
+
#include "hw/virtio/virtio.h"
28
+
#include "hw/virtio/virtio-rng.h"
29
+
#include "hw/virtio/virtio-serial.h"
30
+
#include "hw/virtio/virtio-net.h"
31
31
#include "hw/sysbus.h"
32
32
#include "sysemu/kvm.h"
33
33
34
34
#include "hw/s390x/s390-virtio-bus.h"
35
-
#include "hw/virtio-bus.h"
35
+
#include "hw/virtio/virtio-bus.h"
36
36
37
37
/* #define DEBUG_S390 */
38
38
+6
-6
hw/s390x/s390-virtio-bus.h
+6
-6
hw/s390x/s390-virtio-bus.h
···
19
19
#ifndef HW_S390_VIRTIO_BUS_H
20
20
#define HW_S390_VIRTIO_BUS_H 1
21
21
22
-
#include "hw/virtio-blk.h"
23
-
#include "hw/virtio-net.h"
24
-
#include "hw/virtio-rng.h"
25
-
#include "hw/virtio-serial.h"
26
-
#include "hw/virtio-scsi.h"
27
-
#include "hw/virtio-bus.h"
22
+
#include "hw/virtio/virtio-blk.h"
23
+
#include "hw/virtio/virtio-net.h"
24
+
#include "hw/virtio/virtio-rng.h"
25
+
#include "hw/virtio/virtio-serial.h"
26
+
#include "hw/virtio/virtio-scsi.h"
27
+
#include "hw/virtio/virtio-bus.h"
28
28
29
29
#define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */
30
30
#define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */
+1
-1
hw/s390x/s390-virtio.c
+1
-1
hw/s390x/s390-virtio.c
hw/s390x/sclp.h
include/hw/s390x/sclp.h
hw/s390x/sclp.h
include/hw/s390x/sclp.h
+4
-4
hw/s390x/virtio-ccw.c
+4
-4
hw/s390x/virtio-ccw.c
···
15
15
#include "sysemu/sysemu.h"
16
16
#include "net/net.h"
17
17
#include "monitor/monitor.h"
18
-
#include "hw/virtio.h"
19
-
#include "hw/virtio-serial.h"
20
-
#include "hw/virtio-net.h"
18
+
#include "hw/virtio/virtio.h"
19
+
#include "hw/virtio/virtio-serial.h"
20
+
#include "hw/virtio/virtio-net.h"
21
21
#include "hw/sysbus.h"
22
22
#include "qemu/bitops.h"
23
-
#include "hw/virtio-bus.h"
23
+
#include "hw/virtio/virtio-bus.h"
24
24
25
25
#include "ioinst.h"
26
26
#include "css.h"
+7
-7
hw/s390x/virtio-ccw.h
+7
-7
hw/s390x/virtio-ccw.h
···
12
12
#ifndef HW_S390X_VIRTIO_CCW_H
13
13
#define HW_S390X_VIRTIO_CCW_H
14
14
15
-
#include <hw/virtio-blk.h>
16
-
#include <hw/virtio-net.h>
17
-
#include <hw/virtio-serial.h>
18
-
#include <hw/virtio-scsi.h>
19
-
#include "hw/virtio-balloon.h"
20
-
#include <hw/virtio-rng.h>
21
-
#include <hw/virtio-bus.h>
15
+
#include <hw/virtio/virtio-blk.h>
16
+
#include <hw/virtio/virtio-net.h>
17
+
#include <hw/virtio/virtio-serial.h>
18
+
#include <hw/virtio/virtio-scsi.h>
19
+
#include <hw/virtio/virtio-balloon.h>
20
+
#include <hw/virtio/virtio-rng.h>
21
+
#include <hw/virtio/virtio-bus.h>
22
22
23
23
#define VIRTUAL_CSSID 0xfe
24
24
+2
-2
hw/sb16.c
+2
-2
hw/sb16.c
+2
-2
hw/scsi-bus.c
+2
-2
hw/scsi-bus.c
hw/scsi-defs.h
include/block/scsi.h
hw/scsi-defs.h
include/block/scsi.h
+3
-3
hw/scsi-disk.c
+3
-3
hw/scsi-disk.c
···
30
30
31
31
#include "qemu-common.h"
32
32
#include "qemu/error-report.h"
33
-
#include "hw/scsi.h"
34
-
#include "hw/scsi-defs.h"
33
+
#include "hw/scsi/scsi.h"
34
+
#include "block/scsi.h"
35
35
#include "sysemu/sysemu.h"
36
36
#include "sysemu/blockdev.h"
37
-
#include "hw/block-common.h"
37
+
#include "hw/block/block.h"
38
38
#include "sysemu/dma.h"
39
39
40
40
#ifdef __linux
+2
-2
hw/scsi-generic.c
+2
-2
hw/scsi-generic.c
···
13
13
14
14
#include "qemu-common.h"
15
15
#include "qemu/error-report.h"
16
-
#include "hw/scsi.h"
16
+
#include "hw/scsi/scsi.h"
17
17
#include "sysemu/blockdev.h"
18
18
19
19
#ifdef __linux__
···
35
35
#include <sys/stat.h>
36
36
#include <unistd.h>
37
37
#include <scsi/sg.h>
38
-
#include "hw/scsi-defs.h"
38
+
#include "block/scsi.h"
39
39
40
40
#define SCSI_SENSE_BUF_SIZE 96
41
41
+1
-1
hw/scsi.h
include/hw/scsi/scsi.h
+1
-1
hw/scsi.h
include/hw/scsi/scsi.h
hw/sd.h
include/hw/sd.h
hw/sd.h
include/hw/sd.h
+2
-2
hw/serial-isa.c
+2
-2
hw/serial-isa.c
+1
-1
hw/serial-pci.c
+1
-1
hw/serial-pci.c
+1
-1
hw/serial.c
+1
-1
hw/serial.c
hw/serial.h
include/hw/char/serial.h
hw/serial.h
include/hw/char/serial.h
+1
-1
hw/sga.c
+1
-1
hw/sga.c
+1
-1
hw/sh.h
include/hw/sh4/sh.h
+1
-1
hw/sh.h
include/hw/sh4/sh.h
+3
-3
hw/sh4/r2d.c
+3
-3
hw/sh4/r2d.c
···
25
25
26
26
#include "hw/sysbus.h"
27
27
#include "hw/hw.h"
28
-
#include "hw/sh.h"
29
-
#include "hw/devices.h"
28
+
#include "hw/sh4/sh.h"
29
+
#include "hw/arm/devices.h"
30
30
#include "sysemu/sysemu.h"
31
31
#include "hw/boards.h"
32
32
#include "hw/pci/pci.h"
···
35
35
#include "hw/ide.h"
36
36
#include "hw/loader.h"
37
37
#include "hw/usb.h"
38
-
#include "hw/flash.h"
38
+
#include "hw/block/flash.h"
39
39
#include "sysemu/blockdev.h"
40
40
#include "exec/address-spaces.h"
41
41
+2
-2
hw/sh4/sh7750.c
+2
-2
hw/sh4/sh7750.c
···
24
24
*/
25
25
#include <stdio.h>
26
26
#include "hw/hw.h"
27
-
#include "hw/sh.h"
27
+
#include "hw/sh4/sh.h"
28
28
#include "sysemu/sysemu.h"
29
29
#include "hw/sh7750_regs.h"
30
30
#include "hw/sh7750_regnames.h"
31
-
#include "hw/sh_intc.h"
31
+
#include "hw/sh4/sh_intc.h"
32
32
#include "cpu.h"
33
33
#include "exec/address-spaces.h"
34
34
+1
-1
hw/sh4/sh7750_regnames.c
+1
-1
hw/sh4/sh7750_regnames.c
+1
-1
hw/sh4/shix.c
+1
-1
hw/sh4/shix.c
+2
-2
hw/sh_intc.c
+2
-2
hw/sh_intc.c
hw/sh_intc.h
include/hw/sh4/sh_intc.h
hw/sh_intc.h
include/hw/sh4/sh_intc.h
+1
-1
hw/sh_pci.c
+1
-1
hw/sh_pci.c
+1
-1
hw/sh_serial.c
+1
-1
hw/sh_serial.c
+1
-1
hw/sh_timer.c
+1
-1
hw/sh_timer.c
hw/sharpsl.h
include/hw/arm/sharpsl.h
hw/sharpsl.h
include/hw/arm/sharpsl.h
+1
-1
hw/slavio_intctl.c
+1
-1
hw/slavio_intctl.c
+1
-1
hw/slavio_timer.c
+1
-1
hw/slavio_timer.c
+2
-2
hw/sm501.c
+2
-2
hw/sm501.c
···
24
24
25
25
#include <stdio.h>
26
26
#include "hw/hw.h"
27
-
#include "hw/serial.h"
27
+
#include "hw/char/serial.h"
28
28
#include "ui/console.h"
29
-
#include "hw/devices.h"
29
+
#include "hw/arm/devices.h"
30
30
#include "hw/sysbus.h"
31
31
#include "hw/qdev-addr.h"
32
32
#include "qemu/range.h"
hw/smbios.h
include/hw/i386/smbios.h
hw/smbios.h
include/hw/i386/smbios.h
+2
-2
hw/smbus.c
+2
-2
hw/smbus.c
+1
-1
hw/smbus.h
include/hw/i2c/smbus.h
+1
-1
hw/smbus.h
include/hw/i2c/smbus.h
+2
-2
hw/smbus_eeprom.c
+2
-2
hw/smbus_eeprom.c
+5
-5
hw/smbus_ich9.c
+5
-5
hw/smbus_ich9.c
···
25
25
*
26
26
*/
27
27
#include "hw/hw.h"
28
-
#include "hw/pc.h"
29
-
#include "hw/pm_smbus.h"
28
+
#include "hw/i386/pc.h"
29
+
#include "hw/i2c/pm_smbus.h"
30
30
#include "hw/pci/pci.h"
31
31
#include "sysemu/sysemu.h"
32
-
#include "hw/i2c.h"
33
-
#include "hw/smbus.h"
32
+
#include "hw/i2c/i2c.h"
33
+
#include "hw/i2c/smbus.h"
34
34
35
-
#include "hw/ich9.h"
35
+
#include "hw/i386/ich9.h"
36
36
37
37
#define TYPE_ICH9_SMB_DEVICE "ICH9 SMB"
38
38
#define ICH9_SMB_DEVICE(obj) \
+1
-1
hw/smc91c111.c
+1
-1
hw/smc91c111.c
+1
-1
hw/soc_dma.c
+1
-1
hw/soc_dma.c
hw/soc_dma.h
include/hw/arm/soc_dma.h
hw/soc_dma.h
include/hw/arm/soc_dma.h
+1
-1
hw/spapr.h
include/hw/ppc/spapr.h
+1
-1
hw/spapr.h
include/hw/ppc/spapr.h
+2
-2
hw/spapr_llan.c
+2
-2
hw/spapr_llan.c
+2
-2
hw/spapr_nvram.c
+2
-2
hw/spapr_nvram.c
+2
-2
hw/spapr_pci.c
+2
-2
hw/spapr_pci.c
···
27
27
#include "hw/pci/msi.h"
28
28
#include "hw/pci/msix.h"
29
29
#include "hw/pci/pci_host.h"
30
-
#include "hw/spapr.h"
31
-
#include "hw/spapr_pci.h"
30
+
#include "hw/ppc/spapr.h"
31
+
#include "hw/pci-host/spapr.h"
32
32
#include "exec/address-spaces.h"
33
33
#include <libfdt.h>
34
34
#include "trace.h"
+1
-1
hw/spapr_pci.h
include/hw/pci-host/spapr.h
+1
-1
hw/spapr_pci.h
include/hw/pci-host/spapr.h
hw/spapr_vio.h
include/hw/ppc/spapr_vio.h
hw/spapr_vio.h
include/hw/ppc/spapr_vio.h
+4
-4
hw/spapr_vscsi.c
+4
-4
hw/spapr_vscsi.c
···
32
32
* - Maybe do autosense (PAPR seems to mandate it, linux doesn't care)
33
33
*/
34
34
#include "hw/hw.h"
35
-
#include "hw/scsi.h"
36
-
#include "hw/scsi-defs.h"
35
+
#include "hw/scsi/scsi.h"
36
+
#include "block/scsi.h"
37
37
#include "hw/srp.h"
38
38
#include "hw/qdev.h"
39
-
#include "hw/spapr.h"
40
-
#include "hw/spapr_vio.h"
39
+
#include "hw/ppc/spapr.h"
40
+
#include "hw/ppc/spapr_vio.h"
41
41
#include "hw/ppc-viosrp.h"
42
42
43
43
#include <libfdt.h>
+2
-2
hw/spapr_vty.c
+2
-2
hw/spapr_vty.c
+1
-1
hw/sparc/leon3.c
+1
-1
hw/sparc/leon3.c
+10
-10
hw/sparc/sun4m.c
+10
-10
hw/sparc/sun4m.c
···
23
23
*/
24
24
#include "hw/sysbus.h"
25
25
#include "qemu/timer.h"
26
-
#include "hw/sun4m.h"
27
-
#include "hw/nvram.h"
28
-
#include "hw/sparc32_dma.h"
29
-
#include "hw/fdc.h"
26
+
#include "hw/sparc/sun4m.h"
27
+
#include "hw/timer/m48t59.h"
28
+
#include "hw/sparc/sparc32_dma.h"
29
+
#include "hw/block/fdc.h"
30
30
#include "sysemu/sysemu.h"
31
31
#include "net/net.h"
32
32
#include "hw/boards.h"
33
-
#include "hw/firmware_abi.h"
34
-
#include "hw/esp.h"
35
-
#include "hw/pc.h"
36
-
#include "hw/isa.h"
37
-
#include "hw/fw_cfg.h"
38
-
#include "hw/escc.h"
33
+
#include "hw/sparc/firmware_abi.h"
34
+
#include "hw/scsi/esp.h"
35
+
#include "hw/i386/pc.h"
36
+
#include "hw/isa/isa.h"
37
+
#include "hw/nvram/fw_cfg.h"
38
+
#include "hw/char/escc.h"
39
39
#include "hw/empty_slot.h"
40
40
#include "hw/qdev-addr.h"
41
41
#include "hw/loader.h"
+2
-2
hw/sparc32_dma.c
+2
-2
hw/sparc32_dma.c
hw/sparc32_dma.h
include/hw/sparc/sparc32_dma.h
hw/sparc32_dma.h
include/hw/sparc/sparc32_dma.h
+7
-7
hw/sparc64/sun4u.c
+7
-7
hw/sparc64/sun4u.c
···
23
23
*/
24
24
#include "hw/hw.h"
25
25
#include "hw/pci/pci.h"
26
-
#include "hw/apb_pci.h"
27
-
#include "hw/pc.h"
28
-
#include "hw/serial.h"
29
-
#include "hw/nvram.h"
30
-
#include "hw/fdc.h"
26
+
#include "hw/pci-host/apb.h"
27
+
#include "hw/i386/pc.h"
28
+
#include "hw/char/serial.h"
29
+
#include "hw/timer/m48t59.h"
30
+
#include "hw/block/fdc.h"
31
31
#include "net/net.h"
32
32
#include "qemu/timer.h"
33
33
#include "sysemu/sysemu.h"
34
34
#include "hw/boards.h"
35
-
#include "hw/firmware_abi.h"
36
-
#include "hw/fw_cfg.h"
35
+
#include "hw/sparc/firmware_abi.h"
36
+
#include "hw/nvram/fw_cfg.h"
37
37
#include "hw/sysbus.h"
38
38
#include "hw/ide.h"
39
39
#include "hw/loader.h"
+1
-1
hw/ssd0303.c
+1
-1
hw/ssd0303.c
···
10
10
/* The controller can support a variety of different displays, but we only
11
11
implement one. Most of the commends relating to brightness and geometry
12
12
setup are ignored. */
13
-
#include "hw/i2c.h"
13
+
#include "hw/i2c/i2c.h"
14
14
#include "ui/console.h"
15
15
16
16
//#define DEBUG_SSD0303 1
hw/ssi.h
include/hw/ssi.h
hw/ssi.h
include/hw/ssi.h
+1
-1
hw/stellaris_input.c
+1
-1
hw/stellaris_input.c
hw/stream.h
include/hw/stream.h
hw/stream.h
include/hw/stream.h
+1
-1
hw/strongarm.c
+1
-1
hw/strongarm.c
+1
-1
hw/sun4c_intctl.c
+1
-1
hw/sun4c_intctl.c
+1
-1
hw/sun4m.h
include/hw/sparc/sun4m.h
+1
-1
hw/sun4m.h
include/hw/sparc/sun4m.h
+1
-1
hw/sun4m_iommu.c
+1
-1
hw/sun4m_iommu.c
hw/sysbus.h
include/hw/sysbus.h
hw/sysbus.h
include/hw/sysbus.h
+1
-1
hw/tc58128.c
+1
-1
hw/tc58128.c
+2
-2
hw/tc6393xb.c
+2
-2
hw/tc6393xb.c
···
11
11
* GNU GPL, version 2 or (at your option) any later version.
12
12
*/
13
13
#include "hw/hw.h"
14
-
#include "hw/devices.h"
15
-
#include "hw/flash.h"
14
+
#include "hw/arm/devices.h"
15
+
#include "hw/block/flash.h"
16
16
#include "ui/console.h"
17
17
#include "ui/pixel_ops.h"
18
18
#include "sysemu/blockdev.h"
+1
-1
hw/tmp105.c
+1
-1
hw/tmp105.c
+2
-2
hw/tmp105.h
+2
-2
hw/tmp105.h
···
14
14
#ifndef QEMU_TMP105_H
15
15
#define QEMU_TMP105_H
16
16
17
-
#include "hw/i2c.h"
18
-
#include "hw/tmp105_regs.h"
17
+
#include "hw/i2c/i2c.h"
18
+
#include "hw/misc/tmp105_regs.h"
19
19
20
20
#define TYPE_TMP105 "tmp105"
21
21
#define TMP105(obj) OBJECT_CHECK(TMP105State, (obj), TYPE_TMP105)
hw/tmp105_regs.h
include/hw/misc/tmp105_regs.h
hw/tmp105_regs.h
include/hw/misc/tmp105_regs.h
+1
-1
hw/tsc2005.c
+1
-1
hw/tsc2005.c
+2
-2
hw/tsc210x.c
+2
-2
hw/tsc210x.c
···
23
23
#include "audio/audio.h"
24
24
#include "qemu/timer.h"
25
25
#include "ui/console.h"
26
-
#include "hw/omap.h" /* For I2SCodec and uWireSlave */
27
-
#include "hw/devices.h"
26
+
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
27
+
#include "hw/arm/devices.h"
28
28
29
29
#define TSC_DATA_REGISTERS_PAGE 0x0
30
30
#define TSC_CONTROL_REGISTERS_PAGE 0x1
+2
-2
hw/tusb6010.c
+2
-2
hw/tusb6010.c
···
21
21
#include "qemu-common.h"
22
22
#include "qemu/timer.h"
23
23
#include "hw/usb.h"
24
-
#include "hw/omap.h"
24
+
#include "hw/arm/omap.h"
25
25
#include "hw/irq.h"
26
-
#include "hw/devices.h"
26
+
#include "hw/arm/devices.h"
27
27
#include "hw/sysbus.h"
28
28
29
29
typedef struct TUSBState {
+1
-1
hw/twl92230.c
+1
-1
hw/twl92230.c
+2
-2
hw/unicore32/puv3.c
+2
-2
hw/unicore32/puv3.c
···
16
16
#include "hw/sysbus.h"
17
17
#include "hw/boards.h"
18
18
#include "hw/loader.h"
19
-
#include "hw/pc.h"
19
+
#include "hw/i386/pc.h"
20
20
21
21
#undef DEBUG_PUV3
22
-
#include "hw/puv3.h"
22
+
#include "hw/unicore32/puv3.h"
23
23
24
24
#define KERNEL_LOAD_ADDR 0x03000000
25
25
#define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */
hw/usb.h
include/hw/usb.h
hw/usb.h
include/hw/usb.h
+1
-1
hw/usb/dev-audio.c
+1
-1
hw/usb/dev-audio.c
+1
-1
hw/usb/dev-hid.c
+1
-1
hw/usb/dev-hid.c
+1
-1
hw/usb/dev-storage.c
+1
-1
hw/usb/dev-storage.c
+2
-2
hw/usb/dev-uas.c
+2
-2
hw/usb/dev-uas.c
+1
-1
hw/vga-isa-mm.c
+1
-1
hw/vga-isa-mm.c
+1
-1
hw/vga-isa.c
+1
-1
hw/vga-isa.c
+2
-2
hw/vga.c
+2
-2
hw/vga.c
···
24
24
#include "hw/hw.h"
25
25
#include "hw/vga.h"
26
26
#include "ui/console.h"
27
-
#include "hw/pc.h"
27
+
#include "hw/i386/pc.h"
28
28
#include "hw/pci/pci.h"
29
29
#include "hw/vga_int.h"
30
30
#include "ui/pixel_ops.h"
31
31
#include "qemu/timer.h"
32
-
#include "hw/xen.h"
32
+
#include "hw/xen/xen.h"
33
33
#include "trace.h"
34
34
35
35
//#define DEBUG_VGA
+1
-1
hw/vhost.c
+1
-1
hw/vhost.c
+1
-1
hw/vhost.h
include/hw/virtio/vhost.h
+1
-1
hw/vhost.h
include/hw/virtio/vhost.h
+3
-3
hw/vhost_net.c
+3
-3
hw/vhost_net.c
···
16
16
#include "net/net.h"
17
17
#include "net/tap.h"
18
18
19
-
#include "hw/virtio-net.h"
20
-
#include "hw/vhost_net.h"
19
+
#include "hw/virtio/virtio-net.h"
20
+
#include "net/vhost_net.h"
21
21
#include "qemu/error-report.h"
22
22
23
23
#include "config.h"
···
36
36
37
37
#include <stdio.h>
38
38
39
-
#include "hw/vhost.h"
39
+
#include "hw/virtio/vhost.h"
40
40
41
41
struct vhost_net {
42
42
struct vhost_dev dev;
hw/vhost_net.h
include/net/vhost_net.h
hw/vhost_net.h
include/net/vhost_net.h
+4
-4
hw/virtio-balloon.c
+4
-4
hw/virtio-balloon.c
···
16
16
#include "qemu/iov.h"
17
17
#include "qemu/timer.h"
18
18
#include "qemu-common.h"
19
-
#include "hw/virtio.h"
20
-
#include "hw/pc.h"
19
+
#include "hw/virtio/virtio.h"
20
+
#include "hw/i386/pc.h"
21
21
#include "cpu.h"
22
22
#include "sysemu/balloon.h"
23
-
#include "hw/virtio-balloon.h"
23
+
#include "hw/virtio/virtio-balloon.h"
24
24
#include "sysemu/kvm.h"
25
25
#include "exec/address-spaces.h"
26
26
#include "qapi/visitor.h"
···
29
29
#include <sys/mman.h>
30
30
#endif
31
31
32
-
#include "hw/virtio-bus.h"
32
+
#include "hw/virtio/virtio-bus.h"
33
33
34
34
static void balloon_page(void *addr, int deflate)
35
35
{
+1
-1
hw/virtio-balloon.h
include/hw/virtio/virtio-balloon.h
+1
-1
hw/virtio-balloon.h
include/hw/virtio/virtio-balloon.h
+7
-4
hw/virtio-blk.c
+7
-4
hw/virtio-blk.c
···
14
14
#include "qemu-common.h"
15
15
#include "qemu/error-report.h"
16
16
#include "trace.h"
17
-
#include "hw/block-common.h"
17
+
#include "hw/block/block.h"
18
18
#include "sysemu/blockdev.h"
19
-
#include "hw/virtio-blk.h"
20
-
#include "hw/scsi-defs.h"
19
+
#include "hw/virtio/virtio-blk.h"
20
+
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
21
+
# include "dataplane/virtio-blk.h"
22
+
#endif
23
+
#include "block/scsi.h"
21
24
#ifdef __linux__
22
25
# include <scsi/sg.h>
23
26
#endif
24
-
#include "hw/virtio-bus.h"
27
+
#include "hw/virtio/virtio-bus.h"
25
28
26
29
typedef struct VirtIOBlockReq
27
30
{
+5
-6
hw/virtio-blk.h
include/hw/virtio/virtio-blk.h
+5
-6
hw/virtio-blk.h
include/hw/virtio/virtio-blk.h
···
14
14
#ifndef _QEMU_VIRTIO_BLK_H
15
15
#define _QEMU_VIRTIO_BLK_H
16
16
17
-
#include "hw/virtio.h"
18
-
#include "hw/block-common.h"
19
-
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
20
-
#include "dataplane/virtio-blk.h"
21
-
#endif
17
+
#include "hw/virtio/virtio.h"
18
+
#include "hw/block/block.h"
22
19
23
20
#define TYPE_VIRTIO_BLK "virtio-blk"
24
21
#define VIRTIO_BLK(obj) \
···
115
112
uint32_t data_plane;
116
113
};
117
114
115
+
struct VirtIOBlockDataPlane;
116
+
118
117
typedef struct VirtIOBlock {
119
118
VirtIODevice parent_obj;
120
119
BlockDriverState *bs;
···
126
125
unsigned short sector_mask;
127
126
VMChangeStateEntry *change;
128
127
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
129
-
VirtIOBlockDataPlane *dataplane;
128
+
struct VirtIOBlockDataPlane *dataplane;
130
129
#endif
131
130
} VirtIOBlock;
132
131
+2
-2
hw/virtio-bus.c
+2
-2
hw/virtio-bus.c
+1
-1
hw/virtio-bus.h
include/hw/virtio/virtio-bus.h
+1
-1
hw/virtio-bus.h
include/hw/virtio/virtio-bus.h
+1
-1
hw/virtio-console.c
+1
-1
hw/virtio-console.c
+3
-3
hw/virtio-net.c
+3
-3
hw/virtio-net.c
···
12
12
*/
13
13
14
14
#include "qemu/iov.h"
15
-
#include "hw/virtio.h"
15
+
#include "hw/virtio/virtio.h"
16
16
#include "net/net.h"
17
17
#include "net/checksum.h"
18
18
#include "net/tap.h"
19
19
#include "qemu/error-report.h"
20
20
#include "qemu/timer.h"
21
-
#include "hw/virtio-net.h"
22
-
#include "hw/vhost_net.h"
21
+
#include "hw/virtio/virtio-net.h"
22
+
#include "net/vhost_net.h"
23
23
24
24
#define VIRTIO_NET_VM_VERSION 11
25
25
+1
-1
hw/virtio-net.h
include/hw/virtio/virtio-net.h
+1
-1
hw/virtio-net.h
include/hw/virtio/virtio-net.h
+7
-7
hw/virtio-pci.c
+7
-7
hw/virtio-pci.c
···
17
17
18
18
#include <inttypes.h>
19
19
20
-
#include "hw/virtio.h"
21
-
#include "hw/virtio-blk.h"
22
-
#include "hw/virtio-net.h"
23
-
#include "hw/virtio-serial.h"
24
-
#include "hw/virtio-scsi.h"
25
-
#include "hw/virtio-balloon.h"
20
+
#include "hw/virtio/virtio.h"
21
+
#include "hw/virtio/virtio-blk.h"
22
+
#include "hw/virtio/virtio-net.h"
23
+
#include "hw/virtio/virtio-serial.h"
24
+
#include "hw/virtio/virtio-scsi.h"
25
+
#include "hw/virtio/virtio-balloon.h"
26
26
#include "hw/pci/pci.h"
27
27
#include "qemu/error-report.h"
28
28
#include "hw/pci/msi.h"
···
32
32
#include "sysemu/blockdev.h"
33
33
#include "hw/virtio-pci.h"
34
34
#include "qemu/range.h"
35
-
#include "hw/virtio-bus.h"
35
+
#include "hw/virtio/virtio-bus.h"
36
36
37
37
/* from Linux's linux/virtio_pci.h */
38
38
+8
-8
hw/virtio-pci.h
+8
-8
hw/virtio-pci.h
···
16
16
#define QEMU_VIRTIO_PCI_H
17
17
18
18
#include "hw/pci/msi.h"
19
-
#include "hw/virtio-blk.h"
20
-
#include "hw/virtio-net.h"
21
-
#include "hw/virtio-rng.h"
22
-
#include "hw/virtio-serial.h"
23
-
#include "hw/virtio-scsi.h"
24
-
#include "hw/virtio-balloon.h"
25
-
#include "hw/virtio-bus.h"
26
-
#include "hw/9pfs/virtio-9p-device.h"
19
+
#include "hw/virtio/virtio-blk.h"
20
+
#include "hw/virtio/virtio-net.h"
21
+
#include "hw/virtio/virtio-rng.h"
22
+
#include "hw/virtio/virtio-serial.h"
23
+
#include "hw/virtio/virtio-scsi.h"
24
+
#include "hw/virtio/virtio-balloon.h"
25
+
#include "hw/virtio/virtio-bus.h"
26
+
#include "hw/virtio/virtio-9p.h"
27
27
28
28
typedef struct VirtIOPCIProxy VirtIOPCIProxy;
29
29
typedef struct VirtIOBlkPCI VirtIOBlkPCI;
+2
-2
hw/virtio-rng.c
+2
-2
hw/virtio-rng.c
···
12
12
#include "qemu/iov.h"
13
13
#include "hw/qdev.h"
14
14
#include "qapi/qmp/qerror.h"
15
-
#include "hw/virtio.h"
16
-
#include "hw/virtio-rng.h"
15
+
#include "hw/virtio/virtio.h"
16
+
#include "hw/virtio/virtio-rng.h"
17
17
#include "qemu/rng.h"
18
18
19
19
static bool is_guest_ready(VirtIORNG *vrng)
hw/virtio-rng.h
include/hw/virtio/virtio-rng.h
hw/virtio-rng.h
include/hw/virtio/virtio-rng.h
+4
-4
hw/virtio-scsi.c
+4
-4
hw/virtio-scsi.c
···
13
13
*
14
14
*/
15
15
16
-
#include "hw/virtio-scsi.h"
16
+
#include "hw/virtio/virtio-scsi.h"
17
17
#include "qemu/error-report.h"
18
-
#include <hw/scsi.h>
19
-
#include <hw/scsi-defs.h>
20
-
#include "hw/virtio-bus.h"
18
+
#include <hw/scsi/scsi.h>
19
+
#include <block/scsi.h>
20
+
#include <hw/virtio/virtio-bus.h>
21
21
22
22
#define VIRTIO_SCSI_VQ_SIZE 128
23
23
#define VIRTIO_SCSI_CDB_SIZE 32
+2
-2
hw/virtio-scsi.h
include/hw/virtio/virtio-scsi.h
+2
-2
hw/virtio-scsi.h
include/hw/virtio/virtio-scsi.h
···
14
14
#ifndef _QEMU_VIRTIO_SCSI_H
15
15
#define _QEMU_VIRTIO_SCSI_H
16
16
17
-
#include "hw/virtio.h"
17
+
#include "hw/virtio/virtio.h"
18
18
#include "hw/pci/pci.h"
19
-
#include "hw/scsi.h"
19
+
#include "hw/scsi/scsi.h"
20
20
21
21
#define TYPE_VIRTIO_SCSI "virtio-scsi"
22
22
#define VIRTIO_SCSI(obj) \
+1
-1
hw/virtio-serial-bus.c
+1
-1
hw/virtio-serial-bus.c
+1
-1
hw/virtio-serial.h
include/hw/virtio/virtio-serial.h
+1
-1
hw/virtio-serial.h
include/hw/virtio/virtio-serial.h
+2
-2
hw/virtio.c
+2
-2
hw/virtio.c
···
15
15
16
16
#include "trace.h"
17
17
#include "qemu/error-report.h"
18
-
#include "hw/virtio.h"
18
+
#include "hw/virtio/virtio.h"
19
19
#include "qemu/atomic.h"
20
-
#include "hw/virtio-bus.h"
20
+
#include "hw/virtio/virtio-bus.h"
21
21
22
22
/* The alignment to use between consumer and producer parts of vring.
23
23
* x86 pagesize again. */
+1
-1
hw/virtio.h
include/hw/virtio/virtio.h
+1
-1
hw/virtio.h
include/hw/virtio/virtio.h
+2
-2
hw/vmmouse.c
+2
-2
hw/vmmouse.c
+2
-2
hw/vmport.c
+2
-2
hw/vmport.c
+4
-5
hw/vmxnet3.c
+4
-5
hw/vmxnet3.c
···
15
15
*
16
16
*/
17
17
18
-
#include "hw.h"
19
-
#include "pci/pci.h"
18
+
#include "hw/hw.h"
19
+
#include "hw/pci/pci.h"
20
20
#include "net/net.h"
21
-
#include "virtio-net.h"
22
21
#include "net/tap.h"
23
22
#include "net/checksum.h"
24
23
#include "sysemu/sysemu.h"
25
24
#include "qemu-common.h"
26
25
#include "qemu/bswap.h"
27
-
#include "pci/msix.h"
28
-
#include "pci/msi.h"
26
+
#include "hw/pci/msix.h"
27
+
#include "hw/pci/msi.h"
29
28
30
29
#include "vmxnet3.h"
31
30
#include "vmxnet_debug.h"
+9
-9
hw/vt82c686.c
+9
-9
hw/vt82c686.c
···
11
11
*/
12
12
13
13
#include "hw/hw.h"
14
-
#include "hw/pc.h"
15
-
#include "hw/vt82c686.h"
16
-
#include "hw/i2c.h"
17
-
#include "hw/smbus.h"
14
+
#include "hw/i386/pc.h"
15
+
#include "hw/isa/vt82c686.h"
16
+
#include "hw/i2c/i2c.h"
17
+
#include "hw/i2c/smbus.h"
18
18
#include "hw/pci/pci.h"
19
-
#include "hw/isa.h"
19
+
#include "hw/isa/isa.h"
20
20
#include "hw/sysbus.h"
21
-
#include "hw/mips.h"
22
-
#include "hw/apm.h"
23
-
#include "hw/acpi.h"
24
-
#include "hw/pm_smbus.h"
21
+
#include "hw/mips/mips.h"
22
+
#include "hw/isa/apm.h"
23
+
#include "hw/acpi/acpi.h"
24
+
#include "hw/i2c/pm_smbus.h"
25
25
#include "sysemu/sysemu.h"
26
26
#include "qemu/timer.h"
27
27
#include "exec/address-spaces.h"
hw/vt82c686.h
include/hw/isa/vt82c686.h
hw/vt82c686.h
include/hw/isa/vt82c686.h
+1
-1
hw/watchdog.c
+1
-1
hw/watchdog.c
hw/watchdog.h
include/sysemu/watchdog.h
hw/watchdog.h
include/sysemu/watchdog.h
+1
-1
hw/wdt_i6300esb.c
+1
-1
hw/wdt_i6300esb.c
+3
-3
hw/wdt_ib700.c
+3
-3
hw/wdt_ib700.c
···
21
21
22
22
#include "qemu-common.h"
23
23
#include "qemu/timer.h"
24
-
#include "hw/watchdog.h"
24
+
#include "sysemu/watchdog.h"
25
25
#include "hw/hw.h"
26
-
#include "hw/isa.h"
27
-
#include "hw/pc.h"
26
+
#include "hw/isa/isa.h"
27
+
#include "hw/i386/pc.h"
28
28
29
29
/*#define IB700_DEBUG 1*/
30
30
+1
-1
hw/wm8750.c
+1
-1
hw/wm8750.c
hw/xen.h
include/hw/xen/xen.h
hw/xen.h
include/hw/xen/xen.h
+2
-2
hw/xen_apic.c
+2
-2
hw/xen_apic.c
···
9
9
* This work is licensed under the terms of the GNU GPL version 2 or
10
10
* later. See the COPYING file in the top-level directory.
11
11
*/
12
-
#include "hw/apic_internal.h"
12
+
#include "hw/i386/apic_internal.h"
13
13
#include "hw/pci/msi.h"
14
-
#include "hw/xen.h"
14
+
#include "hw/xen/xen.h"
15
15
16
16
static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr,
17
17
unsigned size)
+1
-1
hw/xen_backend.c
+1
-1
hw/xen_backend.c
+1
-1
hw/xen_backend.h
include/hw/xen/xen_backend.h
+1
-1
hw/xen_backend.h
include/hw/xen/xen_backend.h
+1
-1
hw/xen_common.h
include/hw/xen/xen_common.h
+1
-1
hw/xen_common.h
include/hw/xen/xen_common.h
+1
-1
hw/xen_console.c
+1
-1
hw/xen_console.c
+1
-1
hw/xen_devconfig.c
+1
-1
hw/xen_devconfig.c
+1
-1
hw/xen_disk.c
+1
-1
hw/xen_disk.c
+1
-1
hw/xen_domainbuild.h
+1
-1
hw/xen_domainbuild.h
+1
-1
hw/xen_nic.c
+1
-1
hw/xen_nic.c
+3
-3
hw/xen_platform.c
+3
-3
hw/xen_platform.c
···
26
26
#include <assert.h>
27
27
28
28
#include "hw/hw.h"
29
-
#include "hw/pc.h"
29
+
#include "hw/i386/pc.h"
30
30
#include "hw/pci/pci.h"
31
31
#include "hw/irq.h"
32
-
#include "hw/xen_common.h"
33
-
#include "hw/xen_backend.h"
32
+
#include "hw/xen/xen_common.h"
33
+
#include "hw/xen/xen_backend.h"
34
34
#include "trace.h"
35
35
#include "exec/address-spaces.h"
36
36
+2
-2
hw/xen_pt.c
+2
-2
hw/xen_pt.c
+1
-1
hw/xen_pt.h
+1
-1
hw/xen_pt.h
+1
-1
hw/xen_pt_config_init.c
+1
-1
hw/xen_pt_config_init.c
+2
-2
hw/xen_pt_msi.c
+2
-2
hw/xen_pt_msi.c
+1
-1
hw/xenfb.c
+1
-1
hw/xenfb.c
hw/xics.h
include/hw/ppc/xics.h
hw/xics.h
include/hw/ppc/xics.h
hw/xilinx.h
include/hw/xilinx.h
hw/xilinx.h
include/hw/xilinx.h
+2
-2
hw/xtensa/xtensa_lx60.c
+2
-2
hw/xtensa/xtensa_lx60.c
···
31
31
#include "elf.h"
32
32
#include "exec/memory.h"
33
33
#include "exec/address-spaces.h"
34
-
#include "hw/serial.h"
34
+
#include "hw/char/serial.h"
35
35
#include "net/net.h"
36
36
#include "hw/sysbus.h"
37
-
#include "hw/flash.h"
37
+
#include "hw/block/flash.h"
38
38
#include "sysemu/blockdev.h"
39
39
#include "char/char.h"
40
40
#include "hw/xtensa_bootparam.h"
+1
-1
hw/zaurus.c
+1
-1
hw/zaurus.c
+1
-1
include/exec/memory-internal.h
+1
-1
include/exec/memory-internal.h
+4
-4
monitor.c
+4
-4
monitor.c
···
26
26
#include "monitor/qdev.h"
27
27
#include "hw/usb.h"
28
28
#include "hw/pcmcia.h"
29
-
#include "hw/pc.h"
29
+
#include "hw/i386/pc.h"
30
30
#include "hw/pci/pci.h"
31
-
#include "hw/watchdog.h"
31
+
#include "sysemu/watchdog.h"
32
32
#include "hw/loader.h"
33
33
#include "exec/gdbstub.h"
34
34
#include "net/net.h"
···
71
71
72
72
/* for pic/irq_info */
73
73
#if defined(TARGET_SPARC)
74
-
#include "hw/sun4m.h"
74
+
#include "hw/sparc/sun4m.h"
75
75
#endif
76
-
#include "hw/lm32_pic.h"
76
+
#include "hw/lm32/lm32_pic.h"
77
77
78
78
//#define DEBUG
79
79
//#define DEBUG_COMPLETION
+1
-1
net/tap.c
+1
-1
net/tap.c
+1
-1
pc-bios/optionrom/optionrom.h
+1
-1
pc-bios/optionrom/optionrom.h
+1
-1
target-arm/arm-semi.c
+1
-1
target-arm/arm-semi.c
+1
-1
target-arm/kvm.c
+1
-1
target-arm/kvm.c
+2
-2
target-i386/cpu.c
+2
-2
target-i386/cpu.c
···
42
42
43
43
#include "sysemu/sysemu.h"
44
44
#ifndef CONFIG_USER_ONLY
45
-
#include "hw/xen.h"
45
+
#include "hw/xen/xen.h"
46
46
#include "hw/sysbus.h"
47
-
#include "hw/apic_internal.h"
47
+
#include "hw/i386/apic_internal.h"
48
48
#endif
49
49
50
50
static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1,
+1
-1
target-i386/cpu.h
+1
-1
target-i386/cpu.h
+2
-2
target-i386/kvm.c
+2
-2
target-i386/kvm.c
···
28
28
#include "exec/gdbstub.h"
29
29
#include "qemu/host-utils.h"
30
30
#include "qemu/config-file.h"
31
-
#include "hw/pc.h"
32
-
#include "hw/apic.h"
31
+
#include "hw/i386/pc.h"
32
+
#include "hw/i386/apic.h"
33
33
#include "exec/ioport.h"
34
34
#include "hyperv.h"
35
35
#include "hw/pci/pci.h"
+2
-2
target-i386/machine.c
+2
-2
target-i386/machine.c
+2
-2
target-lm32/op_helper.c
+2
-2
target-lm32/op_helper.c
+1
-1
target-lm32/translate.c
+1
-1
target-lm32/translate.c
+3
-3
target-ppc/kvm.c
+3
-3
target-ppc/kvm.c
···
31
31
#include "sysemu/cpus.h"
32
32
#include "sysemu/device_tree.h"
33
33
#include "hw/sysbus.h"
34
-
#include "hw/spapr.h"
34
+
#include "hw/ppc/spapr.h"
35
35
#include "mmu-hash64.h"
36
36
37
37
#include "hw/sysbus.h"
38
-
#include "hw/spapr.h"
39
-
#include "hw/spapr_vio.h"
38
+
#include "hw/ppc/spapr.h"
39
+
#include "hw/ppc/spapr_vio.h"
40
40
41
41
//#define DEBUG_KVM
42
42
+1
-1
target-sh4/helper.c
+1
-1
target-sh4/helper.c
+1
-1
tests/rtc-test.c
+1
-1
tests/rtc-test.c
+1
-1
tests/tmp105-test.c
+1
-1
tests/tmp105-test.c
+1
-1
tpm/tpm_passthrough.c
+1
-1
tpm/tpm_passthrough.c
+1
-1
tpm/tpm_tis.c
+1
-1
tpm/tpm_tis.c
+1
-1
tpm/tpm_tis.h
+1
-1
tpm/tpm_tis.h
+6
-6
vl.c
+6
-6
vl.c
···
117
117
#include "hw/boards.h"
118
118
#include "hw/usb.h"
119
119
#include "hw/pcmcia.h"
120
-
#include "hw/pc.h"
121
-
#include "hw/isa.h"
120
+
#include "hw/i386/pc.h"
121
+
#include "hw/isa/isa.h"
122
122
#include "hw/bt.h"
123
-
#include "hw/watchdog.h"
124
-
#include "hw/smbios.h"
125
-
#include "hw/xen.h"
123
+
#include "sysemu/watchdog.h"
124
+
#include "hw/i386/smbios.h"
125
+
#include "hw/xen/xen.h"
126
126
#include "hw/qdev.h"
127
127
#include "hw/loader.h"
128
128
#include "monitor/qdev.h"
···
137
137
#include "char/char.h"
138
138
#include "qemu/cache-utils.h"
139
139
#include "sysemu/blockdev.h"
140
-
#include "hw/block-common.h"
140
+
#include "hw/block/block.h"
141
141
#include "migration/block.h"
142
142
#include "tpm/tpm.h"
143
143
#include "sysemu/dma.h"
+3
-3
xen-all.c
+3
-3
xen-all.c
···
11
11
#include <sys/mman.h>
12
12
13
13
#include "hw/pci/pci.h"
14
-
#include "hw/pc.h"
15
-
#include "hw/xen_common.h"
16
-
#include "hw/xen_backend.h"
14
+
#include "hw/i386/pc.h"
15
+
#include "hw/xen/xen_common.h"
16
+
#include "hw/xen/xen_backend.h"
17
17
#include "qmp-commands.h"
18
18
19
19
#include "char/char.h"
+1
-1
xen-mapcache.c
+1
-1
xen-mapcache.c