Update to 2.3.0

Changelog:
 * Support for 32-bit KVM guests on 64-bit ARM hosts
 * Support for running KVM under valgrind
 * New IvyBridge CPU model for x86 guests
 * Xen: support for ioreq-server API
 * New 5KEc and 5KEf MIPS64r2, and M14K and M14Kc MIPS32r2
   microMIPS CPU models for MIPS guests
 * Basic support for transactional memory extentions in PowerPC guests
 * Improved VGA support for little-endian PPC/pSeries guests
 * PCI bus support for s390x guests
 * Support for automatic guest device unplug when passthrough devices
   are unbound from VFIO host driver
 * Improved UI performance/support for GTK+/VNC/SDL/Spice, and VNC
   support for multiseat
 * Performance improvements for virtio-blk emulation: asynchronous SCSI
   request handling, and disk read merging.
 * QEMU Guest Agent: now also supports file operations in Windows guests,
   can be used to enable/disable memory blocks in linux guests in
   support for memory hotplug.
 * Migration can now include a JSON description of migration stream to aid
   in identifying incompatibilities betweens guests/hosts.
 * And lots more...

4 files changed, 11 insertions, 72 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 54381158fc2..21e0d28e6b4 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.136 2015/04/25 14:20:46 tnn Exp $
+# $NetBSD: Makefile,v 1.137 2015/04/29 20:30:53 ryoon Exp $
 
-DISTNAME=	qemu-2.2.1
-PKGREVISION=	1
+DISTNAME=	qemu-2.3.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index c2d58639a45..20f0b5bd64a 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.102 2015/03/13 09:09:12 ryoon Exp $
+$NetBSD: distinfo,v 1.103 2015/04/29 20:30:53 ryoon Exp $
 
-SHA1 (qemu-2.2.1.tar.bz2) = 4d1cefc9861fb90979497e8c0bffd223103aa240
-RMD160 (qemu-2.2.1.tar.bz2) = 53430a4cc637f6579cce2e29cb72f3af292c793b
-Size (qemu-2.2.1.tar.bz2) = 24483500 bytes
+SHA1 (qemu-2.3.0.tar.bz2) = 373d74bfafce1ca45f85195190d0a5e22b29299e
+RMD160 (qemu-2.3.0.tar.bz2) = cb203bf3faa316c9eb4ceeb975441deab6f9b2f7
+Size (qemu-2.3.0.tar.bz2) = 24683085 bytes
 SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856
 SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
 SHA1 (patch-et) = 036e1a254ce40df635dfb6107d2707879467e127
@@ -13,5 +13,4 @@ SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
 SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
 SHA1 (patch-memory.c) = 14df9c835ca318fc79a8d3a46bb94d2f229277cc
 SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
-SHA1 (patch-tests_Makefile) = 81fe639ce1b04302f53024343fdf1f6fd5d5fedb
-SHA1 (patch-user-exec.c) = 9090d368b31c70a81af4e8b08d0267c597ff248e
+SHA1 (patch-tests_Makefile) = 44ec206f8061274d0c0a7ca0d4a3e2dbe936fafa
diff --git a/emulators/qemu/patches/patch-tests_Makefile b/emulators/qemu/patches/patch-tests_Makefile
index 42be1c1c531..a5d2d9ee027 100644
--- a/emulators/qemu/patches/patch-tests_Makefile
+++ b/emulators/qemu/patches/patch-tests_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-tests_Makefile,v 1.1 2015/01/07 21:39:24 wiedi Exp $
+$NetBSD: patch-tests_Makefile,v 1.2 2015/04/29 20:30:53 ryoon Exp $
 Don't link -lutil on SunOS
 
---- tests/Makefile.orig	2014-12-09 14:45:44.000000000 +0000
+--- tests/Makefile.orig	2015-04-27 14:08:27.000000000 +0000
 +++ tests/Makefile
-@@ -353,8 +353,10 @@ tests/qemu-iotests/socket_scm_helper$(EX
- tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a libqemustub.a
+@@ -371,8 +371,10 @@ tests/test-qemu-opts$(EXESUF): tests/tes
+ tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(block-obj-y) libqemuutil.a libqemustub.a
  
  ifeq ($(CONFIG_POSIX),y)
 +ifneq ($(CONFIG_SOLARIS),y)
diff --git a/emulators/qemu/patches/patch-user-exec.c b/emulators/qemu/patches/patch-user-exec.c
deleted file mode 100644
index b527eb26b40..00000000000
--- a/emulators/qemu/patches/patch-user-exec.c
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-user-exec.c,v 1.5 2015/03/06 13:22:03 tnn Exp $
-
-From 3f9744aaaeeaea9c55c814b9e7be0f8cce1fb7f9 Mon Sep 17 00:00:00 2001
-From: Tobias Nygren <tnn@NetBSD.org>
-To: qemu-devel@nongnu.org
-Cc: Tobias Nygren <tnn@NetBSD.org>
-Date: Thu, 5 Mar 2015 22:15:08 +0100
-Subject: [PATCH] user-exec.c: fix build on NetBSD/sparc64 and NetBSD/arm
-
-A couple of #ifdef changes necessary to use NetBSD's ucontext
-structs on sparc64 and arm.
-
-Signed-off-by: Tobias Nygren <tnn@NetBSD.org>
----
- user-exec.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/user-exec.c b/user-exec.c
-index 1ff8673..8f57e8a 100644
---- user-exec.c
-+++ user-exec.c
-@@ -404,6 +404,10 @@ int cpu_signal_handler(int host_signum, void *pinfo,
-     struct sigcontext *uc = puc;
-     unsigned long pc = uc->sc_pc;
-     void *sigmask = (void *)(long)uc->sc_mask;
-+#elif defined(__NetBSD__)
-+    ucontext_t *uc = puc;
-+    unsigned long pc = _UC_MACHINE_PC(uc);
-+    void *sigmask = (void *)&uc->uc_sigmask;
- #endif
- #endif
- 
-@@ -441,15 +445,25 @@ int cpu_signal_handler(int host_signum, void *pinfo,
- 
- #elif defined(__arm__)
- 
-+#if defined(__NetBSD__)
-+#include <ucontext.h>
-+#endif
-+
- int cpu_signal_handler(int host_signum, void *pinfo,
-                        void *puc)
- {
-     siginfo_t *info = pinfo;
-+#if defined(__NetBSD__)
-+    ucontext_t *uc = puc;
-+#else
-     struct ucontext *uc = puc;
-+#endif
-     unsigned long pc;
-     int is_write;
- 
--#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#if defined(__NetBSD__)
-+    pc = uc->uc_mcontext.__gregs[_REG_R15];
-+#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-     pc = uc->uc_mcontext.gregs[R15];
- #else
-     pc = uc->uc_mcontext.arm_pc;