A dump patch to update pkgsrc/emulators/qemu to 1.7.0

pkgsrc-emulators-qemu-1.7.0.diff

Update files:
 - Makefile
  bump revision
 - PLIST
  add two new files (tested only on NetBSD/i386 6.1)
 - distinfo
  update
 - patches/patch-include_exec_softmmu__template.h (new)
  fix build error on NetBSD
 - patches/patch-slirp_tcp__subr.c
   dumb mechanically applied change (could be wrong)

? patches/patch-include_exec_softmmu__template.h
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile	27 Oct 2013 16:33:25 -0000	1.119
+++ Makefile	15 Dec 2013 17:39:11 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.119 2013/10/27 16:33:25 hubertf Exp $
 s
-DISTNAME=	qemu-1.6.1
-PKGREVISION=	1
+DISTNAME=	qemu-1.7.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/PLIST,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST
--- PLIST	16 Aug 2013 21:20:11 -0000	1.36
+++ PLIST	15 Dec 2013 17:39:11 -0000
@@ -59,6 +59,7 @@ 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,tcx.bin
 share/qemu/acpi-dsdt.aml
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
@@ -71,6 +72,7 @@ share/qemu/efi-virtio.rom
 share/qemu/keymaps/ar
 share/qemu/keymaps/bepo
 share/qemu/keymaps/common
+share/qemu/keymaps/cz
 share/qemu/keymaps/da
 share/qemu/keymaps/de
 share/qemu/keymaps/de-ch
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/distinfo,v
retrieving revision 1.90
diff -u -p -r1.90 distinfo
--- distinfo	27 Oct 2013 16:33:25 -0000	1.90
+++ distinfo	18 Dec 2013 14:25:38 -0000
@@ -1,16 +1,17 @@
 $NetBSD: distinfo,v 1.90 2013/10/27 16:33:25 hubertf Exp $
 
-SHA1 (qemu-1.6.1.tar.bz2) = ad3ef3709a8ce3a39bd343aa313cefd033afb561
-RMD160 (qemu-1.6.1.tar.bz2) = 96dcbb044812ab0349741bd62eb8e6b79552442f
-Size (qemu-1.6.1.tar.bz2) = 12041317 bytes
-SHA1 (patch-ef) = 871ccf29463dec1bd56d7f7808248c5b1af4d4d6
-SHA1 (patch-et) = 2c063468081f9b38d8adfdf4886e1ecb0f97529f
-SHA1 (patch-hw_display_omap__dss.c) = af89754a9a078a5b52240473d85351bd447623c0
-SHA1 (patch-hw_net_etraxfs__eth.c) = 444c6f8a8ad26d9762bfc8a0672afbc7b858fc9d
-SHA1 (patch-hw_net_xilinx__axienet.c) = 02461c2cd2985c352626e46ba93844606783460e
-SHA1 (patch-hw_ppc_mac__newworld.c) = e4179ed931be622175d32e6f04a1ecbd7c462d80
-SHA1 (patch-hw_ppc_mac__oldworld.c) = 75e3f5ef4df52188dae2bbfc6c30e23a42c27ed3
-SHA1 (patch-memory.c) = 928e97532946723da8dd0728f08cdfbfee4fd749
-SHA1 (patch-slirp_tcp__subr.c) = 430157ea8a92fe1d6fc4f1f22ea5530641315fe1
-SHA1 (patch-user-exec.c) = ba20197b7c1209357568817cc56d31f8aa5b1905
-SHA1 (patch-util_hbitmap.c) = 372fcbad5272205cd354bc7760ead77e017b07d1
+SHA1 (qemu-1.7.0.tar.bz2) = 4b5a21a614207e74a61659f7a6edecad6c31be95
+RMD160 (qemu-1.7.0.tar.bz2) = 0d16f3e59219ebd88177b827ba3d4874cbe9aff2
+Size (qemu-1.7.0.tar.bz2) = 12248954 bytes
+SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
+SHA1 (patch-et) = 036e1a254ce40df635dfb6107d2707879467e127
+SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
+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
+SHA1 (patch-util_hbitmap.c) = 7ca62f7f7a82526007d034dfe7d5e2d4ff96f900
Index: patches/patch-ef
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ef,v
retrieving revision 1.6
diff -u -p -r1.6 patch-ef
--- patches/patch-ef	9 Jul 2013 17:00:58 -0000	1.6
+++ patches/patch-ef	15 Dec 2013 17:39:11 -0000
@@ -3,9 +3,9 @@ $NetBSD: patch-ef,v 1.6 2013/07/09 17:00
 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	2013-06-26 21:47:29.000000000 +0000
+--- audio/audio.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ audio/audio.c
-@@ -1172,7 +1172,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, 
+@@ -1173,7 +1173,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, 
          return 0;
      }
  
Index: patches/patch-et
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-et,v
retrieving revision 1.12
diff -u -p -r1.12 patch-et
--- patches/patch-et	27 Oct 2013 16:33:25 -0000	1.12
+++ patches/patch-et	15 Dec 2013 17:39:11 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-et,v 1.12 2013/10/27 16:33:25 hubertf Exp $
 
---- Makefile.orig	2013-10-09 19:20:32.000000000 +0000
+--- Makefile.orig	2013-11-27 22:15:55.000000000 +0000
 +++ Makefile
-@@ -148,6 +148,7 @@ $(SRC_PATH)/pixman/configure:
+@@ -155,6 +155,7 @@ $(SRC_PATH)/pixman/configure:
  DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
  DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
  DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
@@ -10,7 +10,7 @@ $NetBSD: patch-et,v 1.12 2013/10/27 16:3
  
  subdir-dtc:dtc/libfdt dtc/tests
  	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
-@@ -329,8 +330,9 @@ endif
+@@ -340,8 +341,9 @@ endif
  install-confdir:
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
  
Index: patches/patch-hw_display_omap__dss.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-hw_display_omap__dss.c
--- patches/patch-hw_display_omap__dss.c	9 Jul 2013 17:00:58 -0000	1.1
+++ patches/patch-hw_display_omap__dss.c	15 Dec 2013 17:39:11 -0000
@@ -3,7 +3,7 @@ $NetBSD: patch-hw_display_omap__dss.c,v 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/display/omap_dss.c.orig	2013-06-26 21:47:29.000000000 +0000
+--- hw/display/omap_dss.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ hw/display/omap_dss.c
 @@ -791,18 +791,18 @@ static void omap_rfbi_write(void *opaque
          break;
Index: patches/patch-hw_net_etraxfs__eth.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-hw_net_etraxfs__eth.c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-hw_net_etraxfs__eth.c
--- patches/patch-hw_net_etraxfs__eth.c	16 Aug 2013 21:20:11 -0000	1.2
+++ patches/patch-hw_net_etraxfs__eth.c	15 Dec 2013 17:39:11 -0000
@@ -3,7 +3,7 @@ $NetBSD: patch-hw_net_etraxfs__eth.c,v 1
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/net/etraxfs_eth.c.orig	2013-06-26 21:47:29.000000000 +0000
+--- hw/net/etraxfs_eth.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ hw/net/etraxfs_eth.c
 @@ -185,7 +185,7 @@ static void mdio_read_req(struct qemu_md
  
@@ -14,7 +14,7 @@ Avoid conflicts with SSP read() macro in
      } else {
          bus->data = 0xffff;
      }
-@@ -364,7 +364,7 @@ static void eth_validate_duplex(struct f
+@@ -364,7 +364,7 @@ static void eth_validate_duplex(ETRAXFSE
      int new_mm = 0;
  
      phy = eth->mdio_bus.devs[eth->phyaddr];
Index: patches/patch-hw_net_xilinx__axienet.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-hw_net_xilinx__axienet.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-hw_net_xilinx__axienet.c
--- patches/patch-hw_net_xilinx__axienet.c	9 Jul 2013 17:00:58 -0000	1.1
+++ patches/patch-hw_net_xilinx__axienet.c	15 Dec 2013 17:39:11 -0000
@@ -3,7 +3,7 @@ $NetBSD: patch-hw_net_xilinx__axienet.c,
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/net/xilinx_axienet.c.orig	2013-06-26 21:47:29.000000000 +0000
+--- hw/net/xilinx_axienet.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ hw/net/xilinx_axienet.c
 @@ -207,7 +207,7 @@ static uint16_t mdio_read_req(struct MDI
  
Index: patches/patch-hw_ppc_mac__newworld.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-hw_ppc_mac__newworld.c
--- patches/patch-hw_ppc_mac__newworld.c	13 Oct 2013 12:37:58 -0000	1.1
+++ patches/patch-hw_ppc_mac__newworld.c	15 Dec 2013 17:39:11 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-hw_ppc_mac__newworld.c,v 
 
 Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
 
---- hw/ppc/mac_newworld.c.orig	2013-10-09 19:20:32.000000000 +0000
+--- hw/ppc/mac_newworld.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ hw/ppc/mac_newworld.c
 @@ -125,7 +125,7 @@ static uint64_t translate_kernel_address
      return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
Index: patches/patch-hw_ppc_mac__oldworld.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-hw_ppc_mac__oldworld.c
--- patches/patch-hw_ppc_mac__oldworld.c	13 Oct 2013 12:37:58 -0000	1.1
+++ patches/patch-hw_ppc_mac__oldworld.c	15 Dec 2013 17:39:11 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-hw_ppc_mac__oldworld.c,v 
 
 Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
 
---- hw/ppc/mac_oldworld.c.orig	2013-10-09 19:20:32.000000000 +0000
+--- hw/ppc/mac_oldworld.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ hw/ppc/mac_oldworld.c
 @@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
      return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
Index: patches/patch-memory.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-memory.c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-memory.c
--- patches/patch-memory.c	13 Oct 2013 12:37:58 -0000	1.7
+++ patches/patch-memory.c	15 Dec 2013 17:39:11 -0000
@@ -1,6 +1,6 @@
 $NetBSD: patch-memory.c,v 1.7 2013/10/13 12:37:58 ryoon Exp $
 
---- memory.c.orig	2013-10-09 19:20:32.000000000 +0000
+--- memory.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ memory.c
 @@ -404,7 +404,7 @@ static void memory_region_read_accessor(
      if (mr->flush_coalesced_mmio) {
Index: patches/patch-slirp_tcp__subr.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-slirp_tcp__subr.c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-slirp_tcp__subr.c
--- patches/patch-slirp_tcp__subr.c	9 Jul 2013 17:00:58 -0000	1.5
+++ patches/patch-slirp_tcp__subr.c	17 Dec 2013 16:29:54 -0000
@@ -1,9 +1,9 @@
 $NetBSD: patch-slirp_tcp__subr.c,v 1.5 2013/07/09 17:00:58 tsutsui Exp $
 
---- slirp/tcp_subr.c.orig	2013-06-26 21:47:29.000000000 +0000
+--- slirp/tcp_subr.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ slirp/tcp_subr.c
-@@ -341,6 +341,8 @@ int tcp_fconnect(struct socket *so)
-     qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
+@@ -340,6 +340,8 @@ int tcp_fconnect(struct socket *so)
+     socket_set_fast_reuse(s);
      opt = 1;
      qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
 +    opt = 1;
Index: patches/patch-user-exec.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-user-exec.c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-user-exec.c
--- patches/patch-user-exec.c	16 Aug 2013 21:20:11 -0000	1.3
+++ patches/patch-user-exec.c	15 Dec 2013 17:39:11 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-user-exec.c,v 1.3 2013/08
 
 Add OS dependent code for NetBSD/arm.
 
---- user-exec.c.orig	2013-08-15 19:56:23.000000000 +0000
+--- user-exec.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ user-exec.c
 @@ -434,19 +434,31 @@ int cpu_signal_handler(int host_signum, 
  
Index: patches/patch-util_hbitmap.c
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-util_hbitmap.c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_hbitmap.c
--- patches/patch-util_hbitmap.c	9 Jul 2013 17:00:58 -0000	1.2
+++ patches/patch-util_hbitmap.c	15 Dec 2013 17:39:11 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-util_hbitmap.c,v 1.2 2013
 
 Avoid conflicts against popcountl(3) in NetBSD's libc.
 
---- util/hbitmap.c.orig	2013-06-26 21:47:30.000000000 +0000
+--- util/hbitmap.c.orig	2013-11-27 22:15:55.000000000 +0000
 +++ util/hbitmap.c
 @@ -92,7 +92,7 @@ struct HBitmap {
      unsigned long *levels[HBITMAP_LEVELS];

--- /dev/null	2013-12-15 17:26:33.000000000 +0000
+++ patches/patch-include_exec_softmmu__template.h	2013-12-15 17:36:23.000000000 +0000
@@ -0,0 +1,36 @@
+$NetBSD$
+
+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