diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:42:31 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:12 +0200 |
commit | 6e7907468fd05b8a641a715ebb110fc1903a604e (patch) | |
tree | 5cf7b3f8245158c5287d93a831f8c3103db51c72 /hw | |
parent | 49ab747f668f421138d5b40d83fa279c4c5e278d (diff) | |
download | hqemu-6e7907468fd05b8a641a715ebb110fc1903a604e.zip hqemu-6e7907468fd05b8a641a715ebb110fc1903a604e.tar.gz |
hw: move virtio devices to hw/ subdirectories
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/Makefile.objs | 5 | ||||
-rw-r--r-- | hw/block/Makefile.objs | 3 | ||||
-rw-r--r-- | hw/block/dataplane/Makefile.objs | 1 | ||||
-rw-r--r-- | hw/block/dataplane/ioq.c (renamed from hw/dataplane/ioq.c) | 0 | ||||
-rw-r--r-- | hw/block/dataplane/ioq.h (renamed from hw/dataplane/ioq.h) | 0 | ||||
-rw-r--r-- | hw/block/dataplane/virtio-blk.c (renamed from hw/dataplane/virtio-blk.c) | 0 | ||||
-rw-r--r-- | hw/block/dataplane/virtio-blk.h (renamed from hw/dataplane/virtio-blk.h) | 0 | ||||
-rw-r--r-- | hw/block/virtio-blk.c (renamed from hw/virtio-blk.c) | 0 | ||||
-rw-r--r-- | hw/char/Makefile.objs | 2 | ||||
-rw-r--r-- | hw/char/virtio-serial-bus.c (renamed from hw/virtio-serial-bus.c) | 0 | ||||
-rw-r--r-- | hw/dataplane/Makefile.objs | 1 | ||||
-rw-r--r-- | hw/net/Makefile.objs | 3 | ||||
-rw-r--r-- | hw/net/vhost_net.c (renamed from hw/vhost_net.c) | 0 | ||||
-rw-r--r-- | hw/net/virtio-net.c (renamed from hw/virtio-net.c) | 0 | ||||
-rw-r--r-- | hw/scsi/Makefile.objs | 1 | ||||
-rw-r--r-- | hw/scsi/virtio-scsi.c (renamed from hw/virtio-scsi.c) | 0 | ||||
-rw-r--r-- | hw/virtio/Makefile.objs | 3 | ||||
-rw-r--r-- | hw/virtio/dataplane/Makefile.objs | 1 | ||||
-rw-r--r-- | hw/virtio/dataplane/hostmem.c (renamed from hw/dataplane/hostmem.c) | 0 | ||||
-rw-r--r-- | hw/virtio/dataplane/vring.c (renamed from hw/dataplane/vring.c) | 0 | ||||
-rw-r--r-- | hw/virtio/vhost.c (renamed from hw/vhost.c) | 0 | ||||
-rw-r--r-- | hw/virtio/virtio-balloon.c (renamed from hw/virtio-balloon.c) | 0 | ||||
-rw-r--r-- | hw/virtio/virtio.c (renamed from hw/virtio.c) | 0 |
23 files changed, 14 insertions, 6 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 1d28ce2..83a6bf2 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -34,11 +34,6 @@ ifeq ($(CONFIG_SOFTMMU),y) # Per-target files # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly -obj-$(CONFIG_VIRTIO) += dataplane/ -obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o -obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o virtio-scsi.o -obj-$(CONFIG_SOFTMMU) += vhost_net.o -obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_VGA) += vga.o # Inter-VM PCI shared memory & VFIO PCI device assignment diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index 5fa5101..856915e 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -6,3 +6,6 @@ common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o common-obj-$(CONFIG_ECC) += ecc.o + +obj-$(CONFIG_VIRTIO) += virtio-blk.o +obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += dataplane/ diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile.objs new file mode 100644 index 0000000..9da2eb8 --- /dev/null +++ b/hw/block/dataplane/Makefile.objs @@ -0,0 +1 @@ +obj-y += ioq.o virtio-blk.o diff --git a/hw/dataplane/ioq.c b/hw/block/dataplane/ioq.c index f709f87..f709f87 100644 --- a/hw/dataplane/ioq.c +++ b/hw/block/dataplane/ioq.c diff --git a/hw/dataplane/ioq.h b/hw/block/dataplane/ioq.h index b49b5de..b49b5de 100644 --- a/hw/dataplane/ioq.h +++ b/hw/block/dataplane/ioq.h diff --git a/hw/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 5baef23..5baef23 100644 --- a/hw/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c diff --git a/hw/dataplane/virtio-blk.h b/hw/block/dataplane/virtio-blk.h index c90e99f..c90e99f 100644 --- a/hw/dataplane/virtio-blk.h +++ b/hw/block/dataplane/virtio-blk.h diff --git a/hw/virtio-blk.c b/hw/block/virtio-blk.c index 6efb2f0..6efb2f0 100644 --- a/hw/virtio-blk.c +++ b/hw/block/virtio-blk.c diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index eee23ff..ddfd3ec 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -8,3 +8,5 @@ common-obj-$(CONFIG_VIRTIO) += virtio-console.o common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o common-obj-$(CONFIG_CADENCE) += cadence_uart.o + +obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o diff --git a/hw/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 1dba8ab..1dba8ab 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c diff --git a/hw/dataplane/Makefile.objs b/hw/dataplane/Makefile.objs deleted file mode 100644 index 701111c..0000000 --- a/hw/dataplane/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += hostmem.o vring.o ioq.o virtio-blk.o diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index ad91293..73217d8 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -20,3 +20,6 @@ common-obj-$(CONFIG_MIPSNET) += mipsnet.o common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o common-obj-$(CONFIG_CADENCE) += cadence_gem.o + +obj-$(CONFIG_VIRTIO) += virtio-net.o +obj-y += vhost_net.o diff --git a/hw/vhost_net.c b/hw/net/vhost_net.c index 8c5384c..8c5384c 100644 --- a/hw/vhost_net.c +++ b/hw/net/vhost_net.c diff --git a/hw/virtio-net.c b/hw/net/virtio-net.c index bc8fd43..bc8fd43 100644 --- a/hw/virtio-net.c +++ b/hw/net/virtio-net.c diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 6a56504..b76b9c3 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -4,3 +4,4 @@ common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o common-obj-$(CONFIG_ESP) += esp.o common-obj-$(CONFIG_ESP_PCI) += esp-pci.o +obj-$(CONFIG_VIRTIO) += virtio-scsi.o diff --git a/hw/virtio-scsi.c b/hw/scsi/virtio-scsi.c index ead7cda..ead7cda 100644 --- a/hw/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index ed63495..c7e8013 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -1,4 +1,7 @@ common-obj-$(CONFIG_VIRTIO) += virtio-rng.o common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o common-obj-$(CONFIG_VIRTIO) += virtio-bus.o +common-obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += dataplane/ +obj-$(CONFIG_VIRTIO) += virtio.o virtio-balloon.o +obj-$(CONFIG_VHOST_NET) += vhost.o diff --git a/hw/virtio/dataplane/Makefile.objs b/hw/virtio/dataplane/Makefile.objs new file mode 100644 index 0000000..a91bf33 --- /dev/null +++ b/hw/virtio/dataplane/Makefile.objs @@ -0,0 +1 @@ +common-obj-y += hostmem.o vring.o diff --git a/hw/dataplane/hostmem.c b/hw/virtio/dataplane/hostmem.c index 37292ff..37292ff 100644 --- a/hw/dataplane/hostmem.c +++ b/hw/virtio/dataplane/hostmem.c diff --git a/hw/dataplane/vring.c b/hw/virtio/dataplane/vring.c index e0d6e83..e0d6e83 100644 --- a/hw/dataplane/vring.c +++ b/hw/virtio/dataplane/vring.c diff --git a/hw/vhost.c b/hw/virtio/vhost.c index 636fad0..636fad0 100644 --- a/hw/vhost.c +++ b/hw/virtio/vhost.c diff --git a/hw/virtio-balloon.c b/hw/virtio/virtio-balloon.c index c2c446e..c2c446e 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c diff --git a/hw/virtio.c b/hw/virtio/virtio.c index 1c2282c..1c2282c 100644 --- a/hw/virtio.c +++ b/hw/virtio/virtio.c |