Move block drivers into their own directory
Signed-off-by: Anthony Liguori <[email protected]>
diff --git a/Makefile b/Makefile
index 046c743..22d2006 100644
--- a/Makefile
+++ b/Makefile
@@ -64,18 +64,18 @@
# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o module.o
-BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
-BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
-BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
+BLOCK_OBJS+=block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
+BLOCK_OBJS+=block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
+BLOCK_OBJS+=block/qcow2.o block/parallels.o block/nbd.o
BLOCK_OBJS+=nbd.o block.o aio.o
ifdef CONFIG_WIN32
-BLOCK_OBJS += block-raw-win32.o
+BLOCK_OBJS += block/raw-win32.o
else
ifdef CONFIG_AIO
BLOCK_OBJS += posix-aio-compat.o
endif
-BLOCK_OBJS += block-raw-posix.o
+BLOCK_OBJS += block/raw-posix.o
endif
######################################################################
@@ -234,7 +234,7 @@
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
- rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d
+ rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
$(MAKE) -C tests clean
for d in $(TARGET_DIRS); do \
$(MAKE) -C $$d $@ || exit 1 ; \
@@ -408,4 +408,4 @@
$(mandir)/man8/qemu-nbd.8
# Include automatically generated dependency files
--include $(wildcard *.d audio/*.d slirp/*.d)
+-include $(wildcard *.d audio/*.d slirp/*.d block/*.d)
diff --git a/block-bochs.c b/block/bochs.c
similarity index 100%
rename from block-bochs.c
rename to block/bochs.c
diff --git a/block-cloop.c b/block/cloop.c
similarity index 100%
rename from block-cloop.c
rename to block/cloop.c
diff --git a/block-cow.c b/block/cow.c
similarity index 100%
rename from block-cow.c
rename to block/cow.c
diff --git a/block-dmg.c b/block/dmg.c
similarity index 100%
rename from block-dmg.c
rename to block/dmg.c
diff --git a/block-nbd.c b/block/nbd.c
similarity index 100%
rename from block-nbd.c
rename to block/nbd.c
diff --git a/block-parallels.c b/block/parallels.c
similarity index 100%
rename from block-parallels.c
rename to block/parallels.c
diff --git a/block-qcow.c b/block/qcow.c
similarity index 100%
rename from block-qcow.c
rename to block/qcow.c
diff --git a/block-qcow2.c b/block/qcow2.c
similarity index 100%
rename from block-qcow2.c
rename to block/qcow2.c
diff --git a/block-raw-posix.c b/block/raw-posix.c
similarity index 100%
rename from block-raw-posix.c
rename to block/raw-posix.c
diff --git a/block-raw-win32.c b/block/raw-win32.c
similarity index 99%
rename from block-raw-win32.c
rename to block/raw-win32.c
index 15f3ec4..ab3abd6 100644
--- a/block-raw-win32.c
+++ b/block/raw-win32.c
@@ -388,6 +388,7 @@
{
bdrv_register(&bdrv_raw);
bdrv_register(&bdrv_host_device);
+ return 0;
}
block_init(bdrv_raw_init);
diff --git a/block-vmdk.c b/block/vmdk.c
similarity index 100%
rename from block-vmdk.c
rename to block/vmdk.c
diff --git a/block-vpc.c b/block/vpc.c
similarity index 100%
rename from block-vpc.c
rename to block/vpc.c
diff --git a/block-vvfat.c b/block/vvfat.c
similarity index 100%
rename from block-vvfat.c
rename to block/vvfat.c
diff --git a/configure b/configure
index d3788fc..8fbe35b 100755
--- a/configure
+++ b/configure
@@ -2029,7 +2029,7 @@
# build tree in object directory if source path is different from current one
if test "$source_path_used" = "yes" ; then
- DIRS="tests tests/cris slirp audio"
+ DIRS="tests tests/cris slirp audio block"
FILES="Makefile tests/Makefile"
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
FILES="$FILES tests/test-mmap.c"
