Re: [Qemu-devel] [4838] Allow QEMU to connect directly to an NBD server, by Laurent Vivier.

[Laurent Vivier <Laurent.Vivier@bull.net>]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

Le vendredi 04 juillet 2008 à 11:51 +0800, chenqing a écrit :
> > 
> > Hm, how much of nbd.c works on windows?
> 
> We don't care nbd.c works on windows, we just want to compile qemu on
> windows smoothly. In fact, I can did it successfully yestoday, but failed
> today because these error.

The attached patch should disable NBD on win32.

Regards,
Laurent
-- 
------------- Laurent.Vivier@bull.net ---------------
"The best way to predict the future is to invent it."
- Alan Kay

[-- Attachment #2: nbd-win32.patch --]
[-- Type: text/x-vhdl, Size: 1533 bytes --]

---
 Makefile |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Index: qemu/Makefile
===================================================================
--- qemu.orig/Makefile	2008-07-04 10:39:31.000000000 +0200
+++ qemu/Makefile	2008-07-04 10:39:35.000000000 +0200
@@ -42,7 +42,10 @@ recurse-all: $(SUBDIR_RULES)
 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+=block-qcow2.o block-parallels.o 
+ifndef CONFIG_WIN32
+BLOCK_OBJS+=block-nbd.o
+endif
 
 ######################################################################
 # libqemu_common.a: Target independent part of system emulation. The
@@ -50,7 +53,10 @@ BLOCK_OBJS+=block-qcow2.o block-parallel
 # system emulation, i.e. a single QEMU executable should support all
 # CPUs and machines.
 
-OBJS=nbd.o $(BLOCK_OBJS)
+OBJS=$(BLOCK_OBJS)
+ifndef CONFIG_WIN32
+OBJS+=nbd.o
+endif
 OBJS+=readline.o console.o
 OBJS+=block.o
 
@@ -159,11 +165,11 @@ libqemu_user.a: $(USER_OBJS)
 	rm -f $@ 
 	$(AR) rcs $@ $(USER_OBJS)
 
-QEMU_IMG_BLOCK_OBJS = nbd.o $(BLOCK_OBJS)
+QEMU_IMG_BLOCK_OBJS = $(BLOCK_OBJS)
 ifdef CONFIG_WIN32
 QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
 else
-QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-posix.o
+QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o
 endif
 
 ######################################################################