From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M3WTK-00014A-U3 for qemu-devel@nongnu.org; Mon, 11 May 2009 10:27:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M3WTF-00011z-4t for qemu-devel@nongnu.org; Mon, 11 May 2009 10:27:13 -0400 Received: from [199.232.76.173] (port=59247 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M3WTF-00011l-15 for qemu-devel@nongnu.org; Mon, 11 May 2009 10:27:09 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:43676) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M3WTE-00055h-Iu for qemu-devel@nongnu.org; Mon, 11 May 2009 10:27:08 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e6.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n4BETIZJ007387 for ; Mon, 11 May 2009 10:29:18 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n4BEQviR1659078 for ; Mon, 11 May 2009 10:26:57 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n4BEQqdT008425 for ; Mon, 11 May 2009 08:26:52 -0600 From: Anthony Liguori Date: Mon, 11 May 2009 09:26:48 -0500 Message-Id: <1242052009-27339-4-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1242052009-27339-1-git-send-email-aliguori@us.ibm.com> References: <1242052009-27339-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 3/4] Move block drivers into their own directory List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Paul Brook Signed-off-by: Anthony Liguori diff --git a/Makefile b/Makefile index 5c53801..24b8c0d 100644 --- a/Makefile +++ b/Makefile @@ -64,18 +64,18 @@ recurse-all: $(SUBDIR_RULES) # 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 @@ clean: # 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 @@ tarbin: $(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 100% rename from block-raw-win32.c rename to block/raw-win32.c 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 b2a2540..1bd7e76 100755 --- a/configure +++ b/configure @@ -2028,7 +2028,7 @@ done # for target in $targets # 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" -- 1.6.0.6