[Qemu-devel] [PATCH] Fix compilation of nbd on Solaris

[Qemu-devel] [PATCH] Fix compilation of nbd on Solaris

[Andreas Färber]

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

Compilation of QEMU is currently broken on Solaris due to nbd's use of  
_IO and due to network libraries not being linked into qemu-img.

The attached patch adds the appropriate libraries (copied from  
Makefile.target) and includes an additional Sun-specific header for _IO.

With these fixes it compiles okay, on OpenSolaris snv_93 (amd64).

Signed-off-by: Andreas Faerber <andreas.faerber@web.de>

Andreas

[-- Attachment #2: qemu-solaris-nbd.diff --]
[-- Type: application/octet-stream, Size: 574 bytes --]

diff --git a/Makefile b/Makefile
index fcf8a58..0472e16 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,10 @@ endif
 
 LIBS+=$(AIOLIBS)
 
+ifdef CONFIG_SOLARIS
+LIBS+=-lsocket -lnsl -lresolv
+endif
+
 all: $(TOOLS) $(DOCS) recurse-all 
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
diff --git a/nbd.c b/nbd.c
index e9308ee..9bebe4a 100644
--- a/nbd.c
+++ b/nbd.c
@@ -22,6 +22,9 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#ifdef __sun__
+#include <sys/ioccom.h>
+#endif
 #include <ctype.h>
 #include <inttypes.h>
 #include <sys/socket.h>

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

Re: [Qemu-devel] [PATCH] Fix compilation of nbd on Solaris

[Anthony Liguori]

Andreas Färber wrote:
> Compilation of QEMU is currently broken on Solaris due to nbd's use of 
> _IO and due to network libraries not being linked into qemu-img.
>
> The attached patch adds the appropriate libraries (copied from 
> Makefile.target) and includes an additional Sun-specific header for _IO.
>
> With these fixes it compiles okay, on OpenSolaris snv_93 (amd64).
>
> Signed-off-by: Andreas Faerber <andreas.faerber@web.de>

Applied.  Thanks.

Your mailer attached the patch as 'application/octet-stream'.  In the 
future, it would be better it you could also inline the patch or better 
yet, attach it as 'text/plain'.  That allows for easier commenting for 
more complex patches.

Regards,

Anthony Liguori

> Andreas
>
>
>