diff options
author | Juergen Lock <nox@FreeBSD.org> | 2009-12-06 19:37:46 +0000 |
---|---|---|
committer | Juergen Lock <nox@FreeBSD.org> | 2009-12-06 19:37:46 +0000 |
commit | b987bd37c9ef735647d3a4ba66db5c7b88c2a993 (patch) | |
tree | 8929f0c86b3c65495580a6b839d41d2acf5a3ad9 /emulators/qemu/files/patch-osdep.c | |
parent | Update to 1.2, remove dead patch incorporated upstream, fix descr (diff) |
- Update to 0.11.1 - from the official announcement:
- fix I2C slave addressing (Juha Riihimaki)
- Revert "vga: do not resize the screen on hw_invalidate" (Aurelien Jarno)
- slirp: fix use-after-free (Mark McLoughlin)
- Fix sparc.ld (Blue Swirl)
- ELF codedump build failures (Laurent Desnogues)
- kvm: Move KVM mp_state accessors to i386-specific code (Hollis Blanchard)
- fix configure script with armv4l cpu (Laurent Desnogues)
- net: disable draining tap queue in one go (Mark McLoughlin)
- pcnet: Restart poll timer on pcnet_start (Jan Kiszka)
- Sparc32: Fix lance (Blue Swirl)
- mac99: fix segmentation fault on startup (Aurelien Jarno)
- usb-linux.c: fix buffer overflow (Jim Paris)
- ARM host: fix generated blocks linking (Laurent Desnogues)
- qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver)
(Juergen Lock)
- exec-all.h: increase MAX_OP_PER_INSTR to 96 from 64 (Aurelien Jarno)
- Added a cherry picked commit from stable branch that fixes qcow2.
Notes
Notes:
svn path=/head/; revision=245296
Diffstat (limited to 'emulators/qemu/files/patch-osdep.c')
-rw-r--r-- | emulators/qemu/files/patch-osdep.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/emulators/qemu/files/patch-osdep.c b/emulators/qemu/files/patch-osdep.c new file mode 100644 index 000000000000..984c63bdbbcb --- /dev/null +++ b/emulators/qemu/files/patch-osdep.c @@ -0,0 +1,11 @@ +Index: qemu/osdep.c +@@ -179,7 +179,9 @@ + } + unlink(phys_ram_file); + } ++#endif /* !(__OpenBSD__ || __FreeBSD__ || __DragonFly__) */ + size = (size + 4095) & ~4095; ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) + ftruncate(phys_ram_fd, phys_ram_size + size); + #endif /* !(__OpenBSD__ || __FreeBSD__ || __DragonFly__) */ + ptr = mmap(NULL, |