BSD build fixes

PATCH Applied Christoph Egger 2 participants 4 messages Nov 4, 2008 – Nov 7, 2008

lore

Share & tools

lore

Christoph Egger

author

2008-11-04 16:48 UTC #0 lore raw

PATCH 1/1 BSD build fixes

Hi!

Attached patch fixes some build issues for BSD.

Signed-off-by Christoph Egger <[email protected]>

Signature · 12 lines

AMD Saxony, Dresden, Germany
Operating System Research Center

Legal Information:
AMD Saxony Limited Liability Company & Co. KG
Sitz (Geschäftsanschrift):
   Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland
Registergericht Dresden: HRA 4896
vertretungsberechtigter Komplementär:
   AMD Saxony LLC (Sitz Wilmington, Delaware, USA)
Geschäftsführer der AMD Saxony LLC:
   Dr. Hans-R. Deppe, Thomas McCoy

vl.c +12 -7

Index: vl.c
===================================================================
@@ -54,26 +54,31 @@
 #include <termios.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#if defined(__NetBSD__)
+#include <net/if_tap.h>
+#endif
+#ifdef __linux__
+#include <linux/if_tun.h>
+#endif
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
+#else
+#include <util.h>
 #endif
-#ifdef __OpenBSD__
-#include <net/if.h>
-#endif
 #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
 #else
 #ifdef __linux__
-#include <linux/if.h>
-#include <linux/if_tun.h>
 #include <pty.h>
 #include <malloc.h>
 #include <linux/rtc.h>

net.c +12 -7

Index: net.c
===================================================================
@@ -54,26 +54,31 @@
 #include <termios.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#ifdef __NetBSD__
+#include <net/if_tap.h>
+#endif
+#ifdef __linux__
+#include <linux/if_tun.h>
+#endif
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
+#else
+#include <util.h>
 #endif
-#ifdef __OpenBSD__
-#include <net/if.h>
-#endif
 #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
 #else
 #ifdef __linux__
-#include <linux/if.h>
-#include <linux/if_tun.h>
 #include <pty.h>
 #include <malloc.h>
 #include <linux/rtc.h>

qemu-char.c +12 -6

Index: qemu-char.c
===================================================================
@@ -45,25 +45,31 @@
 #include <termios.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#ifdef __NetBSD__
+#include <net/if_tap.h>
+#endif
+#ifdef __linux__
+#include <linux/if_tun.h>
+#endif
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
+#else
+#include <util.h>
 #endif
-#ifdef __OpenBSD__
-#include <net/if.h>
-#endif
 #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
 #else
 #ifdef __linux__
-#include <linux/if.h>
 #include <pty.h>
 
 #include <linux/ppdev.h>

Blue Swirl

2008-11-05 17:34 UTC #1 lore raw

Quoted 4 lines · Christoph Egger

Hi!
Attached patch fixes some build issues for BSD.

Qemu compiled fine on OpenBSD without the patch, but it's still OK after the patch too. Did you test both FreeBSD and NetBSD?

Christoph Egger

author

2008-11-06 13:58 UTC #2 lore raw

In reply to Christoph Egger

Quoted 10 lines

Quoted 5 lines
Hi!
Attached patch fixes some build issues for BSD.
Qemu compiled fine on OpenBSD without the patch, but it's still OK after the patch too. Did you test both FreeBSD and NetBSD?
Blue Swirl

Yes. NetBSD in particular.

(I have more patches in the queue, but the complete patch as a whole was ignored on this list, so I splitted it in smaller pieces.)

Christoph

Signature · 12 lines

AMD Saxony, Dresden, Germany
Operating System Research Center

Legal Information:
AMD Saxony Limited Liability Company & Co. KG
Sitz (Geschäftsanschrift):
   Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland
Registergericht Dresden: HRA 4896
vertretungsberechtigter Komplementär:
   AMD Saxony LLC (Sitz Wilmington, Delaware, USA)
Geschäftsführer der AMD Saxony LLC:
   Dr. Hans-R. Deppe, Thomas McCoy

Blue Swirl

Applied

2008-11-07 16:56 UTC #3 lore raw

Quoted 7 lines · Christoph Egger

Quoted 6 lines
Quoted 5 lines
Hi!
Attached patch fixes some build issues for BSD.

Quoted 7 lines

Quoted 5 lines
Qemu compiled fine on OpenBSD without the patch, but it's still OK after the patch too. Did you test both FreeBSD and NetBSD?
Blue Swirl
Yes. NetBSD in particular.

Thanks, applied.