diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2020-03-31 15:15:14 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-04-02 10:41:40 -0400 |
| commit | c9b9f5f8c0f3cdb893cb86c168cdaa3aa5ed7278 (patch) | |
| tree | ed96a8fe87994f9f9d9596c2f79ad3289abc969b /drivers | |
| parent | 5a2414bc454e89e0515b47500734a65aa40cf9fe (diff) | |
vdpa: move to drivers/vdpa
We have both vhost and virtio drivers that depend on vdpa.
It's easier to locate it at a top level directory otherwise
we run into issues e.g. if vhost is built-in but virtio
is modular. Let's just move it up a level.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/vdpa/Kconfig (renamed from drivers/virtio/vdpa/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/Makefile (renamed from drivers/virtio/vdpa/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/ifcvf/Makefile (renamed from drivers/virtio/vdpa/ifcvf/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/ifcvf/ifcvf_base.c (renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/ifcvf/ifcvf_base.h (renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/ifcvf/ifcvf_main.c (renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/vdpa.c (renamed from drivers/virtio/vdpa/vdpa.c) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/vdpa_sim/Makefile (renamed from drivers/virtio/vdpa/vdpa_sim/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/vdpa/vdpa_sim/vdpa_sim.c (renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c) | 0 | ||||
| -rw-r--r-- | drivers/virtio/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/virtio/Makefile | 1 |
13 files changed, 3 insertions, 3 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 7a6d8b2b68b4..ac23d520e916 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -138,6 +138,8 @@ source "drivers/virt/Kconfig" source "drivers/virtio/Kconfig" +source "drivers/vdpa/Kconfig" + source "drivers/vhost/Kconfig" source "drivers/hv/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 31cf17dee252..21688f3b1588 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_DMADEVICES) += dma/ obj-y += soc/ obj-$(CONFIG_VIRTIO) += virtio/ +obj-$(CONFIG_VDPA) += vdpa/ obj-$(CONFIG_XEN) += xen/ # regulators early, since some subsystems rely on them to initialize diff --git a/drivers/virtio/vdpa/Kconfig b/drivers/vdpa/Kconfig index 7db1460104b7..7db1460104b7 100644 --- a/drivers/virtio/vdpa/Kconfig +++ b/drivers/vdpa/Kconfig diff --git a/drivers/virtio/vdpa/Makefile b/drivers/vdpa/Makefile index 8bbb686ca7a2..8bbb686ca7a2 100644 --- a/drivers/virtio/vdpa/Makefile +++ b/drivers/vdpa/Makefile diff --git a/drivers/virtio/vdpa/ifcvf/Makefile b/drivers/vdpa/ifcvf/Makefile index d709915995ab..d709915995ab 100644 --- a/drivers/virtio/vdpa/ifcvf/Makefile +++ b/drivers/vdpa/ifcvf/Makefile diff --git a/drivers/virtio/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c index b61b06ea26d3..b61b06ea26d3 100644 --- a/drivers/virtio/vdpa/ifcvf/ifcvf_base.c +++ b/drivers/vdpa/ifcvf/ifcvf_base.c diff --git a/drivers/virtio/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h index e80307092351..e80307092351 100644 --- a/drivers/virtio/vdpa/ifcvf/ifcvf_base.h +++ b/drivers/vdpa/ifcvf/ifcvf_base.h diff --git a/drivers/virtio/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index 8d54dc5b08d2..8d54dc5b08d2 100644 --- a/drivers/virtio/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c diff --git a/drivers/virtio/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index e9ed6a2b635b..e9ed6a2b635b 100644 --- a/drivers/virtio/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c diff --git a/drivers/virtio/vdpa/vdpa_sim/Makefile b/drivers/vdpa/vdpa_sim/Makefile index b40278f65e04..b40278f65e04 100644 --- a/drivers/virtio/vdpa/vdpa_sim/Makefile +++ b/drivers/vdpa/vdpa_sim/Makefile diff --git a/drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index 6e8a0cf2fdeb..6e8a0cf2fdeb 100644 --- a/drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 99e424570644..2aadf398d8cc 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES If unsure, say 'N'. endif # VIRTIO_MENU - -source "drivers/virtio/vdpa/Kconfig" diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 3407ac03fe60..29a1386ecc03 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -7,4 +7,3 @@ virtio_pci-$(CONFIG_VIRTIO_PCI_LEGACY) += virtio_pci_legacy.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o obj-$(CONFIG_VIRTIO_VDPA) += virtio_vdpa.o -obj-$(CONFIG_VDPA) += vdpa/ |