diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | block/bochs.c (renamed from block-bochs.c) | 0 | ||||
| -rw-r--r-- | block/cloop.c (renamed from block-cloop.c) | 0 | ||||
| -rw-r--r-- | block/cow.c (renamed from block-cow.c) | 0 | ||||
| -rw-r--r-- | block/dmg.c (renamed from block-dmg.c) | 0 | ||||
| -rw-r--r-- | block/nbd.c (renamed from block-nbd.c) | 0 | ||||
| -rw-r--r-- | block/parallels.c (renamed from block-parallels.c) | 0 | ||||
| -rw-r--r-- | block/qcow.c (renamed from block-qcow.c) | 0 | ||||
| -rw-r--r-- | block/qcow2.c (renamed from block-qcow2.c) | 0 | ||||
| -rw-r--r-- | block/raw-posix.c (renamed from block-raw-posix.c) | 0 | ||||
| -rw-r--r-- | block/raw-win32.c (renamed from block-raw-win32.c) | 1 | ||||
| -rw-r--r-- | block/vmdk.c (renamed from block-vmdk.c) | 0 | ||||
| -rw-r--r-- | block/vpc.c (renamed from block-vpc.c) | 0 | ||||
| -rw-r--r-- | block/vvfat.c (renamed from block-vvfat.c) | 0 | ||||
| -rwxr-xr-x | configure | 2 |
15 files changed, 9 insertions, 8 deletions
@@ -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 index bac81c42b7..bac81c42b7 100644 --- a/block-bochs.c +++ b/block/bochs.c diff --git a/block-cloop.c b/block/cloop.c index 06c687e690..06c687e690 100644 --- a/block-cloop.c +++ b/block/cloop.c diff --git a/block-cow.c b/block/cow.c index 94b3549389..94b3549389 100644 --- a/block-cow.c +++ b/block/cow.c diff --git a/block-dmg.c b/block/dmg.c index 262560ffd3..262560ffd3 100644 --- a/block-dmg.c +++ b/block/dmg.c diff --git a/block-nbd.c b/block/nbd.c index 47d4778999..47d4778999 100644 --- a/block-nbd.c +++ b/block/nbd.c diff --git a/block-parallels.c b/block/parallels.c index 0b64a5c625..0b64a5c625 100644 --- a/block-parallels.c +++ b/block/parallels.c diff --git a/block-qcow.c b/block/qcow.c index 1cf7c3be77..1cf7c3be77 100644 --- a/block-qcow.c +++ b/block/qcow.c diff --git a/block-qcow2.c b/block/qcow2.c index a6de9b6919..a6de9b6919 100644 --- a/block-qcow2.c +++ b/block/qcow2.c diff --git a/block-raw-posix.c b/block/raw-posix.c index f3a9476b44..f3a9476b44 100644 --- a/block-raw-posix.c +++ b/block/raw-posix.c diff --git a/block-raw-win32.c b/block/raw-win32.c index 15f3ec4849..ab3abd636d 100644 --- a/block-raw-win32.c +++ b/block/raw-win32.c @@ -388,6 +388,7 @@ static void bdrv_raw_init(void) { 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 index 13866e9b06..13866e9b06 100644 --- a/block-vmdk.c +++ b/block/vmdk.c diff --git a/block-vpc.c b/block/vpc.c index 211ae5c72f..211ae5c72f 100644 --- a/block-vpc.c +++ b/block/vpc.c diff --git a/block-vvfat.c b/block/vvfat.c index 2a8feb38d8..2a8feb38d8 100644 --- a/block-vvfat.c +++ b/block/vvfat.c @@ -2029,7 +2029,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" |