Merge commit 'ed7193ec1dfe201549388789f5bbfe8598fcaf31' into upstream-merge

* commit 'ed7193ec1dfe201549388789f5bbfe8598fcaf31':
  Unbreak Linux build
  Update gpxe roms to have BANNER_TIMEOUT=0
  Unbreak tap compilation on OS X
  Revert "Fall back to network boot as the last possible boot option"
  Fall back to network boot as the last possible boot option

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

10 files changed, 10 insertions, 3 deletions

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 3ad14bb2c..ac84383f0 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -23,7 +23,8 @@
  */
 
 #include "net/tap.h"
-#incude "qemu-common.h"
+#include "qemu-common.h"
+#include "sysemu.h"
 
 #ifdef __NetBSD__
 #include <net/if_tap.h>
@@ -34,8 +35,9 @@
 #else
 #include <util.h>
 #endif
-#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
+#if defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
+#endif
 
 #if defined(__OpenBSD__)
 #include <util.h>
diff --git a/net/tap-linux.h b/net/tap-linux.h
index d81c65081..9f943589b 100644
--- a/net/tap-linux.h
+++ b/net/tap-linux.h
@@ -17,6 +17,8 @@
 #define QEMU_TAP_H
 
 #include <stdint.h>
+#ifdef __linux__
+
 #include <linux/ioctl.h>
 
 /* Ioctl defines */
@@ -26,6 +28,8 @@
 #define TUNGETIFF      _IOR('T', 210, unsigned int)
 #define TUNSETSNDBUF   _IOW('T', 212, int)
 
+#endif
+
 /* TUNSETIFF ifr flags */
 #define IFF_TAP		0x0002
 #define IFF_NO_PI	0x1000
diff --git a/net/tap.c b/net/tap.c
index 60354e47a..bdb4a15c2 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -31,6 +31,7 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include "net.h"
diff --git a/pc-bios/README b/pc-bios/README
index 4ba421ef0..9eaa52262 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -16,7 +16,7 @@
   The included images for Sparc32, Sparc64 and PowerPC (for 32 and 64 bit
   PPC CPUs) are built from OpenBIOS SVN revision 569.
 
-- The PXE roms come from Rom-o-Matic gPXE 0.9.9
+- The PXE roms come from Rom-o-Matic gPXE 0.9.9 with BANNER_TIMEOUT=0
 
   e1000 8086:100E
   pcnet32 1022:2000
diff --git a/pc-bios/pxe-e1000.bin b/pc-bios/pxe-e1000.bin
index ad7b2fd26..7ac744eb3 100644
--- a/pc-bios/pxe-e1000.bin
+++ b/pc-bios/pxe-e1000.bin
diff --git a/pc-bios/pxe-eepro100.bin b/pc-bios/pxe-eepro100.bin
index 3bd1b9e14..2ca59ec36 100644
--- a/pc-bios/pxe-eepro100.bin
+++ b/pc-bios/pxe-eepro100.bin
diff --git a/pc-bios/pxe-ne2k_pci.bin b/pc-bios/pxe-ne2k_pci.bin
index 1c01d46fb..5cb68ab2d 100644
--- a/pc-bios/pxe-ne2k_pci.bin
+++ b/pc-bios/pxe-ne2k_pci.bin
diff --git a/pc-bios/pxe-pcnet.bin b/pc-bios/pxe-pcnet.bin
index 03484b225..7a54baba1 100644
--- a/pc-bios/pxe-pcnet.bin
+++ b/pc-bios/pxe-pcnet.bin
diff --git a/pc-bios/pxe-rtl8139.bin b/pc-bios/pxe-rtl8139.bin
index 8110db276..db7d76d9c 100644
--- a/pc-bios/pxe-rtl8139.bin
+++ b/pc-bios/pxe-rtl8139.bin
diff --git a/pc-bios/pxe-virtio.bin b/pc-bios/pxe-virtio.bin
index 182fa4a1b..6dde514c7 100644
--- a/pc-bios/pxe-virtio.bin
+++ b/pc-bios/pxe-virtio.bin