kvm tools: Move virtio drivers under virtio directory

This patch moves the virtio drivers under virtio directory.

Suggested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index 19e7b9e6f7c9d17b7988b418045e159a71a543fc..89c7e3d5567dc4e2c4cbd017c779b907e4f27358 100644 (file)
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -13,9 +13,6 @@ CSCOPE = cscope
 TAGS = ctags
 
 OBJS   += 8250-serial.o
-OBJS   += virtio-blk.o
-OBJS   += virtio-net.o
-OBJS   += virtio-console.o
 OBJS   += cpuid.o
 OBJS   += read-write.o
 OBJS   += disk-image.o
@@ -29,7 +26,11 @@ OBJS += pci.o
 OBJS   += rtc.o
 OBJS   += term.o
 OBJS   += util.o
-OBJS   += virtio.o
+OBJS   += virtio/blk.o
+OBJS   += virtio/console.o
+OBJS   += virtio/core.o
+OBJS   += virtio/net.o
+OBJS   += virtio/rng.o
 OBJS    += util/parse-options.o
 OBJS    += util/strbuf.o
 OBJS    += kvm-help.o
@@ -38,7 +39,6 @@ OBJS    += kvm-run.o
 OBJS    += qcow.o
 OBJS    += mptable.o
 OBJS    += threadpool.o
-OBJS    += virtio-rng.o
 
 DEPS   := $(patsubst %.o,%.d,$(OBJS))
 

diff --git a/tools/kvm/virtio-blk.c b/tools/kvm/virtio/blk.c
similarity index 100%
rename from tools/kvm/virtio-blk.c
rename to tools/kvm/virtio/blk.c

diff --git a/tools/kvm/virtio-console.c b/tools/kvm/virtio/console.c
similarity index 100%
rename from tools/kvm/virtio-console.c
rename to tools/kvm/virtio/console.c

diff --git a/tools/kvm/virtio.c b/tools/kvm/virtio/core.c
similarity index 100%
rename from tools/kvm/virtio.c
rename to tools/kvm/virtio/core.c

diff --git a/tools/kvm/virtio-net.c b/tools/kvm/virtio/net.c
similarity index 100%
rename from tools/kvm/virtio-net.c
rename to tools/kvm/virtio/net.c

diff --git a/tools/kvm/virtio-rng.c b/tools/kvm/virtio/rng.c
similarity index 100%
rename from tools/kvm/virtio-rng.c
rename to tools/kvm/virtio/rng.c