Update to qemu-0.12.3.

Changes: assorted bugfixes

10 files changed, 45 insertions, 150 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 125608e4ab0..9f3a6b06cb0 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2010/01/24 17:11:17 heinz Exp $
+# $NetBSD: Makefile,v 1.64 2010/02/27 23:21:13 tnn Exp $
 #
 
-DISTNAME=		qemu-0.11.1
-PKGREVISION=		1
+DISTNAME=		qemu-0.12.3
 CATEGORIES=		emulators
 MASTER_SITES=		http://download.savannah.gnu.org/releases/qemu/
 
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index e0ec9cb7dd4..e28933b54b3 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.20 2009/10/11 16:04:13 asau Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/02/27 23:21:13 tnn Exp $
 bin/qemu
 bin/qemu-i386
 bin/qemu-img
+bin/qemu-io
 bin/qemu-sparc
 bin/qemu-sparc64
 bin/qemu-system-arm
@@ -64,6 +65,7 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/linuxboot.bin
 share/qemu/multiboot.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
@@ -71,9 +73,11 @@ share/qemu/openbios-sparc64
 share/qemu/petalogix-s3adsp1800.dtb
 share/qemu/ppc_rom.bin
 share/qemu/pxe-e1000.bin
+share/qemu/pxe-i82559er.bin
 share/qemu/pxe-ne2k_pci.bin
 share/qemu/pxe-pcnet.bin
 share/qemu/pxe-rtl8139.bin
+share/qemu/pxe-virtio.bin
 share/qemu/vgabios-cirrus.bin
 share/qemu/vgabios.bin
 share/qemu/video.x
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 30e5d4fd1b1..6054141fcd7 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.52 2010/01/14 22:32:33 bouyer Exp $
+$NetBSD: distinfo,v 1.53 2010/02/27 23:21:13 tnn Exp $
 
-SHA1 (qemu-0.11.1.tar.gz) = 7b983cd18f44c6e7627532b662f010389d3bcdff
-RMD160 (qemu-0.11.1.tar.gz) = 4da00fa6c01d7ff6af0ee781bc9260da577ea7d3
-Size (qemu-0.11.1.tar.gz) = 3830070 bytes
-SHA1 (patch-aa) = 444b7df67f680b204c50da59fc92752d8894bda7
-SHA1 (patch-ab) = c70c8f3ef6183c54f6999c422491ee35d83f965f
+SHA1 (qemu-0.12.3.tar.gz) = 03ec307be094bb216bb5be17297e9f33e1a01b56
+RMD160 (qemu-0.12.3.tar.gz) = 10dd16ee970a19a6706491fa4425ddbea1da2ba3
+Size (qemu-0.12.3.tar.gz) = 4693581 bytes
+SHA1 (patch-aa) = 7180def64ebff88074666adef21ee1b5022b6881
 SHA1 (patch-ao) = e515093b6ea99f9cba665de022fd62f3be911569
-SHA1 (patch-au) = 2892cae63796c76014288f4a700acbee5aadc529
 SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
 SHA1 (patch-dd) = 32661203ba023bea67cd7cde1f4088f4d0e5c582
-SHA1 (patch-de) = ad6e0fd59f7edc4a2feecac53164ea8b00e309a1
-SHA1 (patch-dg) = caf1a9ff3e12af362245084f62f495290e498d5c
-SHA1 (patch-dk) = 089f83d1c870c639f7fd32f1288f970236386949
-SHA1 (patch-dl) = dc19993ead06f6de27d6ea0e1268661d007d4b13
+SHA1 (patch-de) = 225eaa996fccc02b17be0099d943c75302600ada
+SHA1 (patch-dk) = 5538bebc08b0047e501469f9cb306cb798d0eb00
diff --git a/emulators/qemu/patches/patch-aa b/emulators/qemu/patches/patch-aa
index 628555bc7b7..fa1a91eceb4 100644
--- a/emulators/qemu/patches/patch-aa
+++ b/emulators/qemu/patches/patch-aa
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2010/01/14 22:32:33 bouyer Exp $
+$NetBSD: patch-aa,v 1.6 2010/02/27 23:21:13 tnn Exp $
 
---- net.c.orig	2010-01-14 11:28:56.000000000 +0100
-+++ net.c	2010-01-14 11:33:46.000000000 +0100
-@@ -43,6 +43,7 @@
- #include <netinet/in.h>
- #include <net/if.h>
+--- net/tap-bsd.c.orig	2010-02-23 20:54:38.000000000 +0000
++++ net/tap-bsd.c
+@@ -27,6 +27,8 @@
+ #include "sysemu.h"
+ 
  #ifdef __NetBSD__
++#include <sys/ioctl.h>
 +#include <net/if.h>
  #include <net/if_tap.h>
  #endif
- #ifdef __linux__
-@@ -1462,16 +1463,31 @@
+ 
+@@ -45,6 +47,9 @@ int tap_open(char *ifname, int ifname_si
      int fd;
      char *dev;
      struct stat s;
@@ -18,12 +19,17 @@ $NetBSD: patch-aa,v 1.5 2010/01/14 22:32:33 bouyer Exp $
 +    struct ifreq ifr;
 +#endif
  
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+     /* if no ifname is given, always start the search from tap0. */
+@@ -75,14 +80,26 @@ int tap_open(char *ifname, int ifname_si
+ #else
      TFR(fd = open("/dev/tap", O_RDWR));
      if (fd < 0) {
 -        fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
 +        fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation: %s\n", strerror(errno));
          return -1;
      }
+ #endif
  
 -    fstat(fd, &s);
 +#ifdef TAPGIFNAME
@@ -42,5 +48,5 @@ $NetBSD: patch-aa,v 1.5 2010/01/14 22:32:33 bouyer Exp $
      pstrcpy(ifname, ifname_size, dev);
 +#endif
  
-     fcntl(fd, F_SETFL, O_NONBLOCK);
-     return fd;
+     if (*vnet_hdr) {
+         /* BSD doesn't have IFF_VNET_HDR */
diff --git a/emulators/qemu/patches/patch-ab b/emulators/qemu/patches/patch-ab
deleted file mode 100644
index 905639f85a2..00000000000
--- a/emulators/qemu/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2010/01/14 22:32:33 bouyer Exp $
-
---- hw/esp.c.orig	2010-01-14 12:51:33.000000000 +0100
-+++ hw/esp.c	2010-01-14 12:58:00.000000000 +0100
-@@ -116,6 +116,7 @@
- #define CMD_ICCS     0x11
- #define CMD_MSGACC   0x12
- #define CMD_SATN     0x1a
-+#define CMD_SELNATN  0x41
- #define CMD_SELATN   0x42
- #define CMD_SELATNS  0x43
- #define CMD_ENSEL    0x44
-@@ -533,6 +534,10 @@
-         case CMD_SATN:
-             DPRINTF("Set ATN (%2.2x)\n", val);
-             break;
-+        case CMD_SELNATN:
-+            DPRINTF("Select (%2.2x)\n", val);
-+            handle_satn(s); /* XXX is it OK ? */
-+            break;
-         case CMD_SELATN:
-             DPRINTF("Set ATN (%2.2x)\n", val);
-             handle_satn(s);
diff --git a/emulators/qemu/patches/patch-au b/emulators/qemu/patches/patch-au
deleted file mode 100644
index d822d2c69d4..00000000000
--- a/emulators/qemu/patches/patch-au
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-au,v 1.5 2009/01/22 07:27:28 jmmv Exp $
-
---- fpu/softfloat-native.h.orig	2008-01-06 20:38:42.000000000 +0100
-+++ fpu/softfloat-native.h
-@@ -33,6 +33,24 @@
- #define isunordered(x,y)        unordered(x, y)
- #endif
- 
-+#ifdef __NetBSD__
-+#ifndef isgreater
-+#define isgreater(x, y)                __builtin_isgreater(x, y)
-+#endif
-+#ifndef isgreaterequal
-+#define isgreaterequal(x, y)   __builtin_isgreaterequal(x, y)
-+#endif
-+#ifndef isless
-+#define isless(x, y)           __builtin_isless(x, y)
-+#endif
-+#ifndef islessequal
-+#define islessequal(x, y)      __builtin_islessequal(x, y)
-+#endif
-+#ifndef isunordered
-+#define isunordered(x, y)      __builtin_isunordered(x, y)
-+#endif
-+#endif
-+
- #if defined(__sun__) && !defined(NEED_LIBSUNMATH)
- 
- #ifndef isnan
diff --git a/emulators/qemu/patches/patch-de b/emulators/qemu/patches/patch-de
index c8324738f16..90b8496dddd 100644
--- a/emulators/qemu/patches/patch-de
+++ b/emulators/qemu/patches/patch-de
@@ -1,13 +1,13 @@
-$NetBSD: patch-de,v 1.3 2009/10/11 16:04:13 asau Exp $
+$NetBSD: patch-de,v 1.4 2010/02/27 23:21:13 tnn Exp $
 
---- exec.c.orig	2009-09-23 23:01:32.000000000 +0400
-+++ exec.c	2009-09-30 14:03:55.000000000 +0400
-@@ -464,7 +464,7 @@
+--- exec.c.orig	2010-02-23 20:54:38.000000000 +0000
++++ exec.c
+@@ -463,7 +463,7 @@ static void code_gen_alloc(unsigned long
              exit(1);
          }
      }
--#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__)
      {
          int flags;
          void *addr = NULL;
diff --git a/emulators/qemu/patches/patch-dg b/emulators/qemu/patches/patch-dg
deleted file mode 100644
index d94e14678fa..00000000000
--- a/emulators/qemu/patches/patch-dg
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-dg,v 1.3 2009/10/11 16:04:13 asau Exp $
-
---- osdep.c.orig	2009-09-23 23:01:32.000000000 +0400
-+++ osdep.c	2009-09-30 14:05:39.000000000 +0400
-@@ -110,7 +110,7 @@
-     void *ptr;
- 
- /* no need (?) for a dummy file on OpenBSD/FreeBSD */
--#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
-     int map_anon = MAP_ANON;
- #else
-     int map_anon = 0;
-@@ -181,7 +181,7 @@
-     }
-     size = (size + 4095) & ~4095;
-     ftruncate(phys_ram_fd, phys_ram_size + size);
--#endif /* !(__OpenBSD__ || __FreeBSD__ || __DragonFly__) */
-+#endif /* !(__OpenBSD__ || __FreeBSD__ || __DragonFly__ || __NetBSD__) */
-     ptr = mmap(NULL,
-                size,
-                PROT_WRITE | PROT_READ, map_anon | MAP_SHARED,
diff --git a/emulators/qemu/patches/patch-dk b/emulators/qemu/patches/patch-dk
index 0467337fc47..e472d591fa7 100644
--- a/emulators/qemu/patches/patch-dk
+++ b/emulators/qemu/patches/patch-dk
@@ -1,22 +1,22 @@
-$NetBSD: patch-dk,v 1.4 2009/10/11 16:04:13 asau Exp $
+$NetBSD: patch-dk,v 1.5 2010/02/27 23:21:13 tnn Exp $
 
---- vl.c.orig	2009-09-23 23:01:32.000000000 +0400
-+++ vl.c	2009-09-30 14:10:21.000000000 +0400
-@@ -567,7 +567,7 @@
+--- vl.c.orig	2010-02-23 20:54:38.000000000 +0000
++++ vl.c
+@@ -652,7 +652,7 @@ static void init_get_clock(void)
  {
      use_rt_clock = 0;
  #if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) \
--    || defined(__DragonFly__)
-+    || defined(__DragonFly__) || defined(__NetBSD__)
+-    || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++    || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
      {
          struct timespec ts;
          if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
-@@ -580,7 +580,7 @@
+@@ -665,7 +665,7 @@ static void init_get_clock(void)
  static int64_t get_clock(void)
  {
  #if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) \
--	|| defined(__DragonFly__)
-+	|| defined(__DragonFly__) || defined(__NetBSD__)
+-	|| defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++	|| defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
      if (use_rt_clock) {
          struct timespec ts;
          clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/emulators/qemu/patches/patch-dl b/emulators/qemu/patches/patch-dl
deleted file mode 100644
index ded28bebbda..00000000000
--- a/emulators/qemu/patches/patch-dl
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-dl,v 1.3 2009/10/11 16:04:13 asau Exp $
-
---- cpu-exec.c.orig	2009-09-23 23:01:32.000000000 +0400
-+++ cpu-exec.c	2009-09-30 14:18:16.000000000 +0400
-@@ -1247,6 +1247,20 @@
- # define TRAP_sig(context)    ((context)->uc_mcontext->es.trapno)
- # define ERROR_sig(context)   ((context)->uc_mcontext->es.err)
- # define MASK_sig(context)    ((context)->uc_sigmask)
-+#elif defined (__NetBSD__)
-+# include <ucontext.h>
-+
-+# define EIP_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EIP])
-+# define TRAP_sig(context)    ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
-+# define ERROR_sig(context)   ((context)->uc_mcontext.__gregs[_REG_ERR])
-+# define MASK_sig(context)    ((context)->uc_sigmask)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
-+# include <ucontext.h>
-+
-+# define EIP_sig(context)  (*((unsigned long*)&(context)->uc_mcontext.mc_eip))
-+# define TRAP_sig(context)    ((context)->uc_mcontext.mc_trapno)
-+# define ERROR_sig(context)   ((context)->uc_mcontext.mc_err)
-+# define MASK_sig(context)    ((context)->uc_sigmask)
- #elif defined(__OpenBSD__)
- # define EIP_sig(context)     ((context)->sc_eip)
- # define TRAP_sig(context)    ((context)->sc_trapno)
-@@ -1263,7 +1277,9 @@
-                        void *puc)
- {
-     siginfo_t *info = pinfo;
--#if defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined (__FreeBSD__) || defined(__DragonFly__)
-+    ucontext_t *uc = puc;
-+#elif defined(__OpenBSD__)
-     struct sigcontext *uc = puc;
- #else
-     struct ucontext *uc = puc;