vdpa: move to drivers/vdpa
Subsystems (2)
Michael S. Tsirkin
maintainerPATCH 1/1 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.
---
Randy I'd say the issue you are reporting (vhost=y, virtio=m) is esoteric enough not to require a rebase for this. So I'd just apply this on top.
Do you agree?
MAINTAINERS | 1 +
drivers/Kconfig | 2 ++
drivers/Makefile | 1 +
drivers/{virtio => }/vdpa/Kconfig | 0
drivers/{virtio => }/vdpa/Makefile | 0
drivers/{virtio => }/vdpa/ifcvf/Makefile | 0
drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c | 0
drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h | 0
drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c | 0
drivers/{virtio => }/vdpa/vdpa.c | 0
drivers/{virtio => }/vdpa/vdpa_sim/Makefile | 0
drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c | 0
drivers/virtio/Kconfig | 2 --
13 files changed, 4 insertions(+), 2 deletions(-)
rename drivers/{virtio => }/vdpa/Kconfig (100%)
rename drivers/{virtio => }/vdpa/Makefile (100%)
rename drivers/{virtio => }/vdpa/ifcvf/Makefile (100%)
rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c (100%)
rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h (100%)
rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c (100%)
rename drivers/{virtio => }/vdpa/vdpa.c (100%)
rename drivers/{virtio => }/vdpa/vdpa_sim/Makefile (100%)
rename drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c (100%)MAINTAINERS +1 -0
@@ -17695,6 +17695,7 @@ L: [email protected] S: Maintained F: Documentation/devicetree/bindings/virtio/ F: drivers/virtio/ +F: drivers/vdpa/ F: tools/virtio/ F: drivers/net/virtio_net.c F: drivers/block/virtio_blk.c
drivers/Kconfig +2 -0
@@ -138,6 +138,8 @@ source "drivers/virt/Kconfig" source "drivers/virtio/Kconfig" +source "drivers/vdpa/Kconfig" + source "drivers/vhost/Kconfig" source "drivers/hv/Kconfig"
drivers/Makefile +1 -0
@@ -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
drivers/vdpa/Kconfig renamed from drivers/virtio/vdpa/Kconfig +0 -0
drivers/vdpa/Makefile renamed from drivers/virtio/vdpa/Makefile +0 -0
drivers/vdpa/ifcvf/Makefile renamed from drivers/virtio/vdpa/ifcvf/Makefile +0 -0
drivers/vdpa/ifcvf/ifcvf_base.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c +0 -0
drivers/vdpa/ifcvf/ifcvf_base.h renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h +0 -0
drivers/vdpa/ifcvf/ifcvf_main.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c +0 -0
drivers/vdpa/vdpa.c renamed from drivers/virtio/vdpa/vdpa.c +0 -0
drivers/vdpa/vdpa_sim/Makefile renamed from drivers/virtio/vdpa/vdpa_sim/Makefile +0 -0
drivers/vdpa/vdpa_sim/vdpa_sim.c renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +0 -0
drivers/virtio/Kconfig +0 -2
@@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES If unsure, say 'N'. endif # VIRTIO_MENU - -source "drivers/virtio/vdpa/Kconfig"
Signature · 1 line
MST
Quoted 5 lines · Michael S. Tsirkin
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.
Quoted 8 lines
Reported-by Randy Dunlap <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
Randy I'd say the issue you are reporting (vhost=y, virtio=m) is esoteric enough not to require a rebase for this. So I'd just apply this on top.
Do you agree?
Sure, looks fine from just reading it.
I haven't had a chance to test it yet.
Thanks.
Quoted 108 lines
MAINTAINERS | 1 + drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/{virtio => }/vdpa/Kconfig | 0 drivers/{virtio => }/vdpa/Makefile | 0 drivers/{virtio => }/vdpa/ifcvf/Makefile | 0 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c | 0 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h | 0 drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c | 0 drivers/{virtio => }/vdpa/vdpa.c | 0 drivers/{virtio => }/vdpa/vdpa_sim/Makefile | 0 drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c | 0 drivers/virtio/Kconfig | 2 -- 13 files changed, 4 insertions(+), 2 deletions(-) rename drivers/{virtio => }/vdpa/Kconfig (100%) rename drivers/{virtio => }/vdpa/Makefile (100%) rename drivers/{virtio => }/vdpa/ifcvf/Makefile (100%) rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c (100%) rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h (100%) rename drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c (100%) rename drivers/{virtio => }/vdpa/vdpa.c (100%) rename drivers/{virtio => }/vdpa/vdpa_sim/Makefile (100%) rename drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c (100%)MAINTAINERS +1
-0@@ -17695,6 +17695,7 @@ L: [email protected] S: Maintained F: Documentation/devicetree/bindings/virtio/ F: drivers/virtio/ +F: drivers/vdpa/ F: tools/virtio/ F: drivers/net/virtio_net.c F: drivers/block/virtio_blk.cdrivers/Kconfig +2
-0@@ -138,6 +138,8 @@ source "drivers/virt/Kconfig" source "drivers/virtio/Kconfig" +source "drivers/vdpa/Kconfig" + source "drivers/vhost/Kconfig" source "drivers/hv/Kconfig"drivers/Makefile +1
-0@@ -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 initializedrivers/vdpa/Kconfig renamed from drivers/virtio/vdpa/Kconfig +0
-0drivers/vdpa/Makefile renamed from drivers/virtio/vdpa/Makefile +0
-0drivers/vdpa/ifcvf/Makefile renamed from drivers/virtio/vdpa/ifcvf/Makefile +0
-0drivers/vdpa/ifcvf/ifcvf_base.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c +0
-0drivers/vdpa/ifcvf/ifcvf_base.h renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h +0
-0drivers/vdpa/ifcvf/ifcvf_main.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c +0
-0drivers/vdpa/vdpa.c renamed from drivers/virtio/vdpa/vdpa.c +0
-0drivers/vdpa/vdpa_sim/Makefile renamed from drivers/virtio/vdpa/vdpa_sim/Makefile +0
-0drivers/vdpa/vdpa_sim/vdpa_sim.c renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +0
-0drivers/virtio/Kconfig +0
-2@@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES If unsure, say 'N'. endif # VIRTIO_MENU - -source "drivers/virtio/vdpa/Kconfig"
Signature · 2 lines
~Randy Reported-by: Randy Dunlap <[email protected]>
Quoted 7 lines · Michael S. Tsirkin
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 <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Thanks
Quoted 114 lines
---
Randy I'd say the issue you are reporting (vhost=y, virtio=m) is esoteric enough not to require a rebase for this. So I'd just apply this on top.
Do you agree?MAINTAINERS | 1 + drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/{virtio => }/vdpa/Kconfig | 0 drivers/{virtio => }/vdpa/Makefile | 0 drivers/{virtio => }/vdpa/ifcvf/Makefile | 0 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.c | 0 drivers/{virtio => }/vdpa/ifcvf/ifcvf_base.h | 0 drivers/{virtio => }/vdpa/ifcvf/ifcvf_main.c | 0 drivers/{virtio => }/vdpa/vdpa.c | 0 drivers/{virtio => }/vdpa/vdpa_sim/Makefile | 0 drivers/{virtio => }/vdpa/vdpa_sim/vdpa_sim.c | 0 drivers/virtio/Kconfig | 2 -- 13 files changed, 4 insertions(+), 2 deletions(-)rename
drivers/{virtio=> }/vdpa/Kconfig (100%) renamedrivers/{virtio=> }/vdpa/Makefile (100%) renamedrivers/{virtio=> }/vdpa/ifcvf/Makefile (100%) renamedrivers/{virtio=>}/vdpa/ifcvf/ifcvf_base.c(100%) renamedrivers/{virtio=>}/vdpa/ifcvf/ifcvf_base.h(100%) renamedrivers/{virtio=>}/vdpa/ifcvf/ifcvf_main.c(100%) renamedrivers/{virtio=>}/vdpa/vdpa.c(100%) renamedrivers/{virtio=> }/vdpa/vdpa_sim/Makefile (100%) renamedrivers/{virtio=>}/vdpa/vdpa_sim/vdpa_sim.c(100%)MAINTAINERS +1
-0@@ -17695,6 +17695,7 @@ L: [email protected] S: Maintained F: Documentation/devicetree/bindings/virtio/ F: drivers/virtio/ +F: drivers/vdpa/ F: tools/virtio/ F: drivers/net/virtio_net.c F: drivers/block/virtio_blk.cdrivers/Kconfig +2
-0@@ -138,6 +138,8 @@ source "drivers/virt/Kconfig" source "drivers/virtio/Kconfig" +source "drivers/vdpa/Kconfig" + source "drivers/vhost/Kconfig" source "drivers/hv/Kconfig"drivers/Makefile +1
-0@@ -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 initializedrivers/vdpa/Kconfig renamed from drivers/virtio/vdpa/Kconfig +0
-0drivers/vdpa/Makefile renamed from drivers/virtio/vdpa/Makefile +0
-0drivers/vdpa/ifcvf/Makefile renamed from drivers/virtio/vdpa/ifcvf/Makefile +0
-0drivers/vdpa/ifcvf/ifcvf_base.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.c +0
-0drivers/vdpa/ifcvf/ifcvf_base.h renamed from drivers/virtio/vdpa/ifcvf/ifcvf_base.h +0
-0drivers/vdpa/ifcvf/ifcvf_main.c renamed from drivers/virtio/vdpa/ifcvf/ifcvf_main.c +0
-0drivers/vdpa/vdpa.c renamed from drivers/virtio/vdpa/vdpa.c +0
-0drivers/vdpa/vdpa_sim/Makefile renamed from drivers/virtio/vdpa/vdpa_sim/Makefile +0
-0drivers/vdpa/vdpa_sim/vdpa_sim.c renamed from drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c +0
-0drivers/virtio/Kconfig +0
-2@@ -109,5 +109,3 @@ config VIRTIO_MMIO_CMDLINE_DEVICES If unsure, say 'N'. endif # VIRTIO_MENU - -source "drivers/virtio/vdpa/Kconfig"