diff options
| -rw-r--r-- | qemu/Makefile | 9 | ||||
| -rw-r--r-- | qemu/block.c | 4 | ||||
| -rwxr-xr-x | qemu/configure | 14 |
3 files changed, 22 insertions, 5 deletions
diff --git a/qemu/Makefile b/qemu/Makefile index 0367639b..f344c05f 100644 --- a/qemu/Makefile +++ b/qemu/Makefile @@ -50,9 +50,10 @@ recurse-all: $(SUBDIR_RULES) BLOCK_OBJS=cutils.o qemu-malloc.o BLOCK_OBJS+=block-cow.o block-qcow.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 - +BLOCK_OBJS+=block-qcow2.o block-parallels.o block.o aio.o +ifdef CONFIG_NBD +BLOCK_OBJS+=nbd.o block-nbd.o +endif ifdef CONFIG_WIN32 BLOCK_OBJS += block-raw-win32.o else @@ -275,8 +276,10 @@ ifndef CONFIG_WIN32 mkdir -p "$(DESTDIR)$(mandir)/man1" $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" mkdir -p "$(DESTDIR)$(mandir)/man8" +ifdef CONFIG_NBD $(INSTALL) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" endif +endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" diff --git a/qemu/block.c b/qemu/block.c index b5704da0..a17b9b66 100644 --- a/qemu/block.c +++ b/qemu/block.c @@ -180,7 +180,7 @@ BlockDriver *bdrv_find_format(const char *format_name) static int bdrv_is_supported(BlockDriver *drv) { static const char *supported[] = { - "raw", "qcow2", "nbd", "host_device", NULL + "raw", "qcow2", "host_device", NULL }; const char **p; @@ -1580,7 +1580,9 @@ void bdrv_init(void) bdrv_register(&bdrv_vvfat); bdrv_register(&bdrv_qcow2); bdrv_register(&bdrv_parallels); +#ifdef CONFIG_NBD bdrv_register(&bdrv_nbd); +#endif } void bdrv_init_supported_only(void) diff --git a/qemu/configure b/qemu/configure index 1a9d065a..052fd497 100755 --- a/qemu/configure +++ b/qemu/configure @@ -183,6 +183,7 @@ usb_serial="yes" usb_net="yes" usb_bluez="yes" vmware="yes" +nbd="yes" x86_only_generic_cpus="no" kvm="yes" kvm_nested="no" @@ -438,6 +439,8 @@ for opt do ;; --disable-vmware) vmware="no" ;; + --disable-nbd) nbd="no" + ;; --disable-x86-non-generic-cpus) x86_only_generic_cpus="yes" ;; --disable-kvm) kvm="no" @@ -599,6 +602,7 @@ echo " --disable-usb-msd disable usb storage devices" echo " --disable-usb-wacom disable usb wacom tablets" echo " --disable-usb-serial disable usb serial" echo " --disable-vmware disable vmware drivers" +echo " --disable-nbd disable nbd support" echo " --disable-kvm disable KVM acceleration support" echo " --disable-nptl disable usermode NPTL support" echo " --enable-system enable all system emulation targets" @@ -1338,6 +1342,7 @@ echo "USB serial $usb_serial" echo "USB net $usb_net" echo "USB bluez $usb_bluez" echo "VMware drivers $vmware" +echo "NBD support $nbd" echo "bluetooth support $bluez" echo "Only generic cpus $x86_only_generic_cpus" @@ -1663,6 +1668,10 @@ if test "$vmware" = "yes" ; then echo "CONFIG_VMWARE=yes" >> $config_mak echo "#define CONFIG_VMWARE 1" >> $config_h fi +if test "$nbd" = "yes" ; then + echo "CONFIG_NBD=yes" >> $config_mak + echo "#define CONFIG_NBD 1" >> $config_h +fi if test "$x86_only_generic_cpus" = "yes" ; then echo "#define CONFIG_X86_ONLY_GENERIC_CPUS 1" >> $config_h fi @@ -1730,7 +1739,10 @@ tools= if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then tools="qemu-img\$(EXESUF) $tools" if [ "$linux" = "yes" ] ; then - tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools" + if test "$nbd" = "yes" ; then + tools="qemu-nbd\$(EXESUF) $tools" + fi + tools="qemu-io\$(EXESUF) $tools" fi fi echo "TOOLS=$tools" >> $config_mak |