Wed Aug 12 06:55:59 2015 UTC ()
Update to 2.4.0

Changelog:
# System emulation

## Incompatible changes
* The handling of the floppy device controller is different between <2.4 and >=2.4 machine types that use the Q35 chipset (e.g. "-M pc-q35-2.3" vs. "-M pc-q35-2.4"). This can cause problems if you are defining floppy drives with command-line options such as "-global isa-fdc.driveA=id.
* The ARM 'virt' board default interface type has changed from IDE to virtio. This means that some incorrect command lines that we previously silently accepted will now fail with an error message like "qemu-system-arm: -drive file=img.qcow2,id=foo: Drive 'foo' is already in use because it has been automatically connected to another device (did you need 'if=none' in the drive options?)". As the error message suggests, you should add "if=none" to the -drive option to fix this.

## 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.
* Host floppy device pass-through (block driver "host_floppy") is deprecated, and will be dropped in a future release.
* Block device parameter aio=native has no effect without cache.direct=on. 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 configure option --disable-guest-base is unneeded and will be removed in a future release.

## Alpha
* Major fixes to the implementation of floating point exceptions.

## ARM
* New board model xlnx-ep108
* Support for ACPI v5.1 tables in the "-M virt" board.
* Support for instantiation sysbus devices from the command line (using "-device") in the "-M virt" board.
* Emulation of the stream ID for MSI writes, for use in GICv3.
* The "virt" board default drive type is now virtio; this means that drives created with if=virtio or with no if= specification will be created as drives plugged into a virtio-blk-pci device. Short form options like -hda will also create this kind of drive. (Note that at time of writing Linux only supports the virt board's PCI controller for 32-bit ARM kernels; support has not yet made it into the 64-bit kernels. So 64-bit guests will need to continue using long command lines and virtio-mmio for now.) Unfortunately this means that some old command lines will need to change -- see the "incompatible changes" section above for details.

## MIPS
* More accurate emulation of the dp8393x network card and RC4030 DMA/IOMMU controller.
* Support for microMIPS32 R6 emulation (enabled in new "-cpu mips32r6-generic")
* Support for unaligned R6 and MSA memory accesses in TCG
* Support for XPA in MIPS32 and LPA in MIPS64 (eXtended and Large Physical Addressing) emulation
* Support for MIPS UHI semihosting

## PowerPC
* The default RAM size for the pseries machine is 512 MB.
* Support of PCI device hotplug on SPAPR (pSeries).

## s390
* Channel I/O is now available when running with TCG. Thus, the default machine for qemu-system-s390x is now s390-ccw.
* Several other fixes for TCG (emulation) mode.
* Extended name and UUID in STSI 3.2.2 information block
* Support for reading/writing guest memory while holding the IPTE lock under KVM, including access register mode
* Various cleanups in the s390-virtio and virtio-ccw transports
* Support for diag288 watchdog (KVM only).
* Support for vector registers
* Add virtio-1 specific ccws to virtio-ccw (SET_REV and v1 version of SET_VQ)
** Revision 1 (and therefore virtio 1.0) is not yet enabled, however.
* The s390-ccw-virtio machine is now versioned; the first versioned machine is s390-ccw-virtio-2.4
** The s390-ccw alias has been removed

## SH
* Optimizations to code generated by TCG.

## SPARC
* Fix SunOS 4.1.4 boot on sun4m with OpenBIOS

## x86
* Improvements to system management mode emulation, including support for high SMRAM and TSEG on machines using the Q35 chipset.
* q35 machine types starting with pc-q35-2.4.0 do not have a floppy disk controller. It will be created if you use "-drive if=floppy", "-fda" or "-fdb" to add a floppy disk drive, or it can be created if necessary with "-device isa-fdc".
* q35 now implements the TCO watchdog. Unlike real hardware, the watchdog is disabled when the virtual machine boot, so as to let existing firmware run with new QEMU. This may change in the future, but the change would be restricted to new machine types.

## KVM
* Support for MMIO operations outside the "big QEMU lock". For now, this only applies to the ACPI PM timer, which can alone improve performance substantially for very large Windows guests as long as they do not span multiple NUMA nodes in the host. For guests that span multiple NUMA nodes more kernel changes are required.
* Support for system management mode (requires Linux 4.1).
* When running under KVM, CPUID information includes the ARAT ("Always running APIC timer") bit

# Device emulation and assignment
## ACPI
* Support for memory hot-unplug.
* S3/S4 states can be disabled for boards using the Q35 machine type via "-global ICH9_LPC.disable_s3=on" and"-global ICH9_LPC.disable_s4=on"

## Block devices
* Minimal support in NVMe emulation for the NVME_VOLATILE_WRITE_CACHE feature.
* The infamous floppy device controller is not added to Q35 boards if not explicitly requested and no floppy drives are specified with "-drive if=floppy".
* I/O throttling now supports "groups" so multiple disks can use share a budget (use -drive groups=<name>)
* Performance of the parallels image format block driver has been improved

## Character devices
* Improved support for flow control in virtio-serial.

## IDE
* Fix macio CDROM detection for PPC
* Fix macio data corruption bug under Darwin/OS X PPC
* AHCI support rerror=stop and werror=stop.

## Mouse/keyboard
* Support for virtio-keyboard, virtio-mouse, virtio-tablet.

## Network
* Support for the "rocker" L2 switch device.

## SCSI
* scsi-generic now supports migration.

## PCI/PCIe
* Support for extra PCI root buses using PCI expander bridge devices. Unlike PCI-PCI bridges, a PCI expander bridge's bus can be associated with a NUMA node, allowing the guest OS to recognize the proximity of a device to RAM and CPUs.

## TPM
* Support for TPM 2

## VFIO
* Support for resetting AMD Bonaire and Hawaii GPUs
* Platform device passthrough support for Calxeda xgmac devices

## virtio
* Support for up to 1024 queues.
* Support for ioeventfd in virtio-mmio.
* FIXME: virtio 1
* New virtio-gpu device (only supports accelerated 2D for now)
* New virtio-input-host, virtio-keyboard, virtio-mouse and virtio-tablet devices (and corresponding virtio-*-pci devices for use on a PCI bus).
* Support for cross-endian vhost (i.e. little-endian host and big-endian guest, or vice versa).
* vhost can now be enabled even if MSI-X is not
* virtio-balloon can tell the guest that it should deflate the balloon on OOM conditions.

## VGA
* Support for virtio-vga, a VGA device that also supports the virtio-gpu interface.

## Character devices
* Improved support for flow control in spice-char.

## GUI
* Support for OpenGL-based display rendering in the SDL2 and GTK+ backend. This is preparatory work for 3D acceleration.
* Improvements to the Cocoa front-end, fixing full-screen mode and adding a list of consoles to the View menu.
* The two extra keys in Brazilian 107-key keyboards are now usable.

## Monitor
* qmp: New MIGRATION event to communicate change in the migration state

## Migration
* Support for compression of RAM data using multiple threads for compression and decompression (using migration capability "compress" and migration parameters "compress_threads", "compress_level" and "decompress_threads").

## Network
* Support for multi-queue vhost-user backends.

## Block devices in system emulation
* The BLOCK_IMAGE_CORRUPTED event has a new "node-name" field.
* FIXME: Throttle groups
* Block device mirroring supports concurrent unmap (aka discard or trim) operations on the source device and can create a thin-provisioned image in this case.
* Block device mirroring can use discard or "write zero" operations to speed up copying of large zero regions.
* FIXME: incremental backup?

## Command-line options
* A longhand version of -global (-global driver=DRIVER,property=PROP,value=VAL) is introduced, to set properties globally for devices that have a period in their name. The older syntax -global DRIVER.PROP=VAL did not allow this.
* New option -fw_cfg to pass arbitrary binary data to the guest.

## TCG
* New command line option "-icount sleep=no". The option will run emulation at the maximum possible speed: every time the CPU would go to sleep, the virtual clock will move to the next timer deadline. For virtual machines that have no other sources of non-determinism (e.g. asynchronous block I/O, character devices or user input) this will also make execution deterministic.

# Block devices and tools
* The "null" block device now has a new "latency-ns" option to delay the answer from the block device.
* The iscsi driver can use the target's FUA capabilities to greatly improve roundtrip times in write-through caching modes (cache.writeback=off). These modes are recommended when the storage has a non-volatile (battery-backed) cache.
* Parallels format driver now supports image creation and write to the image. Performance is significantly improved.
* qcow2 performance improvements.
* qemu-io supports encrypted qcow2 images (which are deprecated).

# Audio
* Obsolete audio backends have been removed: esd (superseded by pulseaudio), winwave (superseded by dsound), fmod (not compatible with the GPL)

# Guest agent
* Support for building a .msi file with the Windows version of the guest agent ("make msi"). This requires msitools.
* qemu-ga implements guest-get-fsinfo and guest-network-get-interfaces on Windows too

# User-mode emulation
* The default CPU for qemu-sh4 and qemu-sh4eb is the sh7785.

# Build dependencies
* QEMU now requires a minimum glib version of 2.22. (In particular, we will no longer build on a stock RHEL5 or Centos 5 system.)
* QEMU can now optionally be linked against tcmalloc.
* QEMU now compiles using clang 3.5 without warnings, which includes disabling GCC features not supported by clang.
* QEMU now compiles with ICC.
* libepoxy is required to compile QEMU with OpenGL support.
* Building on Mac OS X versions earlier than 10.5 is no longer supported.
* Sound on Windows now requires DirectSound (the old 'winwave' default audio backend has been dropped).

# Known issues
* SDL audio only works with SDL 1.x.
* Problems with QEMU for Windows and builds from newer versions of MinGW-w64, see this thread on qemu-devel (this is not a regression, other versions are also affected)
** Crash of 64-bit QEMU (Fix)
** Broken networking (Fix)
* Incomplete translations for GTK user interface


(ryoon)
diff -r1.140 -r1.141 pkgsrc/emulators/qemu/Makefile
diff -r1.42 -r1.43 pkgsrc/emulators/qemu/PLIST
diff -r1.104 -r1.105 pkgsrc/emulators/qemu/distinfo
diff -r1.13 -r1.14 pkgsrc/emulators/qemu/patches/patch-et
diff -r1.1 -r0 pkgsrc/emulators/qemu/patches/patch-hw_block_fdc.c
diff -r1.8 -r1.9 pkgsrc/emulators/qemu/patches/patch-memory.c

cvs diff -r1.140 -r1.141 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2015/06/12 10:50:04 1.140
+++ pkgsrc/emulators/qemu/Makefile 2015/08/12 06:55:59 1.141
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.140 2015/06/12 10:50:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.141 2015/08/12 06:55:59 ryoon Exp $
2 2
3DISTNAME= qemu-2.3.0 3DISTNAME= qemu-2.4.0
4PKGREVISION= 2 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= http://wiki.qemu.org/download/ 5MASTER_SITES= http://wiki.qemu.org/download/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu.org/ 9HOMEPAGE= http://www.qemu.org/
11COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 12
14CONFLICTS+= qemu-bin-[0-9]* 13CONFLICTS+= qemu-bin-[0-9]*
15NOT_FOR_PLATFORM+= NetBSD-1.[0-6]*-* 14NOT_FOR_PLATFORM+= NetBSD-1.[0-6]*-*
16# qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565. 15# qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565.
17# As a workaround, use emulators/qemu0. 16# As a workaround, use emulators/qemu0.
@@ -28,30 +27,26 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../ @@ -28,30 +27,26 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../
28 27
29.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
30 29
31CONFIGURE_ARGS+= --prefix=${PREFIX} 30CONFIGURE_ARGS+= --prefix=${PREFIX}
32CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 31CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
33CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
34CONFIGURE_ARGS+= --python=${PYTHONBIN} 33CONFIGURE_ARGS+= --python=${PYTHONBIN}
35CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 34CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
36CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 35CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
37CONFIGURE_ARGS+= --enable-curses 36CONFIGURE_ARGS+= --enable-curses
38#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X 37#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X
39CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 38CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
40 39
41CONF_FILES= ${EGDIR}/target-x86_64.conf \ 
42 ${PKG_SYSCONFDIR}/target-x86_64.conf 
43EGDIR= ${PREFIX}/share/examples/qemu 
44INSTALL_MAKE_FLAGS= egdir=${EGDIR} 
45PKG_SYSCONFSUBDIR= qemu 40PKG_SYSCONFSUBDIR= qemu
46 41
47REPLACE_PERL+= scripts/texi2pod.pl 42REPLACE_PERL+= scripts/texi2pod.pl
48 43
49PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported yet as of 1.7.0 44PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported yet as of 1.7.0
50 45
51BUILDLINK_PASSTHRU_DIRS+= /usr/lib 46BUILDLINK_PASSTHRU_DIRS+= /usr/lib
52BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib 47BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
53 48
54INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 49INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
55 50
56UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel 51UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel
57UE_ARCHS+= or32 ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus 52UE_ARCHS+= or32 ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus

cvs diff -r1.42 -r1.43 pkgsrc/emulators/qemu/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/PLIST 2015/06/10 20:40:11 1.42
+++ pkgsrc/emulators/qemu/PLIST 2015/08/12 06:55:59 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.42 2015/06/10 20:40:11 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.43 2015/08/12 06:55:59 ryoon Exp $
2${PLIST.alpha}bin/qemu-alpha 2${PLIST.alpha}bin/qemu-alpha
3${PLIST.arm}bin/qemu-arm 3${PLIST.arm}bin/qemu-arm
4${PLIST.armeb}bin/qemu-armeb 4${PLIST.armeb}bin/qemu-armeb
5${PLIST.cris}bin/qemu-cris 5${PLIST.cris}bin/qemu-cris
6bin/qemu-ga 6bin/qemu-ga
7${PLIST.i386}bin/qemu-i386 7${PLIST.i386}bin/qemu-i386
8bin/qemu-img 8bin/qemu-img
9bin/qemu-io 9bin/qemu-io
10${PLIST.m68k}bin/qemu-m68k 10${PLIST.m68k}bin/qemu-m68k
11${PLIST.microblaze}bin/qemu-microblaze 11${PLIST.microblaze}bin/qemu-microblaze
12${PLIST.microblazeel}bin/qemu-microblazeel 12${PLIST.microblazeel}bin/qemu-microblazeel
13${PLIST.mips}bin/qemu-mips 13${PLIST.mips}bin/qemu-mips
14${PLIST.mipsel}bin/qemu-mipsel 14${PLIST.mipsel}bin/qemu-mipsel
@@ -50,27 +50,26 @@ bin/qemu-system-sparc64 @@ -50,27 +50,26 @@ bin/qemu-system-sparc64
50bin/qemu-system-tricore 50bin/qemu-system-tricore
51bin/qemu-system-unicore32 51bin/qemu-system-unicore32
52bin/qemu-system-x86_64 52bin/qemu-system-x86_64
53bin/qemu-system-xtensa 53bin/qemu-system-xtensa
54bin/qemu-system-xtensaeb 54bin/qemu-system-xtensaeb
55${PLIST.x86_64}bin/qemu-x86_64 55${PLIST.x86_64}bin/qemu-x86_64
56man/man1/qemu-img.1 56man/man1/qemu-img.1
57man/man1/qemu.1 57man/man1/qemu.1
58man/man8/qemu-nbd.8 58man/man8/qemu-nbd.8
59share/doc/qemu/Makefile.multinode-NetBSD 59share/doc/qemu/Makefile.multinode-NetBSD
60share/doc/qemu/qemu-doc.html 60share/doc/qemu/qemu-doc.html
61share/doc/qemu/qemu-tech.html 61share/doc/qemu/qemu-tech.html
62share/doc/qemu/qmp-commands.txt 62share/doc/qemu/qmp-commands.txt
63share/examples/qemu/target-x86_64.conf 
64share/qemu/QEMU,cgthree.bin 63share/qemu/QEMU,cgthree.bin
65share/qemu/QEMU,tcx.bin 64share/qemu/QEMU,tcx.bin
66share/qemu/acpi-dsdt.aml 65share/qemu/acpi-dsdt.aml
67share/qemu/bamboo.dtb 66share/qemu/bamboo.dtb
68share/qemu/bios-256k.bin 67share/qemu/bios-256k.bin
69share/qemu/bios.bin 68share/qemu/bios.bin
70share/qemu/efi-e1000.rom 69share/qemu/efi-e1000.rom
71share/qemu/efi-eepro100.rom 70share/qemu/efi-eepro100.rom
72share/qemu/efi-ne2k_pci.rom 71share/qemu/efi-ne2k_pci.rom
73share/qemu/efi-pcnet.rom 72share/qemu/efi-pcnet.rom
74share/qemu/efi-rtl8139.rom 73share/qemu/efi-rtl8139.rom
75share/qemu/efi-virtio.rom 74share/qemu/efi-virtio.rom
76share/qemu/keymaps/ar 75share/qemu/keymaps/ar
@@ -129,15 +128,16 @@ share/qemu/pxe-virtio.rom @@ -129,15 +128,16 @@ share/qemu/pxe-virtio.rom
129share/qemu/q35-acpi-dsdt.aml 128share/qemu/q35-acpi-dsdt.aml
130share/qemu/qemu-icon.bmp 129share/qemu/qemu-icon.bmp
131share/qemu/qemu_logo_no_text.svg 130share/qemu/qemu_logo_no_text.svg
132share/qemu/s390-ccw.img 131share/qemu/s390-ccw.img
133share/qemu/s390-zipl.rom 132share/qemu/s390-zipl.rom
134share/qemu/sgabios.bin 133share/qemu/sgabios.bin
135share/qemu/slof.bin 134share/qemu/slof.bin
136share/qemu/spapr-rtas.bin 135share/qemu/spapr-rtas.bin
137share/qemu/trace-events 136share/qemu/trace-events
138share/qemu/u-boot.e500 137share/qemu/u-boot.e500
139share/qemu/vgabios-cirrus.bin 138share/qemu/vgabios-cirrus.bin
140share/qemu/vgabios-qxl.bin 139share/qemu/vgabios-qxl.bin
141share/qemu/vgabios-stdvga.bin 140share/qemu/vgabios-stdvga.bin
 141share/qemu/vgabios-virtio.bin
142share/qemu/vgabios-vmware.bin 142share/qemu/vgabios-vmware.bin
143share/qemu/vgabios.bin 143share/qemu/vgabios.bin

cvs diff -r1.104 -r1.105 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2015/05/16 03:19:54 1.104
+++ pkgsrc/emulators/qemu/distinfo 2015/08/12 06:55:59 1.105
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1$NetBSD: distinfo,v 1.104 2015/05/16 03:19:54 khorben Exp $ 1$NetBSD: distinfo,v 1.105 2015/08/12 06:55:59 ryoon Exp $
2 2
3SHA1 (qemu-2.3.0.tar.bz2) = 373d74bfafce1ca45f85195190d0a5e22b29299e 3SHA1 (qemu-2.4.0.tar.bz2) = 27c4651243ad885a2a3b35fe6d2532e6a7f0711e
4RMD160 (qemu-2.3.0.tar.bz2) = cb203bf3faa316c9eb4ceeb975441deab6f9b2f7 4RMD160 (qemu-2.4.0.tar.bz2) = f3b5ce602574aec28a5b5e43591248d4358ec5f7
5Size (qemu-2.3.0.tar.bz2) = 24683085 bytes 5Size (qemu-2.4.0.tar.bz2) = 25070979 bytes
6SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856 6SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856
7SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a 7SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
8SHA1 (patch-et) = 036e1a254ce40df635dfb6107d2707879467e127 8SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
9SHA1 (patch-hw_block_fdc.c) = a49f714266b767953d78aa42492cde3ba4ecb06a 
10SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 9SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
11SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 10SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
12SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 11SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
13SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5 12SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
14SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463 13SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
15SHA1 (patch-memory.c) = 14df9c835ca318fc79a8d3a46bb94d2f229277cc 14SHA1 (patch-memory.c) = f5193fb86a6fad5864477dafc4651d3d51147cc8
16SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820 15SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
17SHA1 (patch-tests_Makefile) = 44ec206f8061274d0c0a7ca0d4a3e2dbe936fafa 16SHA1 (patch-tests_Makefile) = 44ec206f8061274d0c0a7ca0d4a3e2dbe936fafa

cvs diff -r1.13 -r1.14 pkgsrc/emulators/qemu/patches/Attic/patch-et (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/Attic/patch-et 2014/01/15 18:26:20 1.13
+++ pkgsrc/emulators/qemu/patches/Attic/patch-et 2015/08/12 06:55:59 1.14
@@ -1,24 +1,12 @@ @@ -1,24 +1,12 @@
1$NetBSD: patch-et,v 1.13 2014/01/15 18:26:20 wiz Exp $ 1$NetBSD: patch-et,v 1.14 2015/08/12 06:55:59 ryoon Exp $
2 2
3--- Makefile.orig 2013-11-27 22:15:55.000000000 +0000 3--- Makefile.orig 2015-08-11 19:11:05.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -155,6 +155,7 @@ $(SRC_PATH)/pixman/configure: 5@@ -189,6 +189,7 @@ $(SRC_PATH)/pixman/configure:
6 DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt 6 DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
7 DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) 7 DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
8 DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt 8 DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
9+ARFLAGS= -rcs 9+ARFLAGS= -rcs
10  10
11 subdir-dtc:dtc/libfdt dtc/tests 11 subdir-dtc:dtc/libfdt dtc/tests
12 $(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,) 12 $(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,)
13@@ -340,8 +341,9 @@ endif 
14 install-confdir: 
15 $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)" 
16  
17-install-sysconfig: install-datadir install-confdir 
18- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" 
19+install-sysconfig: 
20+ $(INSTALL_DIR) "$(DESTDIR)$(egdir)" 
21+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(egdir)" 
22  
23 install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ 
24 install-datadir install-localstatedir 

File Deleted: pkgsrc/emulators/qemu/patches/Attic/patch-hw_block_fdc.c

cvs diff -r1.8 -r1.9 pkgsrc/emulators/qemu/patches/Attic/patch-memory.c (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/Attic/patch-memory.c 2014/01/15 18:26:20 1.8
+++ pkgsrc/emulators/qemu/patches/Attic/patch-memory.c 2015/08/12 06:55:59 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-memory.c,v 1.8 2014/01/15 18:26:20 wiz Exp $ 1$NetBSD: patch-memory.c,v 1.9 2015/08/12 06:55:59 ryoon Exp $
2 2
3--- memory.c.orig 2013-11-27 22:15:55.000000000 +0000 3--- memory.c.orig 2015-08-11 19:11:09.000000000 +0000
4+++ memory.c 4+++ memory.c
5@@ -404,7 +404,7 @@ static void memory_region_read_accessor( 5@@ -396,7 +396,7 @@ static MemTxResult memory_region_read_a
6 if (mr->flush_coalesced_mmio) { 6 {
7 qemu_flush_coalesced_mmio_buffer(); 7 uint64_t tmp;
8 } 8
9- tmp = mr->ops->read(mr->opaque, addr, size); 9- tmp = mr->ops->read(mr->opaque, addr, size);
10+ tmp = (*mr->ops->read)(mr->opaque, addr, size); 10+ tmp = (mr->ops->read)(mr->opaque, addr, size);
11 trace_memory_region_ops_read(mr, addr, tmp, size); 11 trace_memory_region_ops_read(mr, addr, tmp, size);
12 *value |= (tmp & mask) << shift; 12 *value |= (tmp & mask) << shift;
13 } 13 return MEMTX_OK;