Update to QEMU 1.2.0

Changes since version 1.1.1:

System emulation

All targets

  * ... QMP error changes go here ...
  * File descriptors can be passed to qemu using the new
    add-fd/remove-fd QMP commands. It is intended that they can
    be used in any place where QEMU would expect a file name.
    This is ensured for disk images, support in other parts of
    QEMU may still be inconsistent.

ARM

  * LPAE (large physical address extensions) are now supported
    for the Cortex-A15 CPU; you can now run a vexpress-a15 model
    with more than 4GB of RAM
  * The new monitor command "dump-guest-memory" creates an ELF
    dump of the guest memory.
  * New board model: i.MX31

PowerPC

  * The pSeries target correctly creates segment size device
    tree nodes (fixes odd bugs with HV vs PR KVM)
  * The pSeries target implements an IOMMU.
  * ... pSeries VGA, USB, etc.? ...
  * The E500 target generates its device tree dynamically
  * New mpc8544ds -machine option: dumpdtb. This allows to dump
    the dynamically generated device tree to a file.
  * Emulation for e5500 cores
  * PC87312 Super I/O chipset emulation for PReP, adding
    parallel port to prep machine

x86

  * Support for PCI passthrough is available for Xen
    fully-virtualized domains.
  * The new monitor command "dump-guest-memory" creates an ELF
    dump of the guest memory.
  * When using KVM, the in-kernel APIC supports MSI.
  * Also when using KVM, new PV EOI feature improves performance
    when both host and guest run linux 3.6-rc1 and up. To
    enable, add +kvm_pv_eoi to -cpu option, e.g.

-cpu kvm64,+kvm_pv_eoi

  * The "cpudef" config file section is being deprecated and may
    be removed in v1.3.

Device emulation

  * VGA and QXL cards (obtained with -vga std and -vga qxl) have
    16 MB of VRAM rather than 8 MB.
  * Three new SCSI host bus adapter devices are available:
    am53c974 and dc390 emulate respectively an AMD PCI PCscsi
    and a Tekram DC-390 device, both of which are supported on
    older operating systems including MS DOS 6.2, MS Windows 3.11,
    98 SE, NT 3.1 and NT 4.0. megasas emulated an LSI SAS1078 RAID
    controller. The next version of SeaBIOS will support booting
    from am53c974 and dc390 disks.
  * An USB-attached SCSI controller is now available.

Audio devices

  * The PC speaker audio card is now available by default.

Network devices

  * The guestfwd argument to slirp now supports running an
    arbitrary command on every TCP connection (as in inetd).
    This is invoked by specifying a target that starts with "cmd:".

Block devices

  * Emulated IDE and SCSI as well as virtio-blk devices can now
    switch the cache mode between writethrough and writeback.
    virtio-blk automatically switches to writethrough if the
    guest driver doesn't support flushes.
  * The default cache mode for images is now writeback.
  * Emulated SCSI devices can be given a custom vendor name,
    product name and WWN.
  * Improved support for passthrough of SCSI tapes and media changers.
  * libiscsi can be used together with scsi-generic to pass
    iSCSI tapes and media changers to the guest.
  * When raw files are streamed, parts of the files that are
    holes in the underlying filesystem are treated as
    unallocated (as long as the OS supports either the FIEMAP
    ioctl or the SEEK_HOLE/SEEK_DATA modes)
  * CD-ROM drives can now be used with AHCI

qcow2

  * qcow2 images support a new option, lazy_refcounts. If on,
    the speed of cache=writethrough mode will be improved, at
    the cost of requiring an fsck-like pass (and thus QEMU 1.2)
    to use the image again after a power loss.
  * qemu-img check can now repair qcow2 and QED images with the
    new -r option.

VMDK

  * Support for images in the streamOptimized subformat has been
    fixed. This is a VMDK subformat commonly used with OVF appliances.

rbd

  * rbd no longer ignores the cache setting

Live Migration, Save/Restore

  * Migration works much better with guests with large memory.
  * USB mass storage and passthrough devices support live migration.

VNC

  * The threaded VNC server is now enabled by default.

Guest agent

  * A new command "fstrim" was added to the guest agent.

New targets

  * OpenRISC is now supported for both user-mode and system emulation.

18 files changed, 58 insertions, 109 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 783e2ec4d0a..71f96d2216c 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2012/08/03 17:51:47 asau Exp $
+# $NetBSD: Makefile,v 1.96 2012/09/11 17:13:44 asau Exp $
 
-DISTNAME=		qemu-1.1.1-1
-PKGNAME=		qemu-1.1.1.1
-PKGREVISION=		1
+DISTNAME=		qemu-1.2.0
 CATEGORIES=		emulators
 MASTER_SITES=		http://wiki.qemu.org/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -17,8 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		qemu-bin-[0-9]*
 NOT_FOR_PLATFORM=	NetBSD-1.[0-6]*-*
 
-WRKSRC=			${WRKDIR}/qemu-1.1.1
-
 USE_TOOLS+=		gmake makeinfo perl:build pkg-config
 UNLIMIT_RESOURCES=	datasize
 HAS_CONFIGURE=		yes
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 5e9f07bab89..a2b3eae45fa 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2012/07/23 11:17:54 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.30 2012/09/11 17:13:44 asau Exp $
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
 ${PLIST.armeb}bin/qemu-armeb
@@ -35,6 +35,7 @@ bin/qemu-system-mips
 bin/qemu-system-mips64
 bin/qemu-system-mips64el
 bin/qemu-system-mipsel
+bin/qemu-system-or32
 bin/qemu-system-ppc
 bin/qemu-system-ppc64
 bin/qemu-system-ppcemb
@@ -43,6 +44,7 @@ bin/qemu-system-sh4
 bin/qemu-system-sh4eb
 bin/qemu-system-sparc
 bin/qemu-system-sparc64
+bin/qemu-system-unicore32
 bin/qemu-system-x86_64
 bin/qemu-system-xtensa
 bin/qemu-system-xtensaeb
@@ -62,6 +64,7 @@ share/qemu/kvmvapic.bin
 share/qemu/palcode-clipper
 share/qemu/sgabios.bin
 share/qemu/keymaps/ar
+share/qemu/keymaps/bepo
 share/qemu/keymaps/common
 share/qemu/keymaps/da
 share/qemu/keymaps/de
@@ -97,7 +100,6 @@ share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
 share/qemu/linuxboot.bin
-share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index cdb28dbcffe..eb3f8197d90 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,20 +1,18 @@
-$NetBSD: distinfo,v 1.77 2012/08/03 17:51:47 asau Exp $
+$NetBSD: distinfo,v 1.78 2012/09/11 17:13:44 asau Exp $
 
-SHA1 (qemu-1.1.1-1.tar.bz2) = 0754fe79279f58445d4a6e2c18afcbc3f0e1bb00
-RMD160 (qemu-1.1.1-1.tar.bz2) = e1fa73652dbcfd234f862ce1979adf16182f00bc
-Size (qemu-1.1.1-1.tar.bz2) = 9635574 bytes
-SHA1 (patch-configure) = 961b4efafaf806f071dde3f65c9f43ae770ca3e2
-SHA1 (patch-ef) = f26f1b860cca477d5e80c9cb2755c8dc6fa593ac
-SHA1 (patch-eg) = f06b9c675717fd54afba0cf2714158b358078a15
-SHA1 (patch-eh) = 9425da879c4809abe6959b402cb98de370f9ceb6
-SHA1 (patch-en) = 01f74603909474d222f9c8bc75c831b5c7393045
-SHA1 (patch-et) = 5755dc6ce5ecd84dfd34bb0e0f64b70c2639d575
-SHA1 (patch-hw-esp.c) = 37a48a1ad525b1efc6f159801aa0be4fb1622f69
-SHA1 (patch-hw_ppc__newworld.c) = 9490186f0189ea4eceaf15132259cf67ec002cc4
-SHA1 (patch-hw_ppc__oldworld.c) = e339647c92c7cbfe67b61b96bc655a47e7af2123
-SHA1 (patch-hw_xilinx__axienet.c) = ffd6a41d7c76ef11d63b27ffc263b668ee569e99
-SHA1 (patch-ioport.c) = 2bf04d5bf59b7e8939b20c168fb618a955bfa5a4
-SHA1 (patch-memory.c) = 6c7485270a5315c7eb174cb988a074fbbb760c3b
-SHA1 (patch-net_tap-bsd.c) = 48b95f1c8433ae460c569d679958fbd706f798e6
-SHA1 (patch-roms_seabios_tools_buildversion.sh) = 5ab15a25f47762a7abe30da0beb7b77facc88b13
-SHA1 (patch-slirp_tcp__subr.c) = 413f508eeb7fae166a3a512bd98dc63314b59af8
+SHA1 (qemu-1.2.0.tar.bz2) = 4bbfb35ca2e386e9b731c09a8eb1187c0c0795a8
+RMD160 (qemu-1.2.0.tar.bz2) = f6ebeeca42e2e694f17ab83cca3652baf7e74d1c
+Size (qemu-1.2.0.tar.bz2) = 9865186 bytes
+SHA1 (patch-configure) = 34ae5e65bc5beb45637303a02c42e9ede33564b6
+SHA1 (patch-ef) = fd9f0ca22b1f3c3950a0ea69ba32252265d2285a
+SHA1 (patch-eg) = 4be8e74d134e0736fa65977d885a9dd3b12e653b
+SHA1 (patch-eh) = 02ada323ac9ba0acf8e4d0746bc7d58abb24b288
+SHA1 (patch-en) = a2fdf12d46cb25004f5f0f6b3e187c59863e3b20
+SHA1 (patch-et) = 5b117320922385d9238c045178a75360545ea051
+SHA1 (patch-hw_ppc__newworld.c) = 043d48be9c4ec2ce2d5d303e379695d86931d242
+SHA1 (patch-hw_ppc__oldworld.c) = 92db10cb063d30226022cc0a810c7e1c7f20bfec
+SHA1 (patch-hw_xilinx__axienet.c) = 9a4c73c8dcf745d31661e0c88d683530d153feaf
+SHA1 (patch-ioport.c) = 3a9fc61cbf72a8cea29d1d168113b48c2f4968a9
+SHA1 (patch-memory.c) = 539f953cb115a35be109a442a190a82785518ef3
+SHA1 (patch-net_tap-bsd.c) = eb5e994a57c6f4291e34af9198ea007dbc21b191
+SHA1 (patch-slirp_tcp__subr.c) = 51ae78f3f04eae9a22568afdbf6e3b2bc3d34187
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index e8244a56a57..47de785f280 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.1 2012/06/25 10:07:21 sbd Exp $
+$NetBSD: patch-configure,v 1.2 2012/09/11 17:13:45 asau Exp $
 
---- configure.orig	2012-06-01 09:13:13.000000000 +0000
+--- configure.orig	2012-09-05 14:03:06.000000000 +0000
 +++ configure
-@@ -2854,6 +2854,9 @@ if test "$debug" = "no" ; then
-   CFLAGS="-O2 $CFLAGS"
+@@ -1190,6 +1190,9 @@ else
+     exit 1
  fi
  
 +# hw/usb/hcd_ehci.c will not compile with -O3 optimization.
diff --git a/emulators/qemu/patches/patch-ef b/emulators/qemu/patches/patch-ef
index 20fb5b3e197..b7a3fc0bda5 100644
--- a/emulators/qemu/patches/patch-ef
+++ b/emulators/qemu/patches/patch-ef
@@ -1,11 +1,11 @@
-$NetBSD: patch-ef,v 1.3 2011/08/22 12:00:34 ryoon Exp $
+$NetBSD: patch-ef,v 1.4 2012/09/11 17:13:45 asau 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	2011-08-08 18:28:42 +0000
+--- audio/audio.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ audio/audio.c
-@@ -1162,7 +1162,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, 
+@@ -1171,7 +1171,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 53e8c4cb0c0..db93a32257d 100644
--- a/emulators/qemu/patches/patch-eg
+++ b/emulators/qemu/patches/patch-eg
@@ -1,9 +1,9 @@
-$NetBSD: patch-eg,v 1.4 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-eg,v 1.5 2012/09/11 17:13:45 asau 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-06-01 09:13:13.000000000 +0000
+--- hw/etraxfs_eth.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ hw/etraxfs_eth.c
 @@ -184,7 +184,7 @@ static void mdio_read_req(struct qemu_md
  
diff --git a/emulators/qemu/patches/patch-eh b/emulators/qemu/patches/patch-eh
index 8971377e81b..445fd5070f7 100644
--- a/emulators/qemu/patches/patch-eh
+++ b/emulators/qemu/patches/patch-eh
@@ -1,9 +1,9 @@
-$NetBSD: patch-eh,v 1.4 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-eh,v 1.5 2012/09/11 17:13:45 asau 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-06-01 09:13:13.000000000 +0000
+--- hw/omap_dss.c.orig	2012-09-05 14:03:06.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 14db3862bb3..7d8d19a5b4b 100644
--- a/emulators/qemu/patches/patch-en
+++ b/emulators/qemu/patches/patch-en
@@ -1,6 +1,6 @@
-$NetBSD: patch-en,v 1.4 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-en,v 1.5 2012/09/11 17:13:45 asau Exp $
 
---- tcg/arm/tcg-target.h.orig	2012-06-01 09:13:13.000000000 +0000
+--- tcg/arm/tcg-target.h.orig	2012-09-05 14:03:07.000000000 +0000
 +++ tcg/arm/tcg-target.h
 @@ -85,7 +85,7 @@ static inline void flush_icache_range(tc
                                        tcg_target_ulong stop)
diff --git a/emulators/qemu/patches/patch-et b/emulators/qemu/patches/patch-et
index 5d4aa7b1361..6f121b1d0ff 100644
--- a/emulators/qemu/patches/patch-et
+++ b/emulators/qemu/patches/patch-et
@@ -1,8 +1,8 @@
-$NetBSD: patch-et,v 1.4 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-et,v 1.5 2012/09/11 17:13:45 asau Exp $
 
---- Makefile.orig	2012-06-01 09:13:13.000000000 +0000
+--- Makefile.orig	2012-09-05 14:03:06.000000000 +0000
 +++ Makefile
-@@ -288,9 +288,10 @@ install-datadir:
+@@ -295,9 +295,10 @@ install-datadir:
  install-confdir:
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
  
diff --git a/emulators/qemu/patches/patch-hw-esp.c b/emulators/qemu/patches/patch-hw-esp.c
deleted file mode 100644
index f46512929c5..00000000000
--- a/emulators/qemu/patches/patch-hw-esp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: patch-hw-esp.c,v 1.1 2012/06/18 19:25:38 martin Exp $
-
-# Commands that do not use DMA do not need to be defered untill DMA is
-# enabled, https://bugs.launchpad.net/qemu/+bug/1014099
-
---- hw/esp.c.orig	2012-06-01 11:13:13.000000000 +0200
-+++ hw/esp.c	2012-06-18 01:43:34.000000000 +0200
-@@ -270,7 +270,7 @@ static void handle_satn(ESPState *s)
-     uint8_t buf[32];
-     int len;
- 
--    if (!s->dma_enabled) {
-+    if (s->dma && !s->dma_enabled) {
-         s->dma_cb = handle_satn;
-         return;
-     }
-@@ -284,7 +284,7 @@ static void handle_s_without_atn(ESPStat
-     uint8_t buf[32];
-     int len;
- 
--    if (!s->dma_enabled) {
-+    if (s->dma && !s->dma_enabled) {
-         s->dma_cb = handle_s_without_atn;
-         return;
-     }
-@@ -296,7 +296,7 @@ static void handle_s_without_atn(ESPStat
- 
- static void handle_satn_stop(ESPState *s)
- {
--    if (!s->dma_enabled) {
-+    if (s->dma && !s->dma_enabled) {
-         s->dma_cb = handle_satn_stop;
-         return;
-     }
diff --git a/emulators/qemu/patches/patch-hw_ppc__newworld.c b/emulators/qemu/patches/patch-hw_ppc__newworld.c
index 3c735373128..9442601dc4d 100644
--- a/emulators/qemu/patches/patch-hw_ppc__newworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc__newworld.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_ppc__newworld.c,v 1.2 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-hw_ppc__newworld.c,v 1.3 2012/09/11 17:13:45 asau Exp $
 
 Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
 
---- hw/ppc_newworld.c.orig	2012-06-01 09:13:13.000000000 +0000
+--- hw/ppc_newworld.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ hw/ppc_newworld.c
 @@ -116,7 +116,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;
  }
-@@ -231,7 +231,7 @@ static void ppc_core99_init (ram_addr_t 
+@@ -234,7 +234,7 @@ static void ppc_core99_init (ram_addr_t 
          }
          /* load initrd */
          if (initrd_filename) {
@@ -22,7 +22,7 @@ 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) {
-@@ -239,11 +239,11 @@ static void ppc_core99_init (ram_addr_t 
+@@ -242,11 +242,11 @@ static void ppc_core99_init (ram_addr_t 
                           initrd_filename);
                  exit(1);
              }
diff --git a/emulators/qemu/patches/patch-hw_ppc__oldworld.c b/emulators/qemu/patches/patch-hw_ppc__oldworld.c
index 5ae82de2813..2deffd2dd66 100644
--- a/emulators/qemu/patches/patch-hw_ppc__oldworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc__oldworld.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_ppc__oldworld.c,v 1.2 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-hw_ppc__oldworld.c,v 1.3 2012/09/11 17:13:45 asau Exp $
 
 Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
 
---- hw/ppc_oldworld.c.orig	2012-06-01 09:13:13.000000000 +0000
+--- hw/ppc_oldworld.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ hw/ppc_oldworld.c
 @@ -60,7 +60,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;
  }
-@@ -175,7 +175,7 @@ static void ppc_heathrow_init (ram_addr_
+@@ -178,7 +178,7 @@ static void ppc_heathrow_init (ram_addr_
          }
          /* load initrd */
          if (initrd_filename) {
@@ -22,7 +22,7 @@ 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) {
-@@ -183,11 +183,11 @@ static void ppc_heathrow_init (ram_addr_
+@@ -186,11 +186,11 @@ static void ppc_heathrow_init (ram_addr_
                           initrd_filename);
                  exit(1);
              }
diff --git a/emulators/qemu/patches/patch-hw_xilinx__axienet.c b/emulators/qemu/patches/patch-hw_xilinx__axienet.c
index cff6066f9d3..2e8e3cef7e4 100644
--- a/emulators/qemu/patches/patch-hw_xilinx__axienet.c
+++ b/emulators/qemu/patches/patch-hw_xilinx__axienet.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_xilinx__axienet.c,v 1.2 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-hw_xilinx__axienet.c,v 1.3 2012/09/11 17:13:45 asau Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 
---- hw/xilinx_axienet.c.orig	2012-06-01 09:13:13.000000000 +0000
+--- hw/xilinx_axienet.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ hw/xilinx_axienet.c
 @@ -189,7 +189,7 @@ static uint16_t mdio_read_req(struct MDI
  
diff --git a/emulators/qemu/patches/patch-ioport.c b/emulators/qemu/patches/patch-ioport.c
index 324d3edba2c..473997921e1 100644
--- a/emulators/qemu/patches/patch-ioport.c
+++ b/emulators/qemu/patches/patch-ioport.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-ioport.c,v 1.5 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-ioport.c,v 1.6 2012/09/11 17:13:45 asau Exp $
 
---- ioport.c.orig	2012-06-01 09:13:13.000000000 +0000
+--- ioport.c.orig	2012-09-05 14:03:06.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 78b3d454b03..07a6c05f8b5 100644
--- a/emulators/qemu/patches/patch-memory.c
+++ b/emulators/qemu/patches/patch-memory.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-memory.c,v 1.1 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-memory.c,v 1.2 2012/09/11 17:13:45 asau Exp $
 
---- memory.c.orig	2012-06-01 09:13:13.000000000 +0000
+--- memory.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ memory.c
 @@ -311,7 +311,7 @@ static void memory_region_read_accessor(
      MemoryRegion *mr = opaque;
diff --git a/emulators/qemu/patches/patch-net_tap-bsd.c b/emulators/qemu/patches/patch-net_tap-bsd.c
index 126a4da8f92..276ccfe4369 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.1 2012/08/03 17:51:47 asau Exp $
+$NetBSD: patch-net_tap-bsd.c,v 1.2 2012/09/11 17:13:45 asau Exp $
 
 Make it understand "-net tap,ifname=tap3" on NetBSD.
 
---- net/tap-bsd.c.orig	2012-07-17 18:11:14.000000000 +0000
+--- net/tap-bsd.c.orig	2012-09-05 14:03:06.000000000 +0000
 +++ net/tap-bsd.c
-@@ -49,7 +49,7 @@ int tap_open(char *ifname, int ifname_si
+@@ -43,7 +43,7 @@ int tap_open(char *ifname, int ifname_si
      struct stat s;
  #endif
  
diff --git a/emulators/qemu/patches/patch-roms_seabios_tools_buildversion.sh b/emulators/qemu/patches/patch-roms_seabios_tools_buildversion.sh
deleted file mode 100644
index a7f1da314b9..00000000000
--- a/emulators/qemu/patches/patch-roms_seabios_tools_buildversion.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-roms_seabios_tools_buildversion.sh,v 1.1 2012/06/07 21:23:46 ryoon Exp $
-
---- roms/seabios/tools/buildversion.sh.orig	2012-06-01 09:17:03.000000000 +0000
-+++ roms/seabios/tools/buildversion.sh
-@@ -15,7 +15,7 @@ VERSION="${VERSION}-`date +"%Y%m%d_%H%M%
- echo "Version: ${VERSION}"
- 
- # Build header file
--if [ "$VAR16MODE" == "VAR16" ]; then
-+if [ "$VAR16MODE" = "VAR16" ]; then
-     cat > ${OUTFILE} <<EOF
- #include "types.h"
- char VERSION[] VAR16 = "${VERSION}";
diff --git a/emulators/qemu/patches/patch-slirp_tcp__subr.c b/emulators/qemu/patches/patch-slirp_tcp__subr.c
index e1d66578e1d..7259ad56e45 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.2 2012/06/07 21:23:46 ryoon Exp $
+$NetBSD: patch-slirp_tcp__subr.c,v 1.3 2012/09/11 17:13:45 asau Exp $
 
---- slirp/tcp_subr.c.orig	2012-06-01 09:13:13.000000000 +0000
+--- slirp/tcp_subr.c.orig	2012-09-05 14:03:06.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 ));