summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2015-12-22 20:21:43 +0000
committerbsiegert <bsiegert>2015-12-22 20:21:43 +0000
commit57778bb5ced286b5326094e7d315c0fa5126ce6c (patch)
tree4c199fb75dd651ba264d476b50ede397e05225a7
parent6ccdb4116348f51146d65d5186a54e21fec6277c (diff)
downloadpkgsrc-57778bb5ced286b5326094e7d315c0fa5126ce6c.tar.gz
Pullup ticket #4876 - requested by ryoon
emulators/qemu: security fix Revisions pulled up: - emulators/qemu/Makefile 1.147-1.148 - emulators/qemu/PLIST 1.44-1.45 - emulators/qemu/distinfo 1.109-1.110 - emulators/qemu/options.mk 1.2 - emulators/qemu/patches/patch-Makefile.objs 1.1 - emulators/qemu/patches/patch-configure 1.7-1.8 - emulators/qemu/patches/patch-default-configs_pci.mak 1.1 - emulators/qemu/patches/patch-tests_Makefile 1.3 --- Module Name: pkgsrc Committed By: ryoon Date: Fri Dec 18 22:39:33 UTC 2015 Modified Files: pkgsrc/emulators/qemu: Makefile PLIST distinfo pkgsrc/emulators/qemu/patches: patch-configure patch-tests_Makefile Log Message: Update to 2.5.0 Changelog: == System emulation == * guard pages are now inserted after guest RAM, to guard against guest-triggered buffer overflow attacks === Incompatible changes === * The mips32r5-generic CPU was renamed to P5600 * Host floppy device pass-through (block driver "host_floppy") has been removed; it is still possible to use them just like any other device file, however, a medium change will no longer be passed through to the guest === 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. * Image encryption is fatally flawed, and will be dropped entirely. It'll remain available only in qemu-img, so you can use 'qemu-img convert' to convert encrypted images to uncrypted ones. * Block device parameter aio=native has no effect without cache.direct=on. It will be made an error. * Block device parameter aio=native has no effect if qemu is compiled without libaio support. It will be made an error. * 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. * The s390-virtio machine has been deprecated for 2.5; it will be removed in 2.6. s390x users should switch to the (default) s390-ccw-virtio machine. * Changes to device "sdhci-pci" will make migration between old and new versions impossible. * We intend to drop support for running QEMU on MacOSX 10.5 hosts in the QEMU 2.6 release, unless somebody who uses it wishes to step forward and help us with regular testing. === Alpha === === ARM === * The "virt" machine type supports passing SMBIOS to the firmware. * Semihosting support on AArch64 * New i.MX31 SoC. * The ZynqMP and Allwinner A10 platforms support AHCI. * Support for VGICv3 in KVM * Support for GICv3 in the ACPI tables. * The "virt" machine now has a second PCIe MMIO region of 512GB in size in high memory. Note that older 32-bit ARM Linux kernels built without CONFIG_LPAE have a bug where the presence of this region in high memory causes them to refuse to use the PCIe controller at all. In this case you can either reconfigure your kernel with CONFIG_LPAE=y, or pass QEMU the "-machine highmem=off" option to disable the use of high memory for PCIe. The kernel bug is expected to be fixed in Linux kernel release 4.4. === MIPS === * The mips32r5-generic CPU was renamed to P5600 * Improvements to MIPS R6 emulation === PowerPC === ==== pSeries ==== * Support for memory hotplug * The shipped version of SLOF includes GPT support. * Using VFIO doesn't need spapr-pci-vfio-host-bridge anymore. * virtio-vga now supported on sPAPR guests. * [[Features/HRandomHypercall | H_RANDOM hypercall]] device for providing good random data to the guests. ==== Mac99 ==== * Improve ability to boot MacOS 9 (based upon GSoC project "Implement support for Mac OS 9 in QEMU " by Cormac O'Brien) === s390 === * Storage keys are migrated. * New "info skeys" command in HMP to dump the storage key for a given address. * Support for virtio 1 in the virtio-ccw devices. ** A maximum virtio-ccw revision can be specified via the "max_revision" property: max_revision=0 may be used to enforce usage of legacy virtio mode. * Support for boot from El Torito iso images on virtio-blk has been added. === SH === === SPARC === * sun4u: Fix EBus device enumeration under FreeBSD SPARC64 (OpenBIOS) === TileGX === * New target. === x86 === * The emulated IOMMU (VT-d) supports devices behind a bridge * QEMU will warn when using a "-cpu" model that includes unsupported features. These features are disabled automatically, just like in previous versions of QEMU * /machine/icc-bridge was removed from the QOM tree. Software relying on icc-bridge to find CPU objects should use the "qom_path" field of "query-cpus" QMP command ==== CPU models and features ==== * Haswell and Broadwell CPU models now include ABM * Cache information passthrough (which was enabled by default on "-cpu host") is now disabled by default * ABM, POPCNT, and SSE4a are not enabled in the default CPU models (qemu64, qemu32) anymore, as many hosts don't support it * RDTSCP was removed from AMD CPU models, as current KVM versions can't expose RDTSCP to guests in AMD hosts * New Intel memory instructions (clflushopt/clwb/pcommit) are now supported * TCG now supports Debug Extensions (CR4.DE) ==== KVM ==== * Support for Hyper-V-compatible reporting of crashes. ==== Xen ==== * Support for passthrough of Intel integrated GPUs. === Device emulation and assignment === * fw_cfg supports a DMA interface on ARM and x86. This interface makes -kernel/-initrd much faster if supported by the firmware. SeaBIOS supports the DMA interface starting with release 1.9.0 (commit 06316c9d). The UEFI guest fw for ARM VMs (known as ArmVirtQemu or AAVMF) supports the DMA interface starting with git commit 953bcbcc / SVN r18545. ==== ACPI ==== ==== Audio ==== ==== Block devices ==== ==== Character devices ==== ==== IDE ==== * AHCI ATAPI PIO transfers greater than one sector are fixe 0. On guest acknowledge, all functions are ejected together. ==== TPM ==== ==== VFIO ==== ==== virtio ==== * virtio-gpu now supports 3D mode * vhost-user now supports live migration. client changes are required to enable this. When used with an old client without migration support, vhost-user will now block migration (instead of failing silently) * vhost-user now supports multi-queue. Use queues=# to enable this. client changes are required to enable this mode. When used with an old client without multi-queue support, device will automatically fall back on using a single pair of queues. * vhost-user protocol now includes protocol feature negotiation, including multiple new messages. When used with old clients, all new messages are automatically disabled. * vhost-user no longer sents the RESET_OWNER message on device stop. The only QEMU version that sent it was 2.4, the message is now officially deprecated. * migration now works when virtio 1 is enabled for virtio-pci * For virtio-pci, virtio 1 performance on kvm on Intel CPUs has been improved (on kernel 4.4 and up). * a new flag modern-pio-notify can be used to enable PIO for notifications in virtio 1 mode, to improve performance for host kernels older than 4.4, and processors without EPT support. * virtio devices can now be placed on the pci express bus * vhost is no longer disabled when guest does not use MSI-X. The vhostforce flag is no longer required. * in virtio 1 mode, scsi passthrough is now disabled for virtio blk * Please note that for virtio-pci, the modern (virtio 1) interface is still disabled by default. To enable, set the flag disable-modern=off. ==== VGA ==== === Character devices === === GUI === * New syntax for enabling TLS in the VNC server: ** Equivalent to <tt>-vnc hostname:0,tls</tt>: <tt>-object tls-creds-anon,id=tls0,endpoint=server -vnc hostname:0,tls-creds=tls0</tt> ** Equivalent to <tt>-vnc hostname:0,tls,x509=/path/to/certs</tt>: <tt>-object tls-creds-x509,id=tls0,endpoint=server,dir=/path/to/certs,verify-peer=no -vnc hostname:0,tls-creds=tls0</tt> ** Equivalent to <tt>-vnc hostname:0,tls,x509verify=/path/to/certs</tt>: <tt>-object tls-creds-x509,id=tls0,endpoint=server,dir=/path/to/certs,verify-peer=yes -vnc hostname:0,tls-creds=tls0</tt> * The Cocoa GUI does not have show an 'open image file' dialog box anymore even if QEMU is started without arguments * Thu curses GUI supports 256 colors and line graphics. === Monitor === * New "info iothreads" command. * New "query-qmp-schema" command allows the caller to [[Features/QMP/Introspection | introspect the QMP schema]] used by QEMU. === Migration === * [[Features/PostCopyLiveMigration | Postcopy migration]] for migration of large/busy guests * A more flexible [[Features/AutoconvergeLiveMigration | auto-converge mechanism]] (for busy guests) === Network === * Support for multiqueue in vhost-user. * Support for network filters. Currently, the only filter objects are "filter-buffer", which batches packets every N microseconds, and "filter-dump", which can be used to log the network traffic in a file. Filters are attached to a netdev device using e.g. "-object filter-buffer,id=filter,netdev=net0,queue=rx,interval=1000" (which creates a 1ms filter-buffer). === Block devices in system emulation === === Command-line options === === TCG === * Improved system emulation performance for targets with software TLBs (e.g. SPARC). * Initial support for [[Features/record-replay | record/replay]]. == Block devices and tools == * The HMP "change" command (QMP's “"lockdev-change-medium") now allows you to change the read-only mode of the device (e.g. when inserting a read-only floppy disk image into a previously R/W drive) * Fine-grained control over a block device's tray with the new QMP commands "blockdev-open-tray", "blockdev-close-tray", "x-blockdev-insert-medium", and "x-blockdev-remove-medium" (the latter two are experimental for now) * New "reopen" command in qemu-io * block-dirty-bitmap-add and block-dirty-bitmap-clear transaction actions have been added to now fully support (transient) incremental bitmap usage and management. * QMP transactions now support a "completion-mode" parameter which controls the completion behavior of jobs launched by transactions, which will allow them to fail together. See the [https://github.com/qemu/qemu/blob/master/docs/bitmaps.md bitmaps.md] documentation for how this affects incremental backups. * Block I/O accounting can now report average queue depth, min/avg/max latency, and failed/invalid request counts * qcow2 learnt a new option ''cache-clean-interval'', which allows to free unused cache entries after some time. * An experimental QMP command ''x-blockdev-del'' was added as a completement for the (also still experimental) ''blockdev-add'' command. * A new QMP command ''blockdev-snapshot'' that allows creating a snapshot using as overlay an image previously opened with ''blockdev-add''. This allows opening the overlay image with arbitrary run-time options, solving one of the limitations of ''blockdev-snapshot-sync''. * It is now possible to open an image without its backing file by specifying the empty string as a backing file reference when opening the image. This is useful for creating snapshots, since images opened with ''blockdev-add'' are not supposed to have a backing file before the ''blockdev-snapshot'' operation. * Host CD-ROM support now works on Mac OS X hosts * Host floppy support has been removed (it was deprecated in QEMU 2.3) * The temporary "x-data-plane=on/off" option for virtio-blk device is removed now, all users are requested to use the canonical "-object iothread,id=<id> -device virtio-blk,iothread=<id>,..." syntax. == Audio == == Guest agent == * Add an optional qemu-ga.conf system configuration * Support for dumping the configuration current file with --dump-conf * Win32 support for guest-set-user-password * New command guest-exec == User-mode emulation == * The configure option --disable-guest-base has been removed. == Build dependencies == * libcacard has been moved to a standalone project, hosted at git://anongit.freedesktop.org/spice/libcacard. The libcacard library from QEMU 2.4 can also be used to build QEMU 2.5. * virtio-gpu 3D support requires virglrenderer. == Known issues == * SDL audio only works with SDL 1.x. * 64-bit QEMU might crash on Windows (problems with stack unwinding, depends on build environment, [http://repo.or.cz/w/qemu/ar7.git/commit/8fa9c07c9a33174905e67589bea6be3e278712cb possible fix]) * QEMU's configure script fails with pdksh from OpenBSD (see [https://bugs.launchpad.net/qemu/+bug/1525682 bug #1525682]. Using another shell with configure should work. --- Module Name: pkgsrc Committed By: ryoon Date: Mon Dec 21 12:10:22 UTC 2015 Modified Files: pkgsrc/emulators/qemu: Makefile PLIST distinfo options.mk pkgsrc/emulators/qemu/patches: patch-configure Added Files: pkgsrc/emulators/qemu/patches: patch-Makefile.objs patch-default-configs_pci.mak Log Message: Fix build under NetBSD 6 or other platform that has no shm_open() Fix PR pkg/50572.
-rw-r--r--emulators/qemu/Makefile7
-rw-r--r--emulators/qemu/PLIST5
-rw-r--r--emulators/qemu/distinfo15
-rw-r--r--emulators/qemu/options.mk15
-rw-r--r--emulators/qemu/patches/patch-Makefile.objs12
-rw-r--r--emulators/qemu/patches/patch-configure65
-rw-r--r--emulators/qemu/patches/patch-default-configs_pci.mak11
-rw-r--r--emulators/qemu/patches/patch-tests_Makefile8
8 files changed, 118 insertions, 20 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 39271952092..0e640449a64 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.143.2.1 2015/09/27 18:51:37 bsiegert Exp $
+# $NetBSD: Makefile,v 1.143.2.2 2015/12/22 20:21:43 bsiegert Exp $
-DISTNAME= qemu-2.4.0.1
+DISTNAME= qemu-2.5.0
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -80,7 +80,7 @@ PLIST.nbd= YES
CONFIGURE_ARGS+= --disable-coroutine-pool
.endif
-PLIST_VARS+= ${UE_ARCHS} nbd
+PLIST_VARS+= ${UE_ARCHS} nbd ivshmem
.for _var_ in ${USER_EMUL}
PLIST.${_var_}= YES
.endfor
@@ -97,6 +97,7 @@ post-install:
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/extension.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 69bc9e2fd55..6767737249f 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.43 2015/08/12 06:55:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.43.2.1 2015/12/22 20:21:43 bsiegert Exp $
+${PLIST.ivshmem}bin/ivshmem-client
+${PLIST.ivshmem}bin/ivshmem-server
${PLIST.alpha}bin/qemu-alpha
${PLIST.arm}bin/qemu-arm
${PLIST.armeb}bin/qemu-armeb
@@ -55,6 +57,7 @@ bin/qemu-system-xtensaeb
${PLIST.x86_64}bin/qemu-x86_64
man/man1/qemu-img.1
man/man1/qemu.1
+man/man8/qemu-ga.8
man/man8/qemu-nbd.8
share/doc/qemu/Makefile.multinode-NetBSD
share/doc/qemu/qemu-doc.html
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 7e1724ec3eb..d6801979580 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.105.2.1 2015/09/27 18:51:37 bsiegert Exp $
+$NetBSD: distinfo,v 1.105.2.2 2015/12/22 20:21:43 bsiegert Exp $
-SHA1 (qemu-2.4.0.1.tar.bz2) = 10701fb6fbb44646b2f655c6ab097cf7a04b2b52
-RMD160 (qemu-2.4.0.1.tar.bz2) = 203d22967bc29de0767c07cbc87a74df09a20d4b
-Size (qemu-2.4.0.1.tar.bz2) = 25068555 bytes
-SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856
+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 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92
+SHA1 (patch-configure) = 7ef7a8e1071edc56b317d214ec285ceecf08a68c
+SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18
SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
@@ -13,4 +16,4 @@ 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-tests_Makefile) = 44ec206f8061274d0c0a7ca0d4a3e2dbe936fafa
+SHA1 (patch-tests_Makefile) = bd8997ea00eea05489335020ccae0e33dbcb84f9
diff --git a/emulators/qemu/options.mk b/emulators/qemu/options.mk
index eac6719eb9e..87b4b64d96d 100644
--- a/emulators/qemu/options.mk
+++ b/emulators/qemu/options.mk
@@ -1,12 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2011/02/28 17:49:30 wiz Exp $
+# $NetBSD: options.mk,v 1.1.38.1 2015/12/22 20:21:43 bsiegert Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
-PKG_SUPPORTED_OPTIONS= sdl
+PKG_SUPPORTED_OPTIONS= sdl ivshmem
.include "../../mk/bsd.fast.prefs.mk"
+.if empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*)
+PKG_SUGGESTED_OPTIONS+= ivshmem
+.endif
+
.if empty(OPSYS:MDarwin)
-PKG_SUGGESTED_OPTIONS= sdl
+PKG_SUGGESTED_OPTIONS+= sdl
.endif
.include "../../mk/bsd.options.mk"
@@ -17,3 +21,8 @@ CONFIGURE_ARGS+= --enable-sdl
.else
CONFIGURE_ARGS+= --disable-sdl
.endif
+
+.if !empty(PKG_OPTIONS:Mivshmem)
+PLIST.ivshmem= yes
+.endif
+
diff --git a/emulators/qemu/patches/patch-Makefile.objs b/emulators/qemu/patches/patch-Makefile.objs
new file mode 100644
index 00000000000..97822f41025
--- /dev/null
+++ b/emulators/qemu/patches/patch-Makefile.objs
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile.objs,v 1.1.2.2 2015/12/22 20:21:43 bsiegert Exp $
+
+--- Makefile.objs.orig 2015-12-16 22:04:47.000000000 +0000
++++ Makefile.objs
+@@ -109,5 +109,7 @@ qga-vss-dll-obj-y = qga/
+
+ ######################################################################
+ # contrib
++ifeq ($(CONFIG_SHM_OPEN),y)
+ ivshmem-client-obj-y = contrib/ivshmem-client/
+ ivshmem-server-obj-y = contrib/ivshmem-server/
++endif
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index f9245dffc5b..8971a64b084 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.6 2015/01/07 21:39:24 wiedi Exp $
+$NetBSD: patch-configure,v 1.6.6.1 2015/12/22 20:21:43 bsiegert Exp $
Don't use gld on SunOS
---- configure.orig 2014-12-09 14:45:40.000000000 +0000
+--- configure.orig 2015-12-16 22:04:48.000000000 +0000
+++ configure
-@@ -622,7 +622,6 @@ SunOS)
+@@ -650,7 +650,6 @@ SunOS)
solaris="yes"
make="${MAKE-gmake}"
install="${INSTALL-ginstall}"
@@ -11,3 +11,62 @@ Don't use gld on SunOS
smbd="${SMBD-/usr/sfw/sbin/smbd}"
needs_libsunmath="no"
solarisrev=`uname -r | cut -f2 -d.`
+@@ -3672,6 +3671,23 @@ if compile_prog "" "" ; then
+ fallocate_zero_range=yes
+ fi
+
++# check for shm_open
++shm_open=no
++cat > $TMPC << EOF
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++
++int main(void)
++{
++ shm_open(NULL, O_RDWR, 0644);
++ return 0;
++}
++EOF
++if compile_prog "" "-lrt" ; then
++ shm_open=yes
++fi
++
+ # check for posix_fallocate
+ posix_fallocate=no
+ cat > $TMPC << EOF
+@@ -3935,8 +3951,13 @@ fi
+ cat > $TMPC <<EOF
+ #include <signal.h>
+ #include <time.h>
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++
+ int main(void) {
+ timer_create(CLOCK_REALTIME, NULL, NULL);
++ shm_open(NULL, O_RDWR, 0644);
+ return clock_gettime(CLOCK_REALTIME, NULL);
+ }
+ EOF
+@@ -4568,7 +4589,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"
+- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
++ if ["$shm_open" = "yes" ] ; then
++ tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
++ fi
+ fi
+ fi
+ if test "$softmmu" = yes ; then
+@@ -5049,6 +5072,9 @@ fi
+ if test "$fallocate_zero_range" = "yes" ; then
+ echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
+ fi
++if test "$shm_open" = "yes" ; then
++ echo "CONFIG_SHM_OPEN=y" >> $config_host_mak
++fi
+ if test "$posix_fallocate" = "yes" ; then
+ echo "CONFIG_POSIX_FALLOCATE=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
new file mode 100644
index 00000000000..5a0b9b204ad
--- /dev/null
+++ b/emulators/qemu/patches/patch-default-configs_pci.mak
@@ -0,0 +1,11 @@
+$NetBSD: patch-default-configs_pci.mak,v 1.1.2.2 2015/12/22 20:21:43 bsiegert Exp $
+
+--- default-configs/pci.mak.orig 2015-12-16 22:04:48.000000000 +0000
++++ default-configs/pci.mak
+@@ -35,5 +35,5 @@ CONFIG_SDHCI=y
+ CONFIG_EDU=y
+ CONFIG_VGA=y
+ CONFIG_VGA_PCI=y
+-CONFIG_IVSHMEM=$(CONFIG_POSIX)
++CONFIG_IVSHMEM=$(CONFIG_SHM_OPEN)
+ CONFIG_ROCKER=y
diff --git a/emulators/qemu/patches/patch-tests_Makefile b/emulators/qemu/patches/patch-tests_Makefile
index a5d2d9ee027..255f450d39c 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.2 2015/04/29 20:30:53 ryoon Exp $
+$NetBSD: patch-tests_Makefile,v 1.2.4.1 2015/12/22 20:21:43 bsiegert Exp $
Don't link -lutil on SunOS
---- tests/Makefile.orig 2015-04-27 14:08:27.000000000 +0000
+--- tests/Makefile.orig 2015-12-16 22:04:51.000000000 +0000
+++ tests/Makefile
-@@ -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
+@@ -539,8 +539,10 @@ tests/ivshmem-test$(EXESUF): tests/ivshm
+ tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
ifeq ($(CONFIG_POSIX),y)
+ifneq ($(CONFIG_SOLARIS),y)