gwj / at91sam9263 · Commits

Commit 019d6b8ff0d495ded6977f24a4e8fd1c7fec09e0

Authored by Anthony Liguori
1 parent 5efa9d5a

Move block drivers into their own directory 

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 15 changed files with 9 additions and 8 deletions
Makefile
  View file @019d6b8
@@ -64,18 +64,18 @@ recurse-all: $(SUBDIR_RULES) @@ -64,18 +64,18 @@ recurse-all: $(SUBDIR_RULES)
64 # BLOCK_OBJS is code used by both qemu system emulation and qemu-img 64 # BLOCK_OBJS is code used by both qemu system emulation and qemu-img
65 65
66 BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o module.o 66 BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o module.o
67 -BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o  
68 -BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o  
69 -BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o 67 +BLOCK_OBJS+=block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
  68 +BLOCK_OBJS+=block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
  69 +BLOCK_OBJS+=block/qcow2.o block/parallels.o block/nbd.o
70 BLOCK_OBJS+=nbd.o block.o aio.o 70 BLOCK_OBJS+=nbd.o block.o aio.o
71 71
72 ifdef CONFIG_WIN32 72 ifdef CONFIG_WIN32
73 -BLOCK_OBJS += block-raw-win32.o 73 +BLOCK_OBJS += block/raw-win32.o
74 else 74 else
75 ifdef CONFIG_AIO 75 ifdef CONFIG_AIO
76 BLOCK_OBJS += posix-aio-compat.o 76 BLOCK_OBJS += posix-aio-compat.o
77 endif 77 endif
78 -BLOCK_OBJS += block-raw-posix.o 78 +BLOCK_OBJS += block/raw-posix.o
79 endif 79 endif
80 80
81 ###################################################################### 81 ######################################################################
@@ -234,7 +234,7 @@ clean: @@ -234,7 +234,7 @@ clean:
234 # avoid old build problems by removing potentially incorrect old files 234 # avoid old build problems by removing potentially incorrect old files
235 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 235 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
236 rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~ 236 rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
237 - rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d 237 + rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
238 $(MAKE) -C tests clean 238 $(MAKE) -C tests clean
239 for d in $(TARGET_DIRS); do \ 239 for d in $(TARGET_DIRS); do \
240 $(MAKE) -C $$d $@ || exit 1 ; \ 240 $(MAKE) -C $$d $@ || exit 1 ; \
@@ -408,4 +408,4 @@ tarbin: @@ -408,4 +408,4 @@ tarbin:
408 $(mandir)/man8/qemu-nbd.8 408 $(mandir)/man8/qemu-nbd.8
409 409
410 # Include automatically generated dependency files 410 # Include automatically generated dependency files
411 --include $(wildcard *.d audio/*.d slirp/*.d) 411 +-include $(wildcard *.d audio/*.d slirp/*.d block/*.d)
block-bochs.c renamed to block/bochs.c
  View file @019d6b8
block-cloop.c renamed to block/cloop.c
  View file @019d6b8
block-cow.c renamed to block/cow.c
  View file @019d6b8
block-dmg.c renamed to block/dmg.c
  View file @019d6b8
block-nbd.c renamed to block/nbd.c
  View file @019d6b8
block-parallels.c renamed to block/parallels.c
  View file @019d6b8
block-qcow.c renamed to block/qcow.c
  View file @019d6b8
block-qcow2.c renamed to block/qcow2.c
  View file @019d6b8
block-raw-posix.c renamed to block/raw-posix.c
  View file @019d6b8
block-raw-win32.c renamed to block/raw-win32.c
  View file @019d6b8
@@ -388,6 +388,7 @@ static void bdrv_raw_init(void) @@ -388,6 +388,7 @@ static void bdrv_raw_init(void)
388 { 388 {
389 bdrv_register(&bdrv_raw); 389 bdrv_register(&bdrv_raw);
390 bdrv_register(&bdrv_host_device); 390 bdrv_register(&bdrv_host_device);
  391 + return 0;
391 } 392 }
392 393
393 block_init(bdrv_raw_init); 394 block_init(bdrv_raw_init);
block-vmdk.c renamed to block/vmdk.c
  View file @019d6b8
block-vpc.c renamed to block/vpc.c
  View file @019d6b8
block-vvfat.c renamed to block/vvfat.c
  View file @019d6b8
configure
  View file @019d6b8
@@ -2029,7 +2029,7 @@ done # for target in $targets @@ -2029,7 +2029,7 @@ done # for target in $targets
2029 2029
2030 # build tree in object directory if source path is different from current one 2030 # build tree in object directory if source path is different from current one
2031 if test "$source_path_used" = "yes" ; then 2031 if test "$source_path_used" = "yes" ; then
2032 - DIRS="tests tests/cris slirp audio" 2032 + DIRS="tests tests/cris slirp audio block"
2033 FILES="Makefile tests/Makefile" 2033 FILES="Makefile tests/Makefile"
2034 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" 2034 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
2035 FILES="$FILES tests/test-mmap.c" 2035 FILES="$FILES tests/test-mmap.c"