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.

1 files changed, 17 insertions, 17 deletions

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) {