From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KxP51-0004H9-N5
	for qemu-devel@nongnu.org; Tue, 04 Nov 2008 11:48:35 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KxP50-0004Gj-Pc
	for qemu-devel@nongnu.org; Tue, 04 Nov 2008 11:48:35 -0500
Received: from [199.232.76.173] (port=43519 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KxP50-0004Ge-Ir
	for qemu-devel@nongnu.org; Tue, 04 Nov 2008 11:48:34 -0500
Received: from outbound-wa4.frontbridge.com ([216.32.181.16]:57373
	helo=WA4EHSOBE003.bigfish.com)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16)
	(Exim 4.60) (envelope-from <Christoph.Egger@amd.com>)
	id 1KxP4z-0005t5-RK
	for qemu-devel@nongnu.org; Tue, 04 Nov 2008 11:48:34 -0500
Received: from mail74-wa4 (localhost.localdomain [127.0.0.1])	by
	mail74-wa4-R.bigfish.com (Postfix) with ESMTP id 0482FCD0160	for
	<qemu-devel@nongnu.org>; Tue,  4 Nov 2008 16:48:30 +0000 (UTC)
Received: from ausb3extmailp01.amd.com (unknown [163.181.251.8])	(using TLSv1
	with cipher DHE-RSA-AES256-SHA (256/256 bits))	(No client certificate
	requested)	by mail74-wa4.bigfish.com (Postfix) with ESMTP id
	8B6611A9807D	for
	<qemu-devel@nongnu.org>; Tue,  4 Nov 2008 16:48:28 +0000 (UTC)
Received: from ausb3twp01.amd.com ([163.181.250.37])	by
	ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id
	mA4GmJH3009168	for <qemu-devel@nongnu.org>;
	Tue, 4 Nov 2008 10:48:22 -0600
Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102])	by
	ausb3twp01.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id
	22D36194971	for
	<qemu-devel@nongnu.org>; Tue,  4 Nov 2008 10:48:14 -0600 (CST)
From: Christoph Egger <Christoph.Egger@amd.com>
Date: Tue, 4 Nov 2008 18:48:17 +0200
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary-00=_RzHEJ5Gk9H+no95"
Message-ID: <200811041748.17954.Christoph.Egger@amd.com>
Subject: [Qemu-devel] [PATCH] BSD build fixes
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

--Boundary-00=_RzHEJ5Gk9H+no95
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline


Hi!

Attached patch fixes some build issues for BSD.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>



=2D-=20
AMD Saxony, Dresden, Germany
Operating System Research Center

Legal Information:
AMD Saxony Limited Liability Company & Co. KG
Sitz (Gesch=E4ftsanschrift):
   Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland
Registergericht Dresden: HRA 4896
vertretungsberechtigter Komplement=E4r:
   AMD Saxony LLC (Sitz Wilmington, Delaware, USA)
Gesch=E4ftsf=FChrer der AMD Saxony LLC:
   Dr. Hans-R. Deppe, Thomas McCoy

--Boundary-00=_RzHEJ5Gk9H+no95
Content-Type: text/x-diff; charset="us-ascii"; name="qemu.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="qemu.diff"

Index: vl.c
===================================================================
--- vl.c	(revision 5608)
+++ vl.c	(working copy)
@@ -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>
Index: net.c
===================================================================
--- net.c	(revision 5608)
+++ net.c	(working copy)
@@ -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>
Index: qemu-char.c
===================================================================
--- qemu-char.c	(revision 5608)
+++ qemu-char.c	(working copy)
@@ -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>

--Boundary-00=_RzHEJ5Gk9H+no95--