? block-multi.c
Index: Makefile
===================================================================
RCS file: /sources/qemu/qemu/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile	30 Apr 2006 23:54:18 -0000	1.99
+++ Makefile	11 May 2006 06:09:13 -0000
@@ -22,7 +22,7 @@ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
 	$(MAKE) -C $$d $@ || exit 1 ; \
         done
 
-qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c
+qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-multi.c
 	$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
Index: Makefile.target
===================================================================
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile.target
--- Makefile.target	3 May 2006 22:02:44 -0000	1.108
+++ Makefile.target	11 May 2006 06:09:13 -0000
@@ -273,7 +273,7 @@ endif
 
 # must use static linking to avoid leaving stuff in virtual address space
 VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o loader.o
-VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
+VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-multi.o
 ifdef CONFIG_WIN32
 VL_OBJS+=tap-win32.o
 endif
Index: block.c
===================================================================
RCS file: /sources/qemu/qemu/block.c,v
retrieving revision 1.26
diff -u -p -r1.26 block.c
--- block.c	25 Apr 2006 22:36:06 -0000	1.26
+++ block.c	11 May 2006 06:09:14 -0000
@@ -794,4 +794,5 @@ void bdrv_init(void)
     bdrv_register(&bdrv_bochs);
     bdrv_register(&bdrv_vpc);
     bdrv_register(&bdrv_vvfat);
+    bdrv_register(&bdrv_multi);
 }
Index: vl.h
===================================================================
RCS file: /sources/qemu/qemu/vl.h,v
retrieving revision 1.118
diff -u -p -r1.118 vl.h
--- vl.h	10 May 2006 22:17:36 -0000	1.118
+++ vl.h	11 May 2006 06:09:15 -0000
@@ -477,6 +477,7 @@ extern BlockDriver bdrv_dmg;
 extern BlockDriver bdrv_bochs;
 extern BlockDriver bdrv_vpc;
 extern BlockDriver bdrv_vvfat;
+extern BlockDriver bdrv_multi;
 
 void bdrv_init(void);
 BlockDriver *bdrv_find_format(const char *format_name);