pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/qemu Update to 0.10.6. Tested on DragonFly o...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67c249577127
branches:  trunk
changeset: 398469:67c249577127
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Mon Aug 31 10:18:49 2009 +0000

description:
Update to 0.10.6. Tested on DragonFly only.

version 0.10.6:
  - e1000: ignore reset command (Kevin Wolf)
  - fix VNC memory allocation (Stefan Weil)
  - fix raw_pread_aligned return value (Christoph Hellwig)
  - allow monitor interaction when using -incoming exec: (Chris Lalancette)
  - fix -net socket,listen (Jan Kiszka)
  - live migration: don't send gratuitous packets all at once (Gleb Natapov)
  - serial: fix lost characters after sysrq (Jason Wessel)
  - Fix prototype of zfree (Stefan Weil)
  - Handle EINTR with exec: migration (Uri Lublin)
  - Delete io-handler before closing fd after migration (Uri Lublin)
  - Fix qemu_aio_flush (Andrea Arcangeli)
  - lsi53c895a: Implement additional registers (Sebastian Herbszt)
  - virtio-blk: fix warning (Gerd Hoffman)
  - i386: fix cpu reset (Nitin Kamble)
  - kvm: fix irq injection into full queue (Jan Kiszka)
  - Prevent CD-ROM eject while device is locked (Mark McLoughlin)
  - Fix screen dump with blank screen (Eduardo Habkost)
  - Fix memory leak with cpu_unregister_map_client (Isaku Yamahata)
  - Fix memory leak in SDL (Jan Kiszka)
  - Fix build on OS X 10.4 (John Arbuckle)
  - Fix leak of vlan clients after hot remove (Mark McLoughlin)
  - Fix migration after hot remove with eepro100 (Mark McLoughlin)
  - Don't start a VM after failed migration if stopped (Anthony Liguori)
  - Fix live migration under heavy IO load (Glauber Costa)
  - Honor -S on incoming migration (Paolo Bonzini)
  - Reset HPET config register on reset (Beth Kon)
  - Reset PS2 keyboard/mouse on reset (Dinesh Subraveti)

version 0.10.5:
  - kvm: trim unsupported cpu features from cpuid (Avi Kivity)
  - kvm: provide a better error message for -smp > 1 (Mark McLoughlin)
  - Remove initrd printfs (Richard Jones)
  - Initial variables found by valgrind (Jean-Christophe Dubois)
  - Fix -initrd with > 4GB guests (Glauber Costa)
  - Fix busy loop on live migration for certain platforms (Uri Lublin)
  - Remove GCC 3.x requirements from docs (Hollis Blanchard)
  - ETRAX: fixes for kernel command line, ethernet address, bmi (Edgar Iglesias)
  - CRIS: Fix bmi (Edgar Iglesias)
  - Fix bounce buffer errors (Avi Kivity)
  - Fix regression in -kernel (Anthony Liguori)

version 0.10.4:
  - Improve block range checks to remove integer overflow (Kevin Wolf)
  - e1000: do not re-init PCI config space 0 (Amit Shah)
  - fix AIO deletion race (Alex Graf)
  - reset option roms on reboot (Glauber Costa)
  - fix qcow2 corruption in cluster freeing (Gleb Natapov)
  - Enable power button event generation (Gleb Natapov)

version 0.10.3:
  - fix AIO cancellations (Avi Kivity)
  - fix live migration error path on incoming
  - avoid SEGV on pci hotplug failure (Chris Wright)
  - fix serial option in -drive
  - support DDIM for option roms (Glauber Costa)
  - avoid fork/exec on pre-2.6.27 kernels with KVM (Jan Kiszka)
  - block-vpc: don't silently create smaller images than requested (Kevin Wolf)
  - Fix non-ACPI timer interrupt routing (Beth Kon)
  - hpet: fix emulation of HPET_TN_SETVAL (Jan Kiszka)
  - kvm: fix cpuid initialization (Jan Kiszka)
  - qcow2: fix corruption on little endian hosts (Kevin Wolf)
  - avoid leaing memory on hot unplug (Mark McLoughlin)
  - fix savevm/migration after hot unplug (Mark McLoughlin)
  - Fix keyboard mapping on newer Xords with non-default keymaps (balrog)
  - Make PCI config status register read-only (Anthony Liguori)
  - Fix crash on resolution change -> screen dump -> vga redraw (Avi Kivity)

version 0.10.2:

  - fix savevm/loadvm (Anthony Liguori)
  - live migration: fix dirty tracking windows (Glauber Costa)
  - live migration: improve error propogation (Glauber Costa)
  - qcow2: fix image creation for > ~2TB images (Chris Wright)
  - hotplug: fix error handling for if= parameter (Eduardo Habkost)
  - qcow2: fix data corruption (Nolan Leake)
  - virtio: fix guest oops with 2.6.25 kernels (Rusty Russell)
  - SH4: add support for -kernel (Takashi Yoshii, Aurelien Jarno)
  - hotplug: fix closing of char devices (Jan Kiszka)
  - hotplug: remove incorrect check for device name (Eduardo Habkost)
  - enable -k on win32 (Herve Poussineau)
  - configure: use LANG=C for grep (Andreas Faerber)
  - fix VGA regression (malc)

version 0.10.1:

  - virtio-net: allow masking of notifications on empty queue (Alex Williamson)
  - e1000: fix rx descriptor low threshold logic (Alex Willaimson)
  - x86 tcg: add NULL checks to lsl instruction (Jan Kiszka)
  - kvm vga: fix screen corruption with -std-vga and Windows (Avi Kivity)
  - kvm vga: fix screen corruption with Ubuntu installations (Glauber Costa)
  - virtio-net: check right return size on sg list (Alex Williamson)
  - Make qemu_announce_self handle holes (live migration after hotplug)
    (Marcelo Tosatti)
  - Revert r6804-r6808 (qcow2 allocation info).  This series of changes added
    a high cost to startup for large qcow2 images (Anthony Liguori)
  - qemu-img: fix help message (Aurelien Jarno)
  - Fix build for non-default installs of SDL (Anthony Liguori)
  - Fix race condition in env->interrupt_request.  When using TCG and a dynticks
    host timer, this condition could cause TCG to get stuck in an infinite
    loop (Aurelien Jarno)
  - Fix reading encrypted hard disk passwords during early startup (Jan Kiszka)
  - Fix encrypted disk reporting in 'info block' (Jan Kiszka)
  - Fix console size with tiny displays (MusicPal) (Jan Kiszka)
  - Improve error handling in bdrv_open2 (Jan Kiszka)
  - Avoid leaking data in mux'ed character devices (Jan Kiszka)
  - Fix initial character device reset (no banner in monitor) (Jan Kiszka)
  - Fix cpuid KVM crash on i386 host (Lubomir Rintel)
  - Fix SLES10sp2 installation by adding ISTAT1 register to LSI SCSI emulation
    (Ryan Harper)

version 0.10.0:

  - TCG support (No longer requires GCC 3.x)
  - Kernel Virtual Machine acceleration support
  - BSD userspace emulation
  - Bluetooth emulation and host passthrough support
  - GDB XML register description support
  - Intel e1000 emulation
  - HPET emulation
  - VirtIO paravirtual device support
  - Marvell 88w8618 / MusicPal emulation
  - Nokia N-series tablet emulation / OMAP2 processor emulation
  - PCI hotplug support
  - Live migration and new save/restore formats
  - Curses display support
  - qemu-nbd utility to mount supported block formats
  - Altivec support in PPC emulation and new firmware (OpenBIOS)
  - Multiple VNC clients are now supported
  - TLS encryption is now supported in VNC
  - MIPS Magnum R4000 machine (Hervé Poussineau)
  - Braille support (Samuel Thibault)
  - Freecom MusicPal system emulation (Jan Kiszka)
  - OMAP242x and Nokia N800, N810 machines (Andrzej Zaborowski)
  - EsounD audio driver (Frederick Reeve)
  - Gravis Ultrasound GF1 sound card (Tibor "TS" Schütz)
  - Many, many, bug fixes and new features

diffstat:

 emulators/qemu/Makefile         |  42 ++++++------------
 emulators/qemu/PLIST            |   8 +++-
 emulators/qemu/distinfo         |  32 +++++++------
 emulators/qemu/patches/patch-aa |  26 -----------
 emulators/qemu/patches/patch-ab |  26 -----------
 emulators/qemu/patches/patch-ac |  73 --------------------------------
 emulators/qemu/patches/patch-ad |  15 ------
 emulators/qemu/patches/patch-ae |  12 -----
 emulators/qemu/patches/patch-ag |  77 ----------------------------------
 emulators/qemu/patches/patch-ak |  57 -------------------------
 emulators/qemu/patches/patch-am |  13 -----
 emulators/qemu/patches/patch-aw |  24 ----------
 emulators/qemu/patches/patch-ax |  24 ----------
 emulators/qemu/patches/patch-ay |  92 -----------------------------------------
 emulators/qemu/patches/patch-da |  13 +++++
 emulators/qemu/patches/patch-db |  32 ++++++++++++++
 emulators/qemu/patches/patch-dc |  15 ++++++
 emulators/qemu/patches/patch-dd |  29 ++++++++++++
 emulators/qemu/patches/patch-de |  13 +++++
 emulators/qemu/patches/patch-df |  13 +++++
 emulators/qemu/patches/patch-dg |  22 +++++++++
 emulators/qemu/patches/patch-dh |  58 +++++++++++++++++++++++++
 emulators/qemu/patches/patch-di |  13 +++++
 emulators/qemu/patches/patch-dj |  43 +++++++++++++++++++
 emulators/qemu/patches/patch-dk |  33 ++++++++++++++
 emulators/qemu/patches/patch-dl |  29 ++++++++++++
 emulators/qemu/patches/patch-dm |  13 +++++
 27 files changed, 364 insertions(+), 483 deletions(-)

diffs (truncated from 1014 to 300 lines):

diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Mon Aug 31 10:08:59 2009 +0000
+++ b/emulators/qemu/Makefile   Mon Aug 31 10:18:49 2009 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.56 2009/05/13 19:02:18 kefren Exp $
+# $NetBSD: Makefile,v 1.57 2009/08/31 10:18:49 hasso Exp $
 #
 
-DISTNAME=              qemu-0.9.1
-PKGREVISION=           1
+DISTNAME=              qemu-0.10.6
 CATEGORIES=            emulators
-MASTER_SITES=          http://bellard.org/qemu/
+MASTER_SITES=          http://download.savannah.gnu.org/releases/qemu/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://bellard.org/qemu/
+HOMEPAGE=              http://www.nongnu.org/qemu/
 COMMENT=               CPU emulator using dynamic translation
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -22,16 +21,10 @@
 
 # Workaround for PR/41007 - ensure WRKSRC comes before any buildlinked
 # directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this
-CFLAGS+=       -I${WRKSRC}
+CFLAGS+=               -I${WRKSRC} -I${WRKSRC}/slirp
 
 .include "../../mk/bsd.prefs.mk"
 
-GCC_REQD+=             3.0
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*)
-USE_PKGSRC_GCC=        yes
-.endif
-
 CONFIGURE_ENV+=                PKGMANDIR=${PKGMANDIR}
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       --interp-prefix=${PREFIX:Q}/share/qemu
@@ -56,27 +49,20 @@
 SUBST_SED.smbd=                -e s,/usr/sbin/smbd,${PREFIX:Q}/sbin/smbd,g
 SUBST_MESSAGE.smbd=    Fixing hardcoded paths.
 
-REPLACE_PERL+=         texi2pod.pl
+pre-patch:
+       mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h
 
-# Remove -march/-mcpu from CFLAGS, otherwise it will fail
-# to build in the SSE code.
-BUILDLINK_TRANSFORM+=  rm-optarg:-march rm-optarg:-mcpu rm:-msse rm:-msse2
+SUBST_CLASSES+=                qaudio
+SUBST_STAGE.qaudio=    pre-configure
+SUBST_FILES.qaudio=    *.c audio/*.c hw/*.c
+SUBST_SED.qaudio=      -e s,audio.h\",qaudio.h\",g
+SUBST_MESSAGE.qaudio=  Fixing audio.h confusion
+
+REPLACE_PERL+=         texi2pod.pl
 
 BUILDLINK_PASSTHRU_DIRS+= /usr/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
 
-# Does not build with the stack protector
-.if ${OPSYS} == "DragonFly"
-CFLAGS+=               -fno-stack-protector
-.endif
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-4*)
-CONFIGURE_ARGS+=       --disable-gcc-check
-.endif
-
-
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu
 
 post-install:
diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/PLIST
--- a/emulators/qemu/PLIST      Mon Aug 31 10:08:59 2009 +0000
+++ b/emulators/qemu/PLIST      Mon Aug 31 10:18:49 2009 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 17:51:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/08/31 10:18:49 hasso Exp $
 bin/qemu
 bin/qemu-img
+bin/qemu-sparc64
 bin/qemu-system-arm
 bin/qemu-system-cris
 bin/qemu-system-m68k
@@ -17,9 +18,11 @@
 bin/qemu-system-x86_64
 man/man1/qemu-img.1
 man/man1/qemu.1
+man/man8/qemu-nbd.8
 share/doc/qemu/Makefile.multinode-NetBSD
 share/doc/qemu/qemu-doc.html
 share/doc/qemu/qemu-tech.html
+share/qemu/bamboo.dtb
 share/qemu/bios.bin
 share/qemu/keymaps/ar
 share/qemu/keymaps/common
@@ -56,8 +59,11 @@
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
+share/qemu/openbios-sparc64
 share/qemu/ppc_rom.bin
+share/qemu/pxe-e1000.bin
 share/qemu/pxe-ne2k_pci.bin
 share/qemu/pxe-pcnet.bin
 share/qemu/pxe-rtl8139.bin
diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Mon Aug 31 10:08:59 2009 +0000
+++ b/emulators/qemu/distinfo   Mon Aug 31 10:18:49 2009 +0000
@@ -1,20 +1,22 @@
-$NetBSD: distinfo,v 1.42 2009/05/13 19:02:18 kefren Exp $
+$NetBSD: distinfo,v 1.43 2009/08/31 10:18:49 hasso Exp $
 
-SHA1 (qemu-0.9.1.tar.gz) = 630ea20b5989f0df00128de7f7be661c573ed041
-RMD160 (qemu-0.9.1.tar.gz) = ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5
-Size (qemu-0.9.1.tar.gz) = 2804104 bytes
-SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ab) = ba77da578f528ca549c48336b40378dcbb2a2fbb
-SHA1 (patch-ac) = 3d73b46db4f824d16d40472cc3bd516599469966
-SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d
-SHA1 (patch-ae) = a82f6c1a02c6bc03f4da9bc2b52f817b260ced8a
-SHA1 (patch-ag) = 3469af1ec2a4f95c09a67c16b1071f0ec27dab74
-SHA1 (patch-ak) = ed5766e36d5a192cf4559142e6ef9e0287e61b43
-SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
+SHA1 (qemu-0.10.6.tar.gz) = 9432738ba513e07c981097468945b2e3ad9cb81e
+RMD160 (qemu-0.10.6.tar.gz) = 1321a10777d2e0c6b53887d0525a28cc1b36ec9b
+Size (qemu-0.10.6.tar.gz) = 3664559 bytes
 SHA1 (patch-ao) = e515093b6ea99f9cba665de022fd62f3be911569
 SHA1 (patch-au) = 2892cae63796c76014288f4a700acbee5aadc529
 SHA1 (patch-av) = 715e9680d70c1aa1c83bda0270125144a26d6140
-SHA1 (patch-aw) = f3bc77cdec3a876fa69406c91590d02161e80753
-SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = f41e230bd0fef6437aa187b346fc06ef4f32a31c
 SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
+SHA1 (patch-da) = 994eb51de1e7398acf95189da182f755f2ca65e1
+SHA1 (patch-db) = 7e729851615598646aa3f2d7278147198d0a7a45
+SHA1 (patch-dc) = 508d40a99242ba025ade0d067e6d44d3a8a4f0cc
+SHA1 (patch-dd) = 98133e7526441ddea5647c006f146474fcd59826
+SHA1 (patch-de) = b06cb5d29069ebbbc7e78c35798332493c8c9143
+SHA1 (patch-df) = f21a7832e2cc94dbe76626b74455d33f5ca50ee5
+SHA1 (patch-dg) = f315471d1353504e8bb0032cdf019634c3ce88a5
+SHA1 (patch-dh) = c4c1882c81cdbe9d98fc50e8f60f8d233a7882c5
+SHA1 (patch-di) = 96552e11794deb726cc027c41e06a378510ef534
+SHA1 (patch-dj) = 78b2cc5ba2360a7237de2207365547b84867d070
+SHA1 (patch-dk) = e8fe4d8435ed8865ab74f231e9c1dc91dab629ce
+SHA1 (patch-dl) = 9141ded6d9440863ffa0772b639f2c76b3320e4a
+SHA1 (patch-dm) = 3786ee9dfa46648f773f06c683bccd574c5ee2cb
diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/patches/patch-aa
--- a/emulators/qemu/patches/patch-aa   Mon Aug 31 10:08:59 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/12/14 01:02:19 dbj Exp $
-
---- bswap.h.orig       Sun Nov 14 15:51:33 2004
-+++ bswap.h
-@@ -5,6 +5,12 @@
- 
- #include <inttypes.h>
- 
-+#ifdef HAVE_MACHINE_BSWAP_H
-+#include <sys/endian.h>
-+#include <sys/types.h>
-+#include <machine/bswap.h>
-+#else
-+
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
- #else
-@@ -57,6 +63,8 @@ static inline uint64_t bswap64(uint64_t 
- {
-     return bswap_64(x);
- }
-+
-+#endif /* ! HAVE_MACHINE_BSWAP_H */
- 
- static inline void bswap16s(uint16_t *s)
- {
diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/patches/patch-ab
--- a/emulators/qemu/patches/patch-ab   Mon Aug 31 10:08:59 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2009/01/22 07:27:28 jmmv Exp $
-
---- Makefile.target.orig       2008-01-06 20:38:41.000000000 +0100
-+++ Makefile.target
-@@ -115,6 +115,10 @@ OP_CFLAGS+=$(call cc-option, -fno-align-
- OP_CFLAGS+=$(call cc-option, -fno-align-functions, $(call cc-option, -malign-functions=0, ""))
- OP_CFLAGS+=$(call cc-option, -fno-section-anchors, "")
- 
-+ifdef STACK_PROTECTOR_PRESENT
-+OP_CFLAGS+=$(call cc-option, -fno-stack-protector, "")
-+endif
-+
- ifeq ($(ARCH),i386)
- HELPER_CFLAGS+=-fomit-frame-pointer
- OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
-@@ -537,7 +541,9 @@ endif
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
--VL_LIBS+=-lutil
-+ifndef CONFIG_DRAGONFLY
-+VL_LIBS+=-lutil -lrt
-+endif
- endif
- endif
- endif
diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/patches/patch-ac
--- a/emulators/qemu/patches/patch-ac   Mon Aug 31 10:08:59 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2009/05/13 19:02:18 kefren Exp $
-
---- vl.c.orig  2008-01-06 21:38:42.000000000 +0200
-+++ vl.c       2009-05-13 21:49:15.000000000 +0300
-@@ -61,7 +61,7 @@
- #include <arpa/inet.h>
- #ifdef _BSD
- #include <sys/stat.h>
--#ifndef __APPLE__
-+#ifndef _BSD
- #include <libutil.h>
- #endif
- #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
-@@ -2385,6 +2385,9 @@
- 
- static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
- {
-+#ifdef __NetBSD__
-+    return ENOTSUP;
-+#endif
-     ParallelCharDriver *drv = chr->opaque;
-     int fd = drv->fd;
-     uint8_t b;
-@@ -2473,6 +2476,9 @@
- 
- static CharDriverState *qemu_chr_open_pp(const char *filename)
- {
-+#ifdef __NetBSD__
-+    return ENOTSUP;
-+#endif
-     CharDriverState *chr;
-     ParallelCharDriver *drv;
-     int fd;
-@@ -4877,13 +4883,14 @@
-     int bus_id, unit_id;
-     int cyls, heads, secs, translation;
-     BlockDriverState *bdrv;
-+    BlockDriver *drv = NULL;
-     int max_devs;
-     int index;
-     int cache;
-     int bdrv_flags;
-     char *params[] = { "bus", "unit", "if", "index", "cyls", "heads",
-                        "secs", "trans", "media", "snapshot", "file",
--                       "cache", NULL };
-+                       "cache", "format", NULL };
- 
-     if (check_params(buf, sizeof(buf), params, str) < 0) {
-          fprintf(stderr, "qemu: unknowm parameter '%s' in '%s'\n",
-@@ -5051,6 +5058,14 @@
-         }
-     }
- 
-+    if (get_param_value(buf, sizeof(buf), "format", str)) {
-+      drv = bdrv_find_format(buf);
-+      if (!drv) {
-+          fprintf(stderr, "qemu: '%s' invalid format\n", buf);
-+          return -1;
-+      }
-+    }
-+
-     get_param_value(file, sizeof(file), "file", str);
- 
-     /* compute bus and unit according index */
-@@ -5150,7 +5165,7 @@
-         bdrv_flags |= BDRV_O_SNAPSHOT;
-     if (!cache)
-         bdrv_flags |= BDRV_O_DIRECT;
--    if (bdrv_open(bdrv, file, bdrv_flags) < 0 || qemu_key_check(bdrv, file)) {
-+    if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0 || qemu_key_check(bdrv, file)) {
-         fprintf(stderr, "qemu: could not open disk image %s\n",
-                         file);
-         return -1;
diff -r 57021cfe7015 -r 67c249577127 emulators/qemu/patches/patch-ad
--- a/emulators/qemu/patches/patch-ad   Mon Aug 31 10:08:59 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/12/30 17:12:45 joerg Exp $
-
---- block.c.orig       2007-02-05 23:01:54 +0000
-+++ block.c
-@@ -29,8 +29,10 @@
- #include <sys/stat.h>
Home | Main Index | Thread Index | Old Index