From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ly68y-0000Ta-Em for qemu-devel@nongnu.org; Sun, 26 Apr 2009 11:19:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ly68t-0000T8-AE for qemu-devel@nongnu.org; Sun, 26 Apr 2009 11:19:48 -0400 Received: from [199.232.76.173] (port=51607 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ly68t-0000T5-4b for qemu-devel@nongnu.org; Sun, 26 Apr 2009 11:19:43 -0400 Received: from mx2.redhat.com ([66.187.237.31]:60679) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ly68s-0005ke-FF for qemu-devel@nongnu.org; Sun, 26 Apr 2009 11:19:42 -0400 From: Avi Kivity Date: Sun, 26 Apr 2009 18:19:37 +0300 Message-Id: <1240759177-27527-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH] Move block format drivers to new directory 'bdrv' List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Instead of crowding the top-level directory, give block format drivers their very own subdirectory. Signed-off-by: Avi Kivity --- Makefile | 10 +++++----- Makefile.target | 4 ++-- block-bochs.c => bdrv/bochs.c | 0 block-cloop.c => bdrv/cloop.c | 0 block-cow.c => bdrv/cow.c | 0 block-dmg.c => bdrv/dmg.c | 0 block-nbd.c => bdrv/nbd.c | 0 block-parallels.c => bdrv/parallels.c | 0 block-qcow.c => bdrv/qcow.c | 0 block-qcow2.c => bdrv/qcow2.c | 0 block-raw-posix.c => bdrv/raw-posix.c | 0 block-raw-win32.c => bdrv/raw-win32.c | 0 block-vmdk.c => bdrv/vmdk.c | 0 block-vpc.c => bdrv/vpc.c | 0 block-vvfat.c => bdrv/vvfat.c | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename block-bochs.c => bdrv/bochs.c (100%) rename block-cloop.c => bdrv/cloop.c (100%) rename block-cow.c => bdrv/cow.c (100%) rename block-dmg.c => bdrv/dmg.c (100%) rename block-nbd.c => bdrv/nbd.c (100%) rename block-parallels.c => bdrv/parallels.c (100%) rename block-qcow.c => bdrv/qcow.c (100%) rename block-qcow2.c => bdrv/qcow2.c (100%) rename block-raw-posix.c => bdrv/raw-posix.c (100%) rename block-raw-win32.c => bdrv/raw-win32.c (100%) rename block-vmdk.c => bdrv/vmdk.c (100%) rename block-vpc.c => bdrv/vpc.c (100%) rename block-vvfat.c => bdrv/vvfat.c (100%) diff --git a/Makefile b/Makefile index 0f40cda..95d8cd0 100644 --- a/Makefile +++ b/Makefile @@ -63,18 +63,18 @@ recurse-all: $(SUBDIR_RULES) # BLOCK_OBJS is code used by both qemu system emulation and qemu-img BLOCK_OBJS=cutils.o qemu-malloc.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+=bdrv/cow.o bdrv/qcow.o aes.o bdrv/vmdk.o bdrv/cloop.o +BLOCK_OBJS+=bdrv/dmg.o bdrv/bochs.o bdrv/vpc.o bdrv/vvfat.o +BLOCK_OBJS+=bdrv/qcow2.o bdrv/parallels.o bdrv/nbd.o BLOCK_OBJS+=nbd.o block.o aio.o ifdef CONFIG_WIN32 -BLOCK_OBJS += block-raw-win32.o +BLOCK_OBJS += bdrv/raw-win32.o else ifdef CONFIG_AIO BLOCK_OBJS += posix-aio-compat.o endif -BLOCK_OBJS += block-raw-posix.o +BLOCK_OBJS += bdrv/raw-posix.o endif ###################################################################### diff --git a/Makefile.target b/Makefile.target index 82ada5a..fd70c8d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -507,12 +507,12 @@ ifdef CONFIG_KVM OBJS+=kvm.o kvm-all.o endif ifdef CONFIG_WIN32 -OBJS+=block-raw-win32.o +OBJS+=bdrv/raw-win32.o else ifdef CONFIG_AIO OBJS+=posix-aio-compat.o endif -OBJS+=block-raw-posix.o +OBJS+=bdrv/raw-posix.o endif LIBS+=-lz diff --git a/block-bochs.c b/bdrv/bochs.c similarity index 100% rename from block-bochs.c rename to bdrv/bochs.c diff --git a/block-cloop.c b/bdrv/cloop.c similarity index 100% rename from block-cloop.c rename to bdrv/cloop.c diff --git a/block-cow.c b/bdrv/cow.c similarity index 100% rename from block-cow.c rename to bdrv/cow.c diff --git a/block-dmg.c b/bdrv/dmg.c similarity index 100% rename from block-dmg.c rename to bdrv/dmg.c diff --git a/block-nbd.c b/bdrv/nbd.c similarity index 100% rename from block-nbd.c rename to bdrv/nbd.c diff --git a/block-parallels.c b/bdrv/parallels.c similarity index 100% rename from block-parallels.c rename to bdrv/parallels.c diff --git a/block-qcow.c b/bdrv/qcow.c similarity index 100% rename from block-qcow.c rename to bdrv/qcow.c diff --git a/block-qcow2.c b/bdrv/qcow2.c similarity index 100% rename from block-qcow2.c rename to bdrv/qcow2.c diff --git a/block-raw-posix.c b/bdrv/raw-posix.c similarity index 100% rename from block-raw-posix.c rename to bdrv/raw-posix.c diff --git a/block-raw-win32.c b/bdrv/raw-win32.c similarity index 100% rename from block-raw-win32.c rename to bdrv/raw-win32.c diff --git a/block-vmdk.c b/bdrv/vmdk.c similarity index 100% rename from block-vmdk.c rename to bdrv/vmdk.c diff --git a/block-vpc.c b/bdrv/vpc.c similarity index 100% rename from block-vpc.c rename to bdrv/vpc.c diff --git a/block-vvfat.c b/bdrv/vvfat.c similarity index 100% rename from block-vvfat.c rename to bdrv/vvfat.c -- 1.6.0.6