Update qemu to 1.4.2.

pkgsrc changes:
 - update PLIST for new files
 - update patches (adjust lines, update comments)
 - remove unnecessary files from subst list

XXX1: tested only on NetBSD/i386 6.1 and NetBSD/amd64 6.1
XXX2: needs to investicate hangup in pthread_cond_timedwait(3) on NetBSD
      under load of multiple disk xfers (1.3.1 had the similar problem)

Upstream changes:

Changes mentioned in 1.4.2 announcment:
 http://lists.nongnu.org/archive/html/qemu-stable/2013-05/msg00095.html

89400a8: update VERSION for 1.4.2 (Michael Roth)
e85b521: ppc: do not register IABR SPR twice for 603e (Herve Poussineau)
f890185: hw/9pfs: use O_NOFOLLOW for mapped readlink operation (Aneesh Kumar
         K.V)
745f6c0: hw/9pfs: Fix segfault with 9p2000.u (Aneesh Kumar K.V)
0182df5: rbd: add an asynchronous flush (Josh Durgin)
7f28f0f: qemu-iotests: add tests for rebasing zero clusters (Paolo Bonzini)
45bbe1f: virtio-balloon: fix integer overflow in BALLOON_CHANGE QMP event (Luiz
         Capitulino)
06efdc4: qemu-timer: move timeBeginPeriod/timeEndPeriod to os-win32 (Paolo
         Bonzini)
0c70b5a: configure: Don't fall back to gthread coroutine backend (Brad Smith)
b90fd15: usb-redir: Fix crash on migration with no client connected (Hans de
         Goede)
7322cb1: docs: Fix generating qemu-doc.html with texinfo 5 (Cole Robinson)
1d7723f: qga: unlink just created guest-file if fchmod() or fdopen() fails on
         it (Laszlo Ersek)
67b460a: qga: distinguish binary modes in "guest_file_open_modes" map (Laszlo
         Ersek)
84247bb: translate-all.c: Remove cpu_unlink_tb() (Peter Maydell)
2ebcc59: Handle CPU interrupts by inline checking of a flag (Peter Maydell)
69001b3: cpu-exec: wrap tcg_qemu_tb_exec() in a fn to restore the PC (Peter
         Maydell)
3accab7: tcg: Document tcg_qemu_tb_exec() and provide constants for low bit
         uses (Peter Maydell)
6025953: qga: set umask 0077 when daemonizing (CVE-2013-2007) (Laszlo Ersek)
93399d0: tcg/optimize: fix setcond2 optimization (Aurelien Jarno)
074dd56: target-mips: Fix accumulator arguments to gen_helper_dmult(u) (Richard
         Sandiford)
d10d251: configure: Pick up libseccomp include path (Andreas Faber)
5613bda: virtio-ccw: Check indicators location. (Cornelia Huck)
c5675a9: tap: properly initialize vhostfds (Jason Wang)
e355efd: rng random backend: check for -EAGAIN errors on read (Amit Shah)
4d7f455: qdev: Fix QOM unrealize behavior (Andreas Farber)
0486c27: nbd: unlock mutex in nbd_co_send_request() error path (Stefan Hajnoczi)

Changes mentioned in 1.4.1 announcment:
 http://lists.nongnu.org/archive/html/qemu-stable/2013-04/msg00071.html

57105f7: update VERSION for 1.4.1 (Michael Roth)
6e88653: Add -f FMT / --format FMT arg to qemu-nbd (Daniel P. Berrange)
6d0b135: target-mips: Fix accumulator selection for MIPS16 and microMIPS
         (Richard Sandiford)
d89f9ba: Allow clock_gettime() monotonic clock to be utilized on more OS's
         (Brad Smith)
46f9071: target-i386: Check for host features before filter_features_for_kvm()
         (Eduardo Habkost)
f85e082: help: add docs for missing 'queues' option of tap (Jason Wang)
da78a1b: compiler: fix warning with GCC 4.8.0 (Paolo Bonzini)
2b92aa3: block: complete all IOs before resizing a device (Peter Lieven)
e4cce2d: Revert "block: complete all IOs before .bdrv_truncate" (Peter Lieven)
d15b1aa: qxl: better vga init in enter_vga_mode (Gerd Hoffmann)
65fe29e: doc: Fix texinfo @table markup in qemu-options.hx (Markus Armbruster)
888e036: acpi: initialize s4_val used in s4 shutdown (Bruce Rogers)
d019dd9: target-mips: fix rndrashift_short_acc and code for EXTR_ instructions
         (Petar Jovanovic)
dac077f: target-mips: fix DSP overflow macro and affected routines (Petar
         Jovanovic)
b09a673: target-mips: fix for sign-issue in MULQ_W helper (Petar Jovanovic)
79a4dd4: target-mips: fix for incorrect multiplication with MULQ_S.PH (Petar
         Jovanovic)
57e929c: usb-tablet: Don't claim wakeup capability for USB-2 version (Hans de
         Goede)
27c7135: chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors (Stefan
         Hajnoczi)
283b7de: qemu-socket: set passed fd non-blocking in socket_connect() (Stefan
         Hajnoczi)
a1cb89f: net: ensure "socket" backend uses non-blocking fds (Stefan Hajnoczi)
68f9df5: oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()
         (Stefan Hajnoczi)
0135796: update seabios to 1.7.2.1 (Gerd Hoffmann)
799a34a: linux-user/syscall.c: Don't warn about unimplemented get_robust_list
         (Peter Maydell)
8378910: linux-user: make bogus negative iovec lengths fail EINVAL (Peter
         Maydell)
7a238b9: linux-user: fix futex strace of FUTEX_CLOCK_REALTIME (John Rigby)
02493ee: linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex (John Rigby)
7d47b24: qcow2: flush refcount cache correctly in qcow2_write_snapshots()
         (Stefan Hajnoczi)
02ea844: qcow2: flush refcount cache correctly in alloc_refcount_block()
         (Stefan Hajnoczi)
0fcf00b: page_cache: fix memory leak (Peter Lieven)
5610ef5: Fix page_cache leak in cache_resize (Orit Wasserman)
7a687ae: virtio-blk: fix unplug + virsh reboot (Christian Borntraeger)
b91aee5: ide/macio: Fix macio DMA initialisation. (Mark Cave-Ayland)
e09b99b: target-ppc: Fix CPU_POWERPC_MPC8547E (Andreas Farber)
611c7f2: pseries: Add cleanup hook for PAPR virtual LAN device (David Gibson)
4e4566c: configure: Require at least spice-protocol-0.12.3 (Michal Privoznik)
43e0061: qemu-bridge-helper: force usage of a very high MAC address for the
         bridge (Paolo Bonzini)
3c3de7c: virtio-ccw: Queue sanity check for notify hypercall. (Cornelia Huck)
b0da310: tcg: Fix occasional TCG broken problem when ldst optimization enabled
         (Yeongkyoon Lee)
d26efd2: qga/main.c: Don't use g_key_file_get/set_int64 (Peter Crosthwaite)
f305d50: qemu-ga: use key-value store to avoid recycling fd handles after
         restart (Michael Roth)
d3652a1: qcow2: make is_allocated return true for zero clusters (Paolo Bonzini)
5194350: pseries: Add compatible property to root of device tree (David Gibson)
4d1cdb9: Allow virtio-net features for legacy s390 virtio bus (Christian
         Borntraeger)
c3b81e0: rtc-test: Fix test failures with recent glib (Cole Robinson)
99b1f39: scsi-disk: do not complete canceled UNMAP requests (Paolo Bonzini)
f23ab03: scsi: do not call scsi_read_data/scsi_write_data for a canceled
         request (Paolo Bonzini)
0c918dd: iscsi: look for pkg-config file too (Paolo Bonzini)
a8b090e: scsi-disk: handle io_canceled uniformly and correctly (Paolo Bonzini)
4a38944: qemu-ga: make guest-sync-delimited available during fsfreeze (Michael
         Roth)
b7ff1a7: qmp: netdev_add is like -netdev, not -net, fix documentation (Markus
         Armbruster)
d49fed4: vga: fix byteswapping. (Gerd Hoffmann)
cebb8eb: help: add docs for multiqueue tap options (Jason Wang)
3b39a11: net: reduce the unnecessary memory allocation of multiqueue (Jason
         Wang)
ec9f828: qemu-char.c: fix waiting for telnet connection message (Igor Mitsyanko)
332e934: tap: forbid creating multiqueue tap when hub is used (Jason Wang)
e6b795f: block: complete all IOs before .bdrv_truncate (Peter Lieven)
51968b8: coroutine: trim down nesting level in perf_nesting test (Paolo Bonzini)
80d8b5d: target-ppc: Fix "G2leGP3" PVR (Andreas Farber)

ChangeLog 1.4
 http://wiki.qemu.org/ChangeLog/1.4

System emulation
----------------

 Device emulation

  Device issignment

   - Improved support for MSI-X on some Mellanox devices.
   - VFIO supports PCIe extended configuration space.

  USB
   - Various CPU usage and throughput improvements for USB 2.0.
   - usb-tablet can be connected as an USB 2.0 device, also lowering
     the CPU usage substantially.
   - Improved support for pass-through of USB serial devices.
   - A new device usb-bot is the same as usb-storage, but is configured
     like other SCSI adapters and supports multiple LUNs.

  Network
   - virtio-net supports multiqueue operation.

  Other
   - Added support for IndustryPack emulation. The TEWS TPCI200 device
     emulation (device "tpci200") hosts IndustryPack modules, and the
     GE IP-Octal 232 emulation (device "ipoctal232") implements eight
     RS-232 serial ports.

 ARM

  - Various minor bugfixes; no new features in this release.

 MIPS

  - Improved support for DSP instructions.

 PowerPC

  - pSeries: NVRAM support for improved guest installation experience
  - G3/G4: Allow dcbzl (for Mac OS X guests)
  - e500: Linux guests don't use use SWTLB anymore, freeing memory for
          real applications
  - e500: MSI support
  - e500: Allow for up to 31 PCI devices with -M ppce500
  - e500: Support idle hcall when running KVM on e500mc or above
  - e500: Emulate the EPR facility (e500mc and above)
  - PReP: Emulate a full PC87312 Super I/O chipset. This adds a parallel
          port. Changing the chipset configuration register at runtime is
          not yet supported.

 S390

  - New virtio-ccw machine and transport support
  - Add -cpu ? support
  - Improved support for S390 emulation.

 x86

  - Generation of APIC IDs for NUMA configuration is now compatible with
    the Intel(R) 64 Architecture Processor Topology Enumeration
  - Many fixes to the Q35 chipset emulation, including experimental AHCI
    migration support and support for device assignment.
  - Resetting the machine with a write to port 0xCF9 now works.
  - The xlevel argument for -cpu option currently silently fix-ups the
    user-provided value if it's less than 0x80000000. This will be
    removed in future QEMU versions; users are expected to provide valid
    xlevel value or QEMU will fail to start.

 KVM

  - New devices isa-debug-exit and pc-testdev can be used to run
    kvm-unit-tests.

 Xen

  - Persistent grants support implemented in xen_disk, giving substantial
    performance improvements.
  - xen_disk supports BLKIF_OP_FLUSH_DISKCACHE, making the device safer
    against power losses.
  - xen_console supports multiple secondary PV consoles.

 QMP

  - New commands chardev-add and chardev-del add support for hotplugging
    character devices.
  - New ringbuf-read/ringbuf-write to read and write to memory chardevs
  - Various improvements in error messages

 Block devices

  - Discard operations are now supported on block devices and on
    filesystems other than XFS. They are also fully asynchronous now.
  - Block device mirroring (also known as storage migration) performance
    was greatly improved.
  - New experimental threaded backend for virtio-block-pci. This new
    backend achieves several times the IOPS of the existing virtio-blk
    implementation; for now it can only be used for raw image files and
    disables features such as live snapshots and storage migration.

 Live Migration

  - Moved migration from a timer to a thread, improving latency in
    other parts of QEMU and throughput of migration itself
  - Many machine models are now correctly marked as not migratable.

 Spice

  - A new spiceport character device can be used to support arbitrary
    communication between the SPICE server on the host and the client.

 VNC

  - Added support for the Websocket protocol.

User-mode emulation
-------------------

 - Fix ppc guest signal handling
 - Fix MIPS target

Guest agent
-----------

 - qemu-ga supports hooks that are executed when the guest receives
   the guest-fsfreeze-freeze and guest-fsfreeze-thaw commands

Host support
------------

 - Native asynchronous I/O for Win32 (introduced in 1.3) now actually works.

17 files changed, 99 insertions, 153 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 6a281d3a5a0..4425669b164 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2013/05/31 12:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2013/06/16 18:27:25 tsutsui Exp $
 
-DISTNAME=		qemu-1.3.1
-PKGREVISION=		1
+DISTNAME=		qemu-1.4.2
 CATEGORIES=		emulators
 MASTER_SITES=		http://wiki.qemu.org/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -60,8 +59,6 @@ SUBST_FILES.qaudio=	arch_init.c monitor.c savevm.c vl.c \
 			hw/marvell_88w8618_audio.c \
 			hw/milkymist-ac97.c \
 			hw/mips_fulong2e.c \
-			hw/mips_jazz.c \
-			hw/mips_malta.c \
 			hw/omap2.c \
 			hw/palm.c \
 			hw/pcspk.c \
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 2dda654d905..7d219b6195a 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2013/01/24 17:52:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.34 2013/06/16 18:27:25 tsutsui Exp $
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
 ${PLIST.armeb}bin/qemu-armeb
@@ -58,6 +58,7 @@ share/doc/qemu/qemu-doc.html
 share/doc/qemu/qemu-tech.html
 share/doc/qemu/qmp-commands.txt
 share/examples/qemu/target-x86_64.conf
+share/qemu/acpi-dsdt.aml
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
 share/qemu/keymaps/ar
@@ -112,6 +113,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/q35-acpi-dsdt.aml
 share/qemu/qemu-icon.bmp
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 5858afc23d5..5653abbf9fa 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,18 +1,16 @@
-$NetBSD: distinfo,v 1.81 2013/03/29 15:26:26 tsutsui Exp $
+$NetBSD: distinfo,v 1.82 2013/06/16 18:27:25 tsutsui Exp $
 
-SHA1 (qemu-1.3.1.tar.bz2) = 5a3ef5273b3f39418e90680b144001f97d27c2c2
-RMD160 (qemu-1.3.1.tar.bz2) = 2e2ccdcd5bfa58ce2f3a3efb348f8e9840a26ca3
-Size (qemu-1.3.1.tar.bz2) = 10283677 bytes
-SHA1 (patch-configure) = 34ae5e65bc5beb45637303a02c42e9ede33564b6
-SHA1 (patch-ef) = fd9f0ca22b1f3c3950a0ea69ba32252265d2285a
-SHA1 (patch-eg) = 4be8e74d134e0736fa65977d885a9dd3b12e653b
-SHA1 (patch-eh) = 02ada323ac9ba0acf8e4d0746bc7d58abb24b288
-SHA1 (patch-en) = a2fdf12d46cb25004f5f0f6b3e187c59863e3b20
-SHA1 (patch-et) = 019de3390becbf629f4158f6ea0326ccdb9bc28f
-SHA1 (patch-hw_ppc__newworld.c) = 9f8f337e7619444ceaf80a2bccf5a9545f6bc991
-SHA1 (patch-hw_ppc__oldworld.c) = a77c01a03afb9e5d4aef4d85a7585bb77d8fdd6a
-SHA1 (patch-hw_xilinx__axienet.c) = 9a4c73c8dcf745d31661e0c88d683530d153feaf
-SHA1 (patch-ioport.c) = 3a9fc61cbf72a8cea29d1d168113b48c2f4968a9
-SHA1 (patch-memory.c) = cb67615b7632ec0006507a0270d841955bcb7e8b
-SHA1 (patch-net_tap-bsd.c) = eb5e994a57c6f4291e34af9198ea007dbc21b191
-SHA1 (patch-slirp_tcp__subr.c) = 51ae78f3f04eae9a22568afdbf6e3b2bc3d34187
+SHA1 (qemu-1.4.2.tar.bz2) = 7e01e57e7385dba76125f69829aa78e98acdce4f
+RMD160 (qemu-1.4.2.tar.bz2) = 4b136a6f2192b07aaf04270a60c9326635d8865a
+Size (qemu-1.4.2.tar.bz2) = 10416877 bytes
+SHA1 (patch-ef) = 0b7dc779b174c842c529443e59ffaccbfe8616de
+SHA1 (patch-eg) = ce5adc1c45f6a7d6d6a63ec6c97ba146ff6e9e63
+SHA1 (patch-eh) = 72302ffd1a56dc4fa8d19b3095c9111331a20621
+SHA1 (patch-en) = d4396209ddca3b53f2e4664087550a9660708537
+SHA1 (patch-et) = 8c52e10d92e30226b02f9cb017efa28880124467
+SHA1 (patch-hw_xilinx__axienet.c) = e31f00c01a30d5447c771cceca413f247b67ea14
+SHA1 (patch-ioport.c) = a8f85248039de4d572f3af754d1e29ef9f83d8d7
+SHA1 (patch-memory.c) = ca15c0cfd20b54bee0f8ec769a9047b5cd76e4f3
+SHA1 (patch-net_tap-bsd.c) = 4d21ea8dd639db2a98ef9e341c3b863c9be965e2
+SHA1 (patch-slirp_tcp__subr.c) = c134e0fe0ce6b8fc92a630c98891b4c3e56cc861
+SHA1 (patch-util_hbitmap.c) = 8c3d42d9b594efc1b5eb0ccfb5d110bd63eaa9f0
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
deleted file mode 100644
index 47de785f280..00000000000
--- a/emulators/qemu/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2012/09/11 17:13:45 asau Exp $
-
---- configure.orig	2012-09-05 14:03:06.000000000 +0000
-+++ configure
-@@ -1190,6 +1190,9 @@ else
-     exit 1
- fi
- 
-+# hw/usb/hcd_ehci.c will not compile with -O3 optimization.
-+CFLAGS=`echo "$CFLAGS" | sed -e 's,-O3,,'`
-+
- # Consult white-list to determine whether to enable werror
- # by default.  Only enable by default for git builds
- z_version=`cut -f3 -d. $source_path/VERSION`
diff --git a/emulators/qemu/patches/patch-ef b/emulators/qemu/patches/patch-ef
index b7a3fc0bda5..1e03b95ba0c 100644
--- a/emulators/qemu/patches/patch-ef
+++ b/emulators/qemu/patches/patch-ef
@@ -1,11 +1,11 @@
-$NetBSD: patch-ef,v 1.4 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-ef,v 1.5 2013/06/16 18:27:25 tsutsui Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- audio/audio.c.orig	2012-09-05 14:03:06.000000000 +0000
+--- audio/audio.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ audio/audio.c
-@@ -1171,7 +1171,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, 
+@@ -1172,7 +1172,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, 
          return 0;
      }
  
diff --git a/emulators/qemu/patches/patch-eg b/emulators/qemu/patches/patch-eg
index db93a32257d..902cf53b249 100644
--- a/emulators/qemu/patches/patch-eg
+++ b/emulators/qemu/patches/patch-eg
@@ -1,25 +1,25 @@
-$NetBSD: patch-eg,v 1.5 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-eg,v 1.6 2013/06/16 18:27:25 tsutsui Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/etraxfs_eth.c.orig	2012-09-05 14:03:06.000000000 +0000
+--- hw/etraxfs_eth.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ hw/etraxfs_eth.c
-@@ -184,7 +184,7 @@ static void mdio_read_req(struct qemu_md
+@@ -185,7 +185,7 @@ static void mdio_read_req(struct qemu_md
  
- 	phy = bus->devs[bus->addr];
- 	if (phy && phy->read)
--		bus->data = phy->read(phy, bus->req);
-+		bus->data = (*phy->read)(phy, bus->req);
- 	else 
- 		bus->data = 0xffff;
- }
-@@ -354,7 +354,7 @@ static void eth_validate_duplex(struct f
- 	int new_mm = 0;
+     phy = bus->devs[bus->addr];
+     if (phy && phy->read) {
+-        bus->data = phy->read(phy, bus->req);
++        bus->data = (*phy->read)(phy, bus->req);
+     } else {
+         bus->data = 0xffff;
+     }
+@@ -359,7 +359,7 @@ static void eth_validate_duplex(struct f
+     int new_mm = 0;
  
- 	phy = eth->mdio_bus.devs[eth->phyaddr];
--	phy_duplex = !!(phy->read(phy, 18) & (1 << 11));
-+	phy_duplex = !!((*phy->read)(phy, 18) & (1 << 11));
- 	mac_duplex = !!(eth->regs[RW_REC_CTRL] & 128);
+     phy = eth->mdio_bus.devs[eth->phyaddr];
+-    phy_duplex = !!(phy->read(phy, 18) & (1 << 11));
++    phy_duplex = !!((*phy->read)(phy, 18) & (1 << 11));
+     mac_duplex = !!(eth->regs[RW_REC_CTRL] & 128);
  
- 	if (mac_duplex != phy_duplex)
+     if (mac_duplex != phy_duplex) {
diff --git a/emulators/qemu/patches/patch-eh b/emulators/qemu/patches/patch-eh
index 445fd5070f7..84bd9d246e3 100644
--- a/emulators/qemu/patches/patch-eh
+++ b/emulators/qemu/patches/patch-eh
@@ -1,9 +1,9 @@
-$NetBSD: patch-eh,v 1.5 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-eh,v 1.6 2013/06/16 18:27:25 tsutsui Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/omap_dss.c.orig	2012-09-05 14:03:06.000000000 +0000
+--- hw/omap_dss.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ hw/omap_dss.c
 @@ -791,18 +791,18 @@ static void omap_rfbi_write(void *opaque
          break;
diff --git a/emulators/qemu/patches/patch-en b/emulators/qemu/patches/patch-en
index 7d8d19a5b4b..5ce7e278691 100644
--- a/emulators/qemu/patches/patch-en
+++ b/emulators/qemu/patches/patch-en
@@ -1,8 +1,8 @@
-$NetBSD: patch-en,v 1.5 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-en,v 1.6 2013/06/16 18:27:25 tsutsui Exp $
 
---- tcg/arm/tcg-target.h.orig	2012-09-05 14:03:07.000000000 +0000
+--- tcg/arm/tcg-target.h.orig	2013-05-24 13:37:58.000000000 +0000
 +++ tcg/arm/tcg-target.h
-@@ -85,7 +85,7 @@ static inline void flush_icache_range(tc
+@@ -84,7 +84,7 @@ static inline void flush_icache_range(tc
                                        tcg_target_ulong stop)
  {
  #if QEMU_GNUC_PREREQ(4, 1)
diff --git a/emulators/qemu/patches/patch-et b/emulators/qemu/patches/patch-et
index 5ef1255d059..8c29755acb7 100644
--- a/emulators/qemu/patches/patch-et
+++ b/emulators/qemu/patches/patch-et
@@ -1,8 +1,8 @@
-$NetBSD: patch-et,v 1.6 2013/01/24 17:52:01 ryoon Exp $
+$NetBSD: patch-et,v 1.7 2013/06/16 18:27:25 tsutsui Exp $
 
---- Makefile.orig	2012-12-03 19:37:05.000000000 +0000
+--- Makefile.orig	2013-05-24 13:37:57.000000000 +0000
 +++ Makefile
-@@ -330,8 +330,9 @@ install-datadir:
+@@ -297,8 +297,9 @@ install-datadir:
  install-confdir:
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
  
diff --git a/emulators/qemu/patches/patch-hw_ppc__newworld.c b/emulators/qemu/patches/patch-hw_ppc__newworld.c
deleted file mode 100644
index a3f6aaae2ba..00000000000
--- a/emulators/qemu/patches/patch-hw_ppc__newworld.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-hw_ppc__newworld.c,v 1.4 2013/01/24 17:52:01 ryoon Exp $
-
-Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
-
---- hw/ppc_newworld.c.orig	2012-12-03 19:37:05.000000000 +0000
-+++ hw/ppc_newworld.c
-@@ -115,7 +115,7 @@ static uint64_t translate_kernel_address
-     return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
- }
- 
--static hwaddr round_page(hwaddr addr)
-+static hwaddr round_pageq(hwaddr addr)
- {
-     return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
- }
-@@ -234,7 +234,7 @@ static void ppc_core99_init(QEMUMachineI
-         }
-         /* load initrd */
-         if (initrd_filename) {
--            initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
-+            initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
-             initrd_size = load_image_targphys(initrd_filename, initrd_base,
-                                               ram_size - initrd_base);
-             if (initrd_size < 0) {
-@@ -242,11 +242,11 @@ static void ppc_core99_init(QEMUMachineI
-                          initrd_filename);
-                 exit(1);
-             }
--            cmdline_base = round_page(initrd_base + initrd_size);
-+            cmdline_base = round_pageq(initrd_base + initrd_size);
-         } else {
-             initrd_base = 0;
-             initrd_size = 0;
--            cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
-+            cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
-         }
-         ppc_boot_device = 'm';
-     } else {
diff --git a/emulators/qemu/patches/patch-hw_ppc__oldworld.c b/emulators/qemu/patches/patch-hw_ppc__oldworld.c
deleted file mode 100644
index c598ad1149a..00000000000
--- a/emulators/qemu/patches/patch-hw_ppc__oldworld.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-hw_ppc__oldworld.c,v 1.4 2013/01/24 17:52:01 ryoon Exp $
-
-Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
-
---- hw/ppc_oldworld.c.orig	2012-12-03 19:37:05.000000000 +0000
-+++ hw/ppc_oldworld.c
-@@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
-     return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
- }
- 
--static hwaddr round_page(hwaddr addr)
-+static hwaddr round_pageq(hwaddr addr)
- {
-     return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
- }
-@@ -178,7 +178,7 @@ static void ppc_heathrow_init(QEMUMachin
-         }
-         /* load initrd */
-         if (initrd_filename) {
--            initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
-+            initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
-             initrd_size = load_image_targphys(initrd_filename, initrd_base,
-                                               ram_size - initrd_base);
-             if (initrd_size < 0) {
-@@ -186,11 +186,11 @@ static void ppc_heathrow_init(QEMUMachin
-                          initrd_filename);
-                 exit(1);
-             }
--            cmdline_base = round_page(initrd_base + initrd_size);
-+            cmdline_base = round_pageq(initrd_base + initrd_size);
-         } else {
-             initrd_base = 0;
-             initrd_size = 0;
--            cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
-+            cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
-         }
-         ppc_boot_device = 'm';
-     } else {
diff --git a/emulators/qemu/patches/patch-hw_xilinx__axienet.c b/emulators/qemu/patches/patch-hw_xilinx__axienet.c
index 2e8e3cef7e4..b616a05cbce 100644
--- a/emulators/qemu/patches/patch-hw_xilinx__axienet.c
+++ b/emulators/qemu/patches/patch-hw_xilinx__axienet.c
@@ -1,10 +1,11 @@
-$NetBSD: patch-hw_xilinx__axienet.c,v 1.3 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-hw_xilinx__axienet.c,v 1.4 2013/06/16 18:27:25 tsutsui Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
+(PR lib/43832: ssp causes common names to be defines)
 
---- hw/xilinx_axienet.c.orig	2012-09-05 14:03:06.000000000 +0000
+--- hw/xilinx_axienet.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ hw/xilinx_axienet.c
-@@ -189,7 +189,7 @@ static uint16_t mdio_read_req(struct MDI
+@@ -188,7 +188,7 @@ static uint16_t mdio_read_req(struct MDI
  
      phy = bus->devs[addr];
      if (phy && phy->read) {
diff --git a/emulators/qemu/patches/patch-ioport.c b/emulators/qemu/patches/patch-ioport.c
index 473997921e1..318f70e1a97 100644
--- a/emulators/qemu/patches/patch-ioport.c
+++ b/emulators/qemu/patches/patch-ioport.c
@@ -1,6 +1,9 @@
-$NetBSD: patch-ioport.c,v 1.6 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-ioport.c,v 1.7 2013/06/16 18:27:25 tsutsui Exp $
 
---- ioport.c.orig	2012-09-05 14:03:06.000000000 +0000
+Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
+(PR lib/43832: ssp causes common names to be defines)
+
+--- ioport.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ ioport.c
 @@ -183,7 +183,7 @@ static uint32_t ioport_readb_thunk(void 
      IORange *ioport = opaque;
diff --git a/emulators/qemu/patches/patch-memory.c b/emulators/qemu/patches/patch-memory.c
index f389002fce0..7c9c90d4013 100644
--- a/emulators/qemu/patches/patch-memory.c
+++ b/emulators/qemu/patches/patch-memory.c
@@ -1,6 +1,9 @@
-$NetBSD: patch-memory.c,v 1.3 2013/01/24 17:52:01 ryoon Exp $
+$NetBSD: patch-memory.c,v 1.4 2013/06/16 18:27:25 tsutsui Exp $
 
---- memory.c.orig	2012-12-03 19:37:05.000000000 +0000
+Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
+(PR lib/43832: ssp causes common names to be defines)
+
+--- memory.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ memory.c
 @@ -313,7 +313,7 @@ static void memory_region_read_accessor(
      if (mr->flush_coalesced_mmio) {
diff --git a/emulators/qemu/patches/patch-net_tap-bsd.c b/emulators/qemu/patches/patch-net_tap-bsd.c
index 276ccfe4369..91e58006698 100644
--- a/emulators/qemu/patches/patch-net_tap-bsd.c
+++ b/emulators/qemu/patches/patch-net_tap-bsd.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_tap-bsd.c,v 1.2 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-net_tap-bsd.c,v 1.3 2013/06/16 18:27:25 tsutsui Exp $
 
 Make it understand "-net tap,ifname=tap3" on NetBSD.
 
---- net/tap-bsd.c.orig	2012-09-05 14:03:06.000000000 +0000
+--- net/tap-bsd.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ net/tap-bsd.c
-@@ -43,7 +43,7 @@ int tap_open(char *ifname, int ifname_si
+@@ -44,7 +44,7 @@ int tap_open(char *ifname, int ifname_si
      struct stat s;
  #endif
  
diff --git a/emulators/qemu/patches/patch-slirp_tcp__subr.c b/emulators/qemu/patches/patch-slirp_tcp__subr.c
index 7259ad56e45..f9b2821bec7 100644
--- a/emulators/qemu/patches/patch-slirp_tcp__subr.c
+++ b/emulators/qemu/patches/patch-slirp_tcp__subr.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-slirp_tcp__subr.c,v 1.3 2012/09/11 17:13:45 asau Exp $
+$NetBSD: patch-slirp_tcp__subr.c,v 1.4 2013/06/16 18:27:25 tsutsui Exp $
 
---- slirp/tcp_subr.c.orig	2012-09-05 14:03:06.000000000 +0000
+--- slirp/tcp_subr.c.orig	2013-05-24 13:37:57.000000000 +0000
 +++ slirp/tcp_subr.c
 @@ -341,6 +341,8 @@ int tcp_fconnect(struct socket *so)
      setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(opt ));
diff --git a/emulators/qemu/patches/patch-util_hbitmap.c b/emulators/qemu/patches/patch-util_hbitmap.c
new file mode 100644
index 00000000000..14d7b06369a
--- /dev/null
+++ b/emulators/qemu/patches/patch-util_hbitmap.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-util_hbitmap.c,v 1.1 2013/06/16 18:27:25 tsutsui Exp $
+
+Avoid conflicts against popcountl(3) in NetBSD's libc.
+
+--- util/hbitmap.c.orig	2013-05-24 13:37:58.000000000 +0000
++++ util/hbitmap.c
+@@ -92,7 +92,7 @@ struct HBitmap {
+     unsigned long *levels[HBITMAP_LEVELS];
+ };
+ 
+-static inline int popcountl(unsigned long l)
++static inline int qemu_popcountl(unsigned long l)
+ {
+     return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l);
+ }
+@@ -199,14 +199,14 @@ static uint64_t hb_count_between(HBitmap
+         if (pos >= (end >> BITS_PER_LEVEL)) {
+             break;
+         }
+-        count += popcountl(cur);
++        count += qemu_popcountl(cur);
+     }
+ 
+     if (pos == (end >> BITS_PER_LEVEL)) {
+         /* Drop bits representing the END-th and subsequent items.  */
+         int bit = end & (BITS_PER_LONG - 1);
+         cur &= (1UL << bit) - 1;
+-        count += popcountl(cur);
++        count += qemu_popcountl(cur);
+     }
+ 
+     return count;