Changes 2.0.0:

Incompatible changes
All onboard buses now have distinct names, so that all of them can be reached with "-device bus=...". As a result of this, some buses that used to have duplicates got renamed:
i2c-bus.0 to i2c-bus.1 for machines n800, n810;
virtio-mmio-bus.0 to virtio-mmio-bus.3 for vexpress-a15, vexpress-a9;
virtio-mmio-bus.0 to virtio-mmio-bus.31 for virt;
usb-bus.0 to usb-bus.1 for xilinx-zynq-a9, fulong2e;
ide.0 to ide.1 for isapc, mips, g3beige, mac99, prep;
This change requires care when doing migration from 1.x to 2.x QEMU; you need to specify bus=NEW explicitly on the destination for devices on the renamed bus.
Another bus rename is pci to pci.0 for pseries. This does not require as much care on migration; if you were specifying "bus=pci" explicitly, QEMU will not start unless you change that to "bus=pci.0".
qemu-system-arm no longer defaults to the obsolete "integratorcp" if no machine is specified on the command line (this was a recurring source of confusion). Users with existing integratorcp images will need to add "-M integratorcp" to the command line if it is not already present.
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".
Starting with QEMU 2.1, -readconfig will standardize on the name fo the command line option.
ARM
Support for "-M virt", a board type that only uses virtio devices
Support for "-cpu host" when running under KVM
Support for new 32-bit mode ARMv8 instructions in TCG
Support for all 64-bit mode ARMV8 user-accessible instructions except for the optional CRC and crypto extensions
Support for AArch64 disassembling (requires a C++ compiler to be installed on the host)
Initial support for KVM on AArch64 systems (some features such as migration are not yet implemented)
Support for the Canon PowerShot A1100 DIGIC board using "-M canon-a1100"
Support for the allwinner-a10-based board "-M cubieboard"
Support for flow control in the Cadence UART
"integratorcp" is no longer the default machine (see the 'incompatible changes' section above)
Power
Support for Altivec 2.07 and VSX instructions when running under TCG
Support for ISA 2.06 "load/store quadword instructions", "divide extended instructions" and "floating-point test instructions" when running under TCG
PReP is not anymore (incorrectly) included in qemu-system-ppcemb
Improved support for "-nodefaults" on the pSeries machine. Display devices created with "-device VGA" will be handled correctly in the device tree.
Support for boot order in pSeries emulation
s390
Support for adapter interrupts in virtio-cc2
SPARC
Support for Sun CG3 framebuffer with the Sun4m machine. The CG3 framebuffer can be requested with "-vga cg3".
Support for the CASA compare-and-swap instruction in TCG.
x86
On the Q35 machine, the HPET interrupt can now be attached to GSIs 16-23, like on real hardware.
The Q35 machine now supports CPU hotplug.
Two flash chips can be specified using the "-drive if=pflash" or "-pflash" options twice.
Memory layout has changed slightly; to improve performance, the PIIX4 machine ("-M pc") now has 3GB of low memory instead of 3.5GB if the guest has more than 3.5GB of memory. Similarly, the Q35 machine ("-M q35") now has 2GB instead of 2.75GB of low memory if the guest has more than 2.75GB of overall memory.
Support for migration of Intel MPX registers.
The Apple SMC device is now exposed in the ACPI tables.
On the PIIX machine, PCI hotplug now supports devices behind a bridge (only for bridges not added by hotplug; hot-plugged bridges can still use the PCI Standard Hot-Plug Controller).
Support for the Hyper-V reference time counter via the "hv-time" suboption of "-cpu". This can improve performance of Windows guests substantially for applications that do many floating-point or SIMD operations. (Requires KVM and Linux 3.14).
The distributed qemupciserial.inf file now allows installing multiport PCI serial devices on Windows too.
ACPI tables generated by QEMU can now be used by OVMF firmware. OVMF starting with SVN r15420 is needed. In particular hotplug, pvpanic device and other ACPI based features now work for OVMF.
KVM
x2apic is now enabled by default when KVM is in use.
Xen
PCI passthrough of devices with a ROM now works.
Xtensa
added support for ML605 and KC705 FPGA boards.
Cache-related opcodes now correctly check privilege level/memory accessibility.

4 files changed, 10 insertions, 44 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index e9a3b3a76a3..72ca81557d9 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.123 2014/04/01 06:47:42 adam Exp $
+# $NetBSD: Makefile,v 1.124 2014/04/18 15:50:16 adam Exp $
 
-DISTNAME=	qemu-1.7.1
+DISTNAME=	qemu-2.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index aafb70949a0..448968184b0 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2014/01/15 18:26:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.38 2014/04/18 15:50:16 adam Exp $
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
 ${PLIST.armeb}bin/qemu-armeb
@@ -24,6 +24,7 @@ ${PLIST.sparc}bin/qemu-sparc
 ${PLIST.sparc32plus}bin/qemu-sparc32plus
 ${PLIST.sparc64}bin/qemu-sparc64
 ${PLIST.unicore32}bin/qemu-unicore32
+bin/qemu-system-aarch64
 bin/qemu-system-alpha
 bin/qemu-system-arm
 bin/qemu-system-cris
@@ -59,9 +60,11 @@ 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/QEMU,cgthree.bin
 share/qemu/QEMU,tcx.bin
 share/qemu/acpi-dsdt.aml
 share/qemu/bamboo.dtb
+share/qemu/bios-256k.bin
 share/qemu/bios.bin
 share/qemu/efi-e1000.rom
 share/qemu/efi-eepro100.rom
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 1bbab026665..42233148eb9 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.93 2014/04/01 06:47:42 adam Exp $
+$NetBSD: distinfo,v 1.94 2014/04/18 15:50:16 adam Exp $
 
-SHA1 (qemu-1.7.1.tar.bz2) = 6606a3091bdf4ee028df3d16fe20d495150ff2c5
-RMD160 (qemu-1.7.1.tar.bz2) = 911394542106b88ff44df410827aae4aad0cd096
-Size (qemu-1.7.1.tar.bz2) = 12246206 bytes
+SHA1 (qemu-2.0.0.tar.bz2) = cc24a60a93ba697057a67b6a7224b95627eaf1a6
+RMD160 (qemu-2.0.0.tar.bz2) = ecd05e036431c14930ae2455a032495dd7ebaf85
+Size (qemu-2.0.0.tar.bz2) = 12839647 bytes
 SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
 SHA1 (patch-et) = 036e1a254ce40df635dfb6107d2707879467e127
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
@@ -10,7 +10,6 @@ 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-include_exec_softmmu__template.h) = 65f5ab7c3c66bb28323769974cb3d65170d0e70d
 SHA1 (patch-memory.c) = 14df9c835ca318fc79a8d3a46bb94d2f229277cc
 SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
 SHA1 (patch-user-exec.c) = eb83832c7c9e5f69313f8cad2c2f77b304072556
diff --git a/emulators/qemu/patches/patch-include_exec_softmmu__template.h b/emulators/qemu/patches/patch-include_exec_softmmu__template.h
deleted file mode 100644
index d054d2730b2..00000000000
--- a/emulators/qemu/patches/patch-include_exec_softmmu__template.h
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-include_exec_softmmu__template.h,v 1.1 2014/01/15 18:26:20 wiz Exp $
-
-On NetBSD, uintNN_t types are defined as __uintNN_t
-so concatenations "u ## intNN_t" won't work as expected.
-
---- include/exec/softmmu_template.h.orig	2013-11-27 22:15:55.000000000 +0000
-+++ include/exec/softmmu_template.h
-@@ -30,24 +30,26 @@
- #define SUFFIX q
- #define LSUFFIX q
- #define SDATA_TYPE  int64_t
-+#define DATA_TYPE  uint64_t
- #elif DATA_SIZE == 4
- #define SUFFIX l
- #define LSUFFIX l
- #define SDATA_TYPE  int32_t
-+#define DATA_TYPE  uint32_t
- #elif DATA_SIZE == 2
- #define SUFFIX w
- #define LSUFFIX uw
- #define SDATA_TYPE  int16_t
-+#define DATA_TYPE  uint16_t
- #elif DATA_SIZE == 1
- #define SUFFIX b
- #define LSUFFIX ub
- #define SDATA_TYPE  int8_t
-+#define DATA_TYPE  uint8_t
- #else
- #error unsupported data size
- #endif
- 
--#define DATA_TYPE   glue(u, SDATA_TYPE)
--
- /* For the benefit of TCG generated code, we want to avoid the complication
-    of ABI-specific return type promotion and always return a value extended
-    to the register size of the host.  This is tcg_target_long, except in the