Update to 2.6.0

Changelog:
System emulation
Incompatible changes

    The aio=native option to "-drive" now requires the cache=none option, instead of silently disabling itself for other cache modes. The newly invalid combination had been warning since QEMU 2.3.
    Specifying block device parameter aio=native is now an error on POSIX systems if qemu is compiled without libaio support. The newly invalid combination had been warning since QEMU 2.3.
    The experimental x-drive option for the sdhci-pci device has been removed. Instead of passing a drive directly to the SD controller device you now must create an SD card object (which will automatically be plugged into the SD controller), so "-device sdhci-pci,x-drive=mydrive -drive id=mydrive,[...]" becomes "-device sdhci-pci -device sd-card,drive=mydrive -drive id=mydrive,[...]".
    The s390-virtio machine has been removed.
    Machine types pc-q35-1.4, pc-q35-1.5, pc-q35-1.6, pc-q35-1.7, pc-q35-2.0, pc-q35-2.1, pc-q35-2.2 and pc-q35-2.3 have been removed.
    The "virt" machine type's flash device has changed when TrustZone is active ("-machine virt,secure=on"). The first flash device is only available in secure memory, while the second is available in non-secure memory too.

Future incompatible changes

    Three options are using different names on the command line and in configuration file. In particular:
        The "acpi" configuration file section matches command-line option "acpitable";
        The "boot-opts" configuration file section matches command-line option "boot";
        The "smp-opts" configuration file section matches command-line option "smp".

    -readconfig will standardize on the name for the command line option.

    Behavior of automatic calculation of SMP topology when some SMP topology options for -smp are omitted (sockets, cores, threads) will change in the future. If guest ABI needs to be preserved on upgrades while using the SMP topology options, users should either set set all options explicitly (sockets, cores, threads), or omit all of them.
    The original qcow2 image encryption is fatally flawed, and support for it will be disabled entirely from the system emulators. It'll remain available only in command line tools qemu-img, qemu-io, qemu-nbd to facilitate data liberation. It is recommended to use 'qemu-img convert' to convert qcow2 encrypted images to uncrypted ones. The new LUKS encryption driver can provide a secure replacement if raw files are acceptable, while a future release will integrate luks into qcow2 natively.
    A few devices will be configured with explicit properties instead of implicitly. Unlikely to affect users; for the full list, see the 2.3 ChangeLog.
    QMP command blockdev-add is still a work in progress. It doesn't support all block drivers, it lacks a matching blockdev-del, and more. It might change incompatibly.

ARM

    Support for a separate EL3 address space
    System mode supports BE8 and BE32. Note that qemu-system-arm can emulate both big-endian and little-endian guests (unlike user-mode emulation which has separate qemu-arm and qemu-armeb binaries).
    Support for the SETEND instruction, used most notably on Raspbian through the arm-mem library (previously known as libcofi).
    Faster boot thanks to DMA support in fw_cfg
    The "virt" machine type supports a virtual power button and the "system_powerdown" monitor command
    The "virt" machine type supports configuring network cards with -nic in addition to -netdev
    The RAM limit for the "virt" machine type is now 255GB
    The "xlnz-zynqmp" machine type now includes SPI controllers
    The "xlnx-ep108" machine type now supports SPI flash
    New partial Raspberry Pi 2 emulation with "raspi2" machine type. For now, it can boot older releases of Windows and Raspbian, but lacks a number of devices including USB.
    New palmetto-bmc machine type using the new, partial ASPEED AST2400 SoC implementation

KVM

    Support for guest debugging (software and hardware breakpoints, single step) on AArch64

MIPS

    Support for FPU and MSA in KVM guests
    Support for R6 Virtual Processors
    Initial support for Cluster Power Controller and Global Configuration Registers allowing the guest to control the start of Virtual Processors
    Support for Inter-Thread Communication Unit
    Support for MAAR registers in P5600 CPU

PowerPC

    Improved support for migration of g3beige and mac99 machines
    Fix serial ports for g3beige and mac99 machines (OpenBIOS)
    The gdb stub supports the VSX instruction set extensions

pSeries

    pSeries machine types starting at pseries-2.6 use XHCI as the USB host controller instead of OHCI
    Support for more hypercalls (H_SET_SPRG0, H_SET_DABR, H_SET_XDABR and H_PAGE_INIT)
    Support for EEH on assigned PCI devices can use the normal spapr-pci-host-bridge instead of the special spapr-pci-vfio-host-bridge.

s390

    Fixes and improvements in s390x PCI support
    Support for hotplug of s390x cpus via cpu-add
    Support for booting from virtio-scsi devices in the s390-ccw bios

SH
SPARC

    sun4m: Fix for ldstub instruction resolves several 32-bit Solaris bugs (MUTEX_HELD hang, libC error, Java WebStart segfault)
    sun4u: FreeBSD 10.3+ can now run under qemu-system-sparc64 in -nographic mode

TileGX
Tricore

    Support for context management, illegal opcode and opd traps
    Support for FPU instructions

x86
TCG

    Support for the XSAVE/XSAVEOPT, MPX, FSGSBASE and PKE features

KVM

    Support for "split irqchip". In this mode, QEMU emulates the IOAPIC, PIC (i8259) and PIT (i8254) devices while leaving the local APIC emulation to the kernel. This mode reduces the attack surface of KVM.
    Support for the new PKU feature found in some Skylake processors
    Support for migrating the TSC rate

Xen
Q35

    Support resume (S3)
    Support for legacy Windows guests (XP/2003)

Device emulation and assignment

    New IPMI emulation subsystem. QEMU can now emulate an internal BMC or attach to an external BMC simulator such as OpenIPMI's lanserv. IPMI however is not yet exposed in SMBIOS and ACPI tables (do we want to docume?)
    FIXME: what's the state of nvdimm?

ACPI

    The floppy disk controller's characteristics are now exposed in the ACPI tables, which makes it possible to use floppies on Windows together with UEFI firmware.

Block devices

    The floppy disk consk or an empty disk to a 2.88 MB disk
    Improved compatibility of the SD device model with various operating systems and firmwares
    The NVMe device supports the "bootindex" property.
    The SDHCI device supports reset.

 ivshmem

    No longer available on hosts lacking eventfd(2), because inter-vm interrupts don't work there
    New devices ivshmem-plain and ivshmem-doorbell, fully backwards compatible for guests, notable differences to ivshmem:
        PCI revision is 1 instead of 0
        ivshmem role=master becomes master=on, role=peer becomes master=off
        ivshmem x-memdev=ID becomes ivshmem-plain memdev=ID
        ivshmem shm=NAME,size=SZ becomes ivshmem-plain memdev=ID, with -object memory-backend-file,id=ID,mem-path=/dev/mem/NAME,size=SZ,share
        ivshmem chardev=ID becomes ivshmem-doorbell,chardev=ID
        Property ioeventfd defaults to on instead of off
        ivshmem-plain never has MSI-X capability, and ivshmem-doorbell always has MSI-X capability
    Device ivshmem is deprecated, and its experimental property x-memdev is gone
    Interrupting a peer that reuses an unplugged peer's ID works again (broken in v1.2.0)
    Unplug no longer destroys the character device, for consistency with other devices
    The funny "no shared memory, yet" state is no longer guest-visible, and can no longer fail or mess up migration
        Guests may require PCI revision 1 to make sure they're not exposed to the funny state
    docs/specs/ivshmem-spec.txt rewritten for completeness and accuracy.

SCSI

    Support for the LSI SAS1068 HBA (also known as "MPT Fusion"). Note that some operating systems will not recognize disks attached to this adapter, unless the disks are assigned a world-wide name (WWN).

PCI/PCIe

    PCIe Multi-root support (using the new pxb-pcie root-compex)

USB

    MTP: initial support for events

VFIO

    Support for AMD XGBE platform passthrough
    New sysfsdev property provides a more general way to specify the device to attach to.
    Provided PCI option ROMs are fixed to include the same vendor and device id as the device exposed to the guest. This facilitates changing the ids of the devices.

virtio

    Performance improvements via optimized vring accesses
    The balloon driver statistics now include the amount of available memory (corresponding to "Available" in /proc/meminfo for Linux guests).

Character devices

    The socket character device backend can now enable TLS over TCP connections, acting either as a TLS server:

$QEMU -object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=server \
      -chardev socket,id=s0,host=127.0.0.1,port=9000,tls-creds=tls0,server \
      -device isa-serial,chardev=s0 \
      ...other args...

or a TLS client:

$QEMU -object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=client \
      -chardev socket,id=s0,host=127.0.0.1,port=9000,tls-creds=tls0 \
      -device isa-serial,chardev=s0 \
      ...other args...

If operating in server mode, the same set of TLS credentials can be used for both character devices and the VNC server

    All character devices can have their output logged to a plain file

$QEMU -chardev stdio,id=mon0,logfile=monitor.log \
      -mon chardev=mon0 \
      ...other args...

will result in logging of all output on the HMP monitor. The logappend parameter controls whether the file is truncated at startup, defaulting to append.
GUI

    SDL2 and SPICE now support OpenGL and virgl. For SPICE, Unix sockets are the only usable transport when OpenGL is enabled.
    The "-vnc" and "-display vnc" options support ipv4=off and ipv6=off. Previously, only "ipv4" and "ipv6" were available.
    Support getting input events directly from linux evdev devices, using "-object input-linux,id=$name,evdev=/dev/input/event$nr"
    Support for ncurses on Windows.

Monitor

    Support for a new "detach" option to "dump-guest-memory". The option dumps memory in the background. Progress can be queried using the new commands "info dump" (human monitor) and "query-dump" (QMP), as well as through the QMP event DUMP_COMPLETED.
    Support for a new command "input-send-event" replacing the previous experimental command "x-input-send-event".
    The human monitor command "drive_add -n" allows creating block devices that do not have a BlockBackend (similar to QMP blockdev-add).

Migration

    Postcopy is not experimental anymore; the x-postcopy-ram capability was renamed to postcopy-ram.

Network

    SLIRP now supports IPv6 for ICMP, UDP, TCP and TFTP.
    mirror filter which can mirror traffic from netdev to socket chardev, vice versa.
    redirector filter which can redirect traffic from netdev to socket chardev, vice versa.

Secret passing system

There is a new standard mechanism for securely passing secret credentials to QEMU, which will be used in combination with other subsystems. For example, network block device passwords, block device decryption passphrases, or TLS private key passwords can all use the same mechanism.

    Passing credentials inline (insecure, only for developer testing)

$QEMU -object secret,id=sec0,data=letmein

    Passing credentials via a plain file

$QEMU -object secret,id=sec0,file=mypassword.txt

    Passing credentials via a base64 encoded file

$QEMU -object secret,id=sec0,file=mypassword.txt,format=base64

    Passing credentials inline, encrypted with a master key (recommended for management apps)

 $QEMU -object secret,id=master0,file=mykey.b64,format=base64 \
       -object secret,id=sec0,data=[base64 ciphertext],\
               keyid=master0,iv=[base64 IV],format=base64

TLS credential handling

It is now possible to use encrypted TLS private keys with credentials for TLS servers/clients in QEMU. The password for unlocking the private key is provided by a secret object whose id is specified via the passwordid' property

$QEMU -object secret,id=tlskey0,file=mypassword.txt \
      -object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=server,passwordid=tlskey0 \
      ...other args...

Block devices

    Block device throttling now support specifying a burst length as well. While previously the burst could only be specified as a total number of IOPS (e.g. 10000 IOPS), more complex specifications such as "10000 IOPS for 10 seconds" are now possible. Note that, because of the implementation of the algorithm, a guest that is allowed "10000 IOPS for 10 seconds" will also be allowed to perform for example 5000 IOPS for 20 seconds.
    The curl block device driver now supports HTTP authentication and HTTP proxy authentication via the new properties 'username', 'password-secret', 'proxy-username' and 'proxy-password-secret'.

$QEMU -object secret,id=sec0,file=password.txt \
      -object secret,id=sec1,file=proxy-password.txt \
      -drive driver=http,host=localhost,port=443,username=fred,password-secret=sec0,proxy-username=bob,proxy-password-secret=sec1 \
      ...other args...

    The RBD block device driver can now use the secret object type to securely receive the authentication password without exposing it in the command line args

$QEMU -object secret,id=sec0,file=password.b64,format=base64 \
      -drive driver=rbd,filename=rbd:pool/image:id=myname:auth_supported=cephx,password-secret=sec0 \
      ...other args...

    The iSCSI block device driver can now use the secret object type to securely receive the authentication password without exposing it in the command line args

$QEMU -object secret,id=sec0,file=password.txt \
      -iscsi user=fred,password-secret=sec0 \
      -drive file=iscsi://192.168.122.1:3260/iqn.2013-12.com.example%3Aiscsi-chap-netpool/1

NB this syntax requires that all iSCSI backed drives use the same password

    The qemu-io tool gained support for new '--object' and '--image-opts' arguments. The --object argument allows 'secret' and 'tls-creds-x509' objects to be defined for use in association with a block device backend. The '--image-opts' argument instructs qemu-io to parse the image string as a set of image options, instead of a plain filename. For example, to connect qemu-io to an NBD server using TLS

qemu-io -c "read 0 512" \
        --object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=client \
        --image-opts driver=nbd,host=localhost,port=10809,tls-creds=tls0

    The qemu-nbd tool gained support for new '--object' and '--image-opts' arguments. The --object argument allows 'secret' and 'tls-creds-x509' objects to be defined for use in association with a block device backend or the NBD server. The '--image-opts' argument instructs qemu-io to parse the image string as a set of image options, instead of a plain filename. For example, to connect qemu-nbd to an HTTP server with authentication and export it over NBD using TLS

qemu-nbd --readonly \
         --object secret,id=sec0,file=passwd.txt \
         --object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=server \
         --image-opts driver=http,url=http://some.random.host/some/image,username=fred,password-secret=sec0

    The qemu-img tool gained support for new '--object' and '--image-opts' arguments. The --object argument allows 'secret' and 'tls-creds-x509' objects to be defined for use in association with a block device backend or the NBD server. The '--image-opts' argument instructs qemu-io to parse the image string as a set of image options, instead of a plain filename. For example, to a remote HTTP server with authentication

qemu-img info --object secret,id=sec0,file=passwd.txt \
              --image-opts driver=http,url=http://some.random.host/some/image,username=fred,password-secret=sec0

    Support for deleting snapshots on Sheepdog devices.
    The NBD client and server now support use of TLS. When enabled, the server will mandate that the client also enable TLS and drop any client which attempts to continue in plain text. To run a qemu-nbd server with TLS:

qemu-nbd --object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=server \
         --tls-creds tls0 \
         /path/to/disk/image

To connect to a server that requires TLS with qemu-img:

qemu-img info --object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=client \
              --image-opts driver=nbd,host=localhost,port=10809,tls-creds=tls0

To start a VM pointing to the NBD server

$QEMU -object tls-creds-x509,id=tls0,dir=$HOME/.pki/qemutls,endpoint=client \
      -drive driver=nbd,host=localhost,port=10809,tls-creds=tls0 \
      ...other args...

    The NBD server gained support for specifying an export name. When the client negotiates use of the new style NBD protocol the default export name is "". The --exportname argument allows this to be customized:

qemu-nbd --exportname myvol  /path/to/myvol.qcow2

    QEMU gained support for volumes formatted with the LUKSv1 data format. To format a new LUKS volume

qemu-img create -f luks \
                --object secret,id=sec0,file=passphrase.txt \
                -o key-secret=sec0 \
                demo.luks 10G

To boot a guest from a LUKS volume:

$QEMU -object secret,id=sec0,file=passphrase.txt \
      -drive driver=luks,key-secret=sec0,file=demo.luks \
      ...other args...

The LUKS implementation is intended to be compatible with that used by cryptsetup/dm-crypt, so it should be possible to use disk images interchangeably between them. The only caveat is that some less common cipher/hash algorithms are not yet supported by QEMU. It is also not yet possible to manage key-slots with qemu-img.
TCG

    Record/replay support extended to cover character devices.

Tracing

    The "stderr" tracing backend was replaced by the "log" tracing backend, which is now the default. This backend prints tracing messages to the destination specified with the "-D" option.
    In addition to the existing "-trace file=...", tracepoints can be enabled using "-trace [enable=]...". The new option also supports globbing, as in "-trace bdrv_aio_*".
    In addition to the existing "-trace file=...", tracepoints can be enabling using "-d trace:...". This option also supports globbing, as in "-d trace:bdrv_aio_*".
    When using "-daemonize", the "-D" option also provides the file to which QEMU's stderr output will be redirected.
    TCG supports a new "-dfilter" option to limit exec, out_asm, op and op_opt logging to a range of guest physical addresses. ARM also applies the filter to in_asm logging; this will be extended to other targets in future releases (FIXME: probably should do it now instead...)
    A "%d" substring in the log file name is replaced with QEMU's pid.

User-mode emulation

    The default CPU for ppc64 and ppc64le is now POWER8

10 files changed, 62 insertions, 57 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 5f8f0dda9a7..eef7c1dca8c 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.148 2015/12/21 12:10:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.149 2016/05/15 01:25:15 ryoon Exp $
 
-DISTNAME=	qemu-2.5.0
+DISTNAME=	qemu-2.6.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+=	--smbd=${PREFIX}/sbin/smbd
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--enable-curses
 #HF#CONFIGURE_ARGS+=	--disable-fdt			# HF: build on OS X
+CONFIGURE_ARGS+=	--disable-opengl
 CONFIGURE_ENV+=		mansuffix=/${PKGMANDIR}
 
 PKG_SYSCONFSUBDIR=	qemu
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index a74116ad138..705718852fc 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2015/12/21 12:10:22 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.46 2016/05/15 01:25:15 ryoon Exp $
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
 ${PLIST.alpha}bin/qemu-alpha
@@ -128,11 +128,9 @@ 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/qemu_logo_no_text.svg
 share/qemu/s390-ccw.img
-share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin
 share/qemu/spapr-rtas.bin
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 1930f7605fb..0feff506531 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.114 2016/03/24 15:21:10 khorben Exp $
+$NetBSD: distinfo,v 1.115 2016/05/15 01:25:15 ryoon Exp $
 
-SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7
-RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9
-SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3
-Size (qemu-2.5.0.tar.bz2) = 25464996 bytes
+SHA1 (qemu-2.6.0.tar.bz2) = d558a11d681dd095b1d7cb03c5b723c9d3045020
+RMD160 (qemu-2.6.0.tar.bz2) = 97e41fab12ad15ba05e63229bf57a51a1564bd32
+SHA512 (qemu-2.6.0.tar.bz2) = 0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215
+Size (qemu-2.6.0.tar.bz2) = 25755267 bytes
 SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92
-SHA1 (patch-configure) = 668aff0a22a5800993645a4b40899e7694803ee6
-SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18
+SHA1 (patch-configure) = a24c31f005ee12ab56f19e3e8594b0a3bad955fc
+SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7
 SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
 SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
+SHA1 (patch-hw_misc_ivshmem.c) = c1fdc8111286f2c760512189db4a854bfc6129d0
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
-SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
-SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
-SHA1 (patch-memory.c) = f5193fb86a6fad5864477dafc4651d3d51147cc8
-SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
+SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
+SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
+SHA1 (patch-memory.c) = 9f94de7799ef80931fb1de572e5603894f3fb328
+SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154
 SHA1 (patch-tests_Makefile) = bd8997ea00eea05489335020ccae0e33dbcb84f9
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index e711bddb01f..bf0263cd136 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.12 2016/03/24 15:21:10 khorben Exp $
+$NetBSD: patch-configure,v 1.13 2016/05/15 01:25:15 ryoon Exp $
 
 Don't use gld on SunOS
 add check for shm_open
 avoid bad substitution
 
---- configure.orig	2015-12-16 22:04:48.000000000 +0000
+--- configure.orig	2016-05-11 15:56:07.000000000 +0000
 +++ configure
-@@ -650,7 +650,6 @@ SunOS)
+@@ -624,7 +624,6 @@ SunOS)
    solaris="yes"
    make="${MAKE-gmake}"
    install="${INSTALL-ginstall}"
@@ -56,7 +56,7 @@ avoid bad substitution
    return clock_gettime(CLOCK_REALTIME, NULL);
  }
  EOF
-@@ -4568,7 +4593,9 @@ if test "$want_tools" = "yes" ; then
+@@ -4583,7 +4608,9 @@ if test "$want_tools" = "yes" ; then
    tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
      tools="qemu-nbd\$(EXESUF) $tools"
@@ -67,16 +67,7 @@ avoid bad substitution
    fi
  fi
  if test "$softmmu" = yes ; then
-@@ -4758,7 +4785,7 @@ echo "GTK GL support    $gtk_gl"
- echo "GNUTLS support    $gnutls"
- echo "GNUTLS hash       $gnutls_hash"
- echo "libgcrypt         $gcrypt"
--echo "nettle            $nettle ${nettle+($nettle_version)}"
-+echo "nettle            $nettle ($nettle_version)"
- echo "libtasn1          $tasn1"
- echo "VTE support       $vte"
- echo "curses support    $curses"
-@@ -5049,6 +5076,9 @@ fi
+@@ -5074,6 +5101,9 @@ fi
  if test "$fallocate_zero_range" = "yes" ; then
    echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
  fi
diff --git a/emulators/qemu/patches/patch-default-configs_pci.mak b/emulators/qemu/patches/patch-default-configs_pci.mak
index 88e37d2e7f1..0ace043226f 100644
--- a/emulators/qemu/patches/patch-default-configs_pci.mak
+++ b/emulators/qemu/patches/patch-default-configs_pci.mak
@@ -1,11 +1,11 @@
-$NetBSD: patch-default-configs_pci.mak,v 1.1 2015/12/21 12:10:22 ryoon Exp $
+$NetBSD: patch-default-configs_pci.mak,v 1.2 2016/05/15 01:25:15 ryoon Exp $
 
---- default-configs/pci.mak.orig	2015-12-16 22:04:48.000000000 +0000
+--- default-configs/pci.mak.orig	2016-05-11 15:56:07.000000000 +0000
 +++ default-configs/pci.mak
-@@ -35,5 +35,5 @@ CONFIG_SDHCI=y
+@@ -36,5 +36,5 @@ CONFIG_SDHCI=y
  CONFIG_EDU=y
  CONFIG_VGA=y
  CONFIG_VGA_PCI=y
--CONFIG_IVSHMEM=$(CONFIG_POSIX)
+-CONFIG_IVSHMEM=$(CONFIG_EVENTFD)
 +CONFIG_IVSHMEM=$(CONFIG_SHM_OPEN)
  CONFIG_ROCKER=y
diff --git a/emulators/qemu/patches/patch-hw_misc_ivshmem.c b/emulators/qemu/patches/patch-hw_misc_ivshmem.c
new file mode 100644
index 00000000000..c1f54a557f3
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_misc_ivshmem.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-hw_misc_ivshmem.c,v 1.1 2016/05/15 01:25:15 ryoon Exp $
+
+--- hw/misc/ivshmem.c.orig	2016-05-11 15:56:09.000000000 +0000
++++ hw/misc/ivshmem.c
+@@ -567,7 +567,9 @@ static void process_msg_connect(IVShmemS
+     vector = peer->nb_eventfds++;
+ 
+     IVSHMEM_DPRINTF("eventfds[%d][%d] = %d\n", posn, vector, fd);
++#if defined(CONFIG_EVENTFD)
+     event_notifier_init_fd(&peer->eventfds[vector], fd);
++#endif
+     fcntl_setfl(fd, O_NONBLOCK); /* msix/irqfd poll non block */
+ 
+     if (posn == s->vm_id) {
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
index 69db887e3ea..d0e33a12920 100644
--- a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.3 2016/05/15 01:25:15 ryoon Exp $
 
 Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
 
---- hw/ppc/mac_newworld.c.orig	2013-11-27 22:15:55.000000000 +0000
+--- hw/ppc/mac_newworld.c.orig	2016-05-11 15:56:09.000000000 +0000
 +++ hw/ppc/mac_newworld.c
-@@ -125,7 +125,7 @@ static uint64_t translate_kernel_address
+@@ -131,7 +131,7 @@ static uint64_t translate_kernel_address
      return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
  }
  
@@ -13,7 +13,7 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
  {
      return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
  }
-@@ -252,7 +252,7 @@ static void ppc_core99_init(QEMUMachineI
+@@ -262,7 +262,7 @@ static void ppc_core99_init(MachineState
          }
          /* load initrd */
          if (initrd_filename) {
@@ -22,8 +22,8 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
              initrd_size = load_image_targphys(initrd_filename, initrd_base,
                                                ram_size - initrd_base);
              if (initrd_size < 0) {
-@@ -260,11 +260,11 @@ static void ppc_core99_init(QEMUMachineI
-                          initrd_filename);
+@@ -270,11 +270,11 @@ static void ppc_core99_init(MachineState
+                              initrd_filename);
                  exit(1);
              }
 -            cmdline_base = round_page(initrd_base + initrd_size);
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
index f8aab728723..68ee452fa2d 100644
--- a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.3 2016/05/15 01:25:15 ryoon Exp $
 
 Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
 
---- hw/ppc/mac_oldworld.c.orig	2013-11-27 22:15:55.000000000 +0000
+--- hw/ppc/mac_oldworld.c.orig	2016-05-11 15:56:09.000000000 +0000
 +++ hw/ppc/mac_oldworld.c
-@@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
+@@ -64,7 +64,7 @@ static uint64_t translate_kernel_address
      return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
  }
  
@@ -13,7 +13,7 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
  {
      return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
  }
-@@ -181,7 +181,7 @@ static void ppc_heathrow_init(QEMUMachin
+@@ -188,7 +188,7 @@ static void ppc_heathrow_init(MachineSta
          }
          /* load initrd */
          if (initrd_filename) {
@@ -22,8 +22,8 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
              initrd_size = load_image_targphys(initrd_filename, initrd_base,
                                                ram_size - initrd_base);
              if (initrd_size < 0) {
-@@ -189,11 +189,11 @@ static void ppc_heathrow_init(QEMUMachin
-                          initrd_filename);
+@@ -196,11 +196,11 @@ static void ppc_heathrow_init(MachineSta
+                              initrd_filename);
                  exit(1);
              }
 -            cmdline_base = round_page(initrd_base + initrd_size);
diff --git a/emulators/qemu/patches/patch-memory.c b/emulators/qemu/patches/patch-memory.c
index 9f9671af278..1d4988170f5 100644
--- a/emulators/qemu/patches/patch-memory.c
+++ b/emulators/qemu/patches/patch-memory.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-memory.c,v 1.9 2015/08/12 06:55:59 ryoon Exp $
+$NetBSD: patch-memory.c,v 1.10 2016/05/15 01:25:15 ryoon Exp $
 
---- memory.c.orig	2015-08-11 19:11:09.000000000 +0000
+--- memory.c.orig	2016-05-11 15:56:12.000000000 +0000
 +++ memory.c
-@@ -396,7 +396,7 @@ static MemTxResult  memory_region_read_a
+@@ -431,7 +431,7 @@ static MemTxResult  memory_region_read_a
  {
      uint64_t tmp;
  
 -    tmp = mr->ops->read(mr->opaque, addr, size);
 +    tmp = (mr->ops->read)(mr->opaque, addr, size);
-     trace_memory_region_ops_read(mr, addr, tmp, size);
-     *value |= (tmp & mask) << shift;
-     return MEMTX_OK;
+     if (mr->subpage) {
+         trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);
+     } else if (mr == &io_mem_notdirty) {
diff --git a/emulators/qemu/patches/patch-slirp_tcp__subr.c b/emulators/qemu/patches/patch-slirp_tcp__subr.c
index fd650974c70..10d714fc161 100644
--- a/emulators/qemu/patches/patch-slirp_tcp__subr.c
+++ b/emulators/qemu/patches/patch-slirp_tcp__subr.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-slirp_tcp__subr.c,v 1.6 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-slirp_tcp__subr.c,v 1.7 2016/05/15 01:25:15 ryoon Exp $
 
---- slirp/tcp_subr.c.orig	2013-11-27 22:15:55.000000000 +0000
+--- slirp/tcp_subr.c.orig	2016-05-11 15:56:13.000000000 +0000
 +++ slirp/tcp_subr.c
-@@ -340,6 +340,8 @@ int tcp_fconnect(struct socket *so)
+@@ -407,6 +407,8 @@ int tcp_fconnect(struct socket *so, unsi
      socket_set_fast_reuse(s);
      opt = 1;
      qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
 +    opt = 1;
 +    qemu_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
  
-     addr.sin_family = AF_INET;
-     if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
+     addr = so->fhost.ss;
+     DEBUG_CALL(" connect()ing")