Update to 1.7.0, from tsutsui.

Changes:

System emulation

Device emulation

Audio

    The HDA device emulation now includes a mixer by default.
    Previously this had to be enabled with the configure argument
    "--enable-mixemu" when building QEMU.
    Audio will work correctly on systems without OSS (/dev/dsp).
    On previous versions, those systems needed special arguments
    to "configure" for audio to work out of the box.
    Audio honors the QEMU_AUDIO_TIMER_PERIOD environment variable
    and has less CPU utilization by default than previous versions.

Block devices

    Support for the LSI 53C810 SCSI HBA, which unlike the 895A is
    supported on some very old Windows NT versions.

Device assignment

    VFIO now supports setting CPU affinity on MSI interrupts.
    VFIO can now reset assigned devices much more reliably using
    either PCI function-level reset (FLR), power management, or a
    reset (done by the kernel) of the parent bridge.
    Several improvements to the reliability of using option ROMs
    for devices that are assigned with VFIO.

USB

    Performance and functionality improvements for USB 3.0.

MicroBlaze

    Can now specify an initrd on the command line.

PowerPC

    PowerPC now supports the dump-guest-memory command.

s390x

    The "nmi" command will trigger a crash dump from kdump, using
    a RESTART interrupt.
    The SCLP line-mode console ("operating system messages") can
    be accessed with "-device sclplmconsole".

x86

    ACPI tables can be generated by QEMU and can be used by firmware
    directly. This will in the future enable new features without
    modifications of all firmware components (SeaBIOS, OVMF,
    CoreBoot)
    Initial support for supporting more than 1TB of RAM (but firmware
    does not yet support this).
    Xen HVM domains can now resume from suspend-to-RAM (S3) state.

Monitor

    Subcommands (like "info block") can now autocomplete their
    options.
    Help for a single subcommand can be printed with a monitor
    command such as "help info block".
    New commands "blockdev-snapshot-internal-sync",
    "blockdev-snapshot-delete-internal-sync" improve support for
    internal qcow2 snapshot.
    New command "blockdev-add" provides a QMP interface for block
    device hotplug.

Block devices

    The throttling algorithm has been rewritten; the new code is
    more robust, and supports configuration of separate limits for
    sustained I/O vs. I/O bursts

Migration

    Migration was broken from QEMU <= 1.5 to 1.6; the new release
    fixes it.

User-mode emulation

    M68K ColdFire emulation supports atomic system calls.

Block devices, qemu-img, qemu-io

    The sheepdog driver supports automatic reconnect after network
    errors
    The VMDK driver supports files produced by VMWare ESX.
    The qcow2 driver can detect some cases of corruption, and will
    prevent writing to a corrupted image.
    The VHDX driver supports creating and writing .vhdx images.
    The metadata of a file (where each sector of the guest image
    is stored in the file on the host) can be dumped in human-readable
    or JSON format using a new command "qemu-img map".

Guest agent

    The "filesystem freeze/thaw" commands are now supported on
    Windows too, where they will invoke the native Volume Shadow
    Copy Service (VSS).

Miscellaneous

    For targets that have no embedded disassembler, QEMU will now
    produce hexadecimal dumps instead of just emitting an error
    when a disassembly is requested. The enclosed script disas-objdump.pl
    can be used, together with an external objdump program, to
    convert the dump to a readable disassembly.

Host support

    TCG now runs on x32 hosts.

Known issues

    On Win32, QEMU must be compiled with --disable-coroutine-pool
    to work around a suspected compiler bug.
    The GTK terminal windows (monitor, serial console, parallel,
    ...) are still unusable in TCG mode: they lose characters and
    can raise deadlocks.

15 files changed, 85 insertions, 46 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 018bf4db389..b903eb1c30f 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.120 2014/01/11 13:08:59 adam Exp $
+# $NetBSD: Makefile,v 1.121 2014/01/15 18:26:20 wiz Exp $
 
-DISTNAME=	qemu-1.6.2
+DISTNAME=	qemu-1.7.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 ebdd84511b6..aafb70949a0 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2013/08/16 21:20:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2014/01/15 18:26:20 wiz Exp $
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
 ${PLIST.armeb}bin/qemu-armeb
@@ -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
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index a2973bbfc8d..03dbd620c68 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.91 2014/01/11 13:08:59 adam Exp $
+$NetBSD: distinfo,v 1.92 2014/01/15 18:26:20 wiz Exp $
 
-SHA1 (qemu-1.6.2.tar.bz2) = c8761fbef3258ca639c99cee221d9e7a0117c7df
-RMD160 (qemu-1.6.2.tar.bz2) = 62bc7f1e7a92905629f619046be65bd57f3e2896
-Size (qemu-1.6.2.tar.bz2) = 12059106 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
diff --git a/emulators/qemu/patches/patch-ef b/emulators/qemu/patches/patch-ef
index 9b38f21a842..bfef9ae57d5 100644
--- a/emulators/qemu/patches/patch-ef
+++ b/emulators/qemu/patches/patch-ef
@@ -1,11 +1,11 @@
-$NetBSD: patch-ef,v 1.6 2013/07/09 17:00:58 tsutsui Exp $
+$NetBSD: patch-ef,v 1.7 2014/01/15 18:26:20 wiz 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	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;
      }
  
diff --git a/emulators/qemu/patches/patch-et b/emulators/qemu/patches/patch-et
index 13365128570..e8ed9a4736c 100644
--- a/emulators/qemu/patches/patch-et
+++ b/emulators/qemu/patches/patch-et
@@ -1,8 +1,8 @@
-$NetBSD: patch-et,v 1.12 2013/10/27 16:33:25 hubertf Exp $
+$NetBSD: patch-et,v 1.13 2014/01/15 18:26:20 wiz 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:33:25 hubertf Exp $
  
  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)"
  
diff --git a/emulators/qemu/patches/patch-hw_display_omap__dss.c b/emulators/qemu/patches/patch-hw_display_omap__dss.c
index 9aa61116e8b..fca1167bf30 100644
--- a/emulators/qemu/patches/patch-hw_display_omap__dss.c
+++ b/emulators/qemu/patches/patch-hw_display_omap__dss.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-hw_display_omap__dss.c,v 1.1 2013/07/09 17:00:58 tsutsui Exp $
+$NetBSD: patch-hw_display_omap__dss.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
 
 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;
diff --git a/emulators/qemu/patches/patch-hw_net_etraxfs__eth.c b/emulators/qemu/patches/patch-hw_net_etraxfs__eth.c
index 2d3f3ae3ede..834cf8dfb1b 100644
--- a/emulators/qemu/patches/patch-hw_net_etraxfs__eth.c
+++ b/emulators/qemu/patches/patch-hw_net_etraxfs__eth.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-hw_net_etraxfs__eth.c,v 1.2 2013/08/16 21:20:11 adam Exp $
+$NetBSD: patch-hw_net_etraxfs__eth.c,v 1.3 2014/01/15 18:26:20 wiz Exp $
 
 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 NetBSD's <ssp/unistd.h>
      } 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];
diff --git a/emulators/qemu/patches/patch-hw_net_xilinx__axienet.c b/emulators/qemu/patches/patch-hw_net_xilinx__axienet.c
index 1aa2313e3cc..af632b972de 100644
--- a/emulators/qemu/patches/patch-hw_net_xilinx__axienet.c
+++ b/emulators/qemu/patches/patch-hw_net_xilinx__axienet.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-hw_net_xilinx__axienet.c,v 1.1 2013/07/09 17:00:58 tsutsui Exp $
+$NetBSD: patch-hw_net_xilinx__axienet.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
 
 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
  
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
index eabba0c2f00..69db887e3ea 100644
--- a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.1 2013/10/13 12:37:58 ryoon Exp $
+$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
 
 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;
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
index 1885396dcc7..f8aab728723 100644
--- a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.1 2013/10/13 12:37:58 ryoon Exp $
+$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
 
 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;
diff --git a/emulators/qemu/patches/patch-include_exec_softmmu__template.h b/emulators/qemu/patches/patch-include_exec_softmmu__template.h
new file mode 100644
index 00000000000..d054d2730b2
--- /dev/null
+++ b/emulators/qemu/patches/patch-include_exec_softmmu__template.h
@@ -0,0 +1,36 @@
+$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
diff --git a/emulators/qemu/patches/patch-memory.c b/emulators/qemu/patches/patch-memory.c
index 455a5776269..5b8dda15571 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.7 2013/10/13 12:37:58 ryoon Exp $
+$NetBSD: patch-memory.c,v 1.8 2014/01/15 18:26:20 wiz 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) {
diff --git a/emulators/qemu/patches/patch-slirp_tcp__subr.c b/emulators/qemu/patches/patch-slirp_tcp__subr.c
index 65169ef7d64..fd650974c70 100644
--- a/emulators/qemu/patches/patch-slirp_tcp__subr.c
+++ b/emulators/qemu/patches/patch-slirp_tcp__subr.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-slirp_tcp__subr.c,v 1.5 2013/07/09 17:00:58 tsutsui Exp $
+$NetBSD: patch-slirp_tcp__subr.c,v 1.6 2014/01/15 18:26:20 wiz 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;
diff --git a/emulators/qemu/patches/patch-user-exec.c b/emulators/qemu/patches/patch-user-exec.c
index 81bd528ea8c..5c5580ddd76 100644
--- a/emulators/qemu/patches/patch-user-exec.c
+++ b/emulators/qemu/patches/patch-user-exec.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-user-exec.c,v 1.3 2013/08/16 21:20:11 adam Exp $
+$NetBSD: patch-user-exec.c,v 1.4 2014/01/15 18:26:20 wiz Exp $
 
 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, 
  
diff --git a/emulators/qemu/patches/patch-util_hbitmap.c b/emulators/qemu/patches/patch-util_hbitmap.c
index 1e6eae97d29..23cbc6e1ede 100644
--- a/emulators/qemu/patches/patch-util_hbitmap.c
+++ b/emulators/qemu/patches/patch-util_hbitmap.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-util_hbitmap.c,v 1.2 2013/07/09 17:00:58 tsutsui Exp $
+$NetBSD: patch-util_hbitmap.c,v 1.3 2014/01/15 18:26:20 wiz Exp $
 
 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];