Hello community, here is the log from the commit of package qemu checked in at Wed Jun 20 19:21:28 CEST 2007. -------- --- qemu/qemu.changes 2007-06-20 10:59:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/qemu.changes 2007-06-20 14:39:20.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 20 14:38:47 CEST 2007 - agraf@suse.de + +- applied proper fix for x86_64 and the MAP_32BIT flag + +------------------------------------------------------------------- Old: ---- qemu-0.9.0-mmap.x86_64.patch New: ---- qemu-0.8.2-alt-mmap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.i24242/_old 2007-06-20 19:21:04.000000000 +0200 +++ /var/tmp/diff_new_pack.i24242/_new 2007-06-20 19:21:04.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Emulators/Other Summary: Universal CPU emulator Version: 0.9.0 -Release: 37 +Release: 38 Source: %name-%version.tar.bz2 #Patch400: qemu-0.7.0-gcc4-dot-syms.patch #Patch401: qemu-0.8.0-gcc4-hacks.patch @@ -52,7 +52,7 @@ Patch39: qemu-0.9.0-kvm-kqemu-window-caption.patch Patch40: qemu-z80.diff Patch41: qemu-0.9.0-sched.patch -Patch42: qemu-0.9.0-mmap.x86_64.patch +Patch42: qemu-0.8.2-alt-mmap.patch Patch43: qemu-0.9.0-futex.patch Patch44: qemu-0.9.0-robust_list.patch Patch45: qemu-0.9.0-wine.patch @@ -332,6 +332,8 @@ %endif %changelog +* Wed Jun 20 2007 - agraf@suse.de +- applied proper fix for x86_64 and the MAP_32BIT flag * Wed Jun 20 2007 - uli@suse.de - added secfixes (bug #252519) * Thu Jun 14 2007 - agraf@suse.de ++++++ qemu-0.8.2-alt-mmap.patch ++++++ diff -uNr qemu-0.8.2.orig/linux-user/mmap.c qemu-0.8.2/linux-user/mmap.c --- qemu-0.8.2.orig/linux-user/mmap.c 2007-01-16 16:05:33 +0200 +++ qemu-0.8.2/linux-user/mmap.c 2007-01-16 16:27:28 +0200 @@ -27,6 +27,10 @@ #include "qemu.h" +#if !defined(MAP_32BIT) +#define MAP_32BIT 0 +#endif + //#define DEBUG_MMAP /* NOTE: all the constants are the HOST ones, but addresses are target. */ @@ -116,7 +120,7 @@ if (prot1 == 0) { /* no page was there, so we allocate one */ ret = (long)mmap(host_start, qemu_host_page_size, prot, - flags | MAP_ANONYMOUS, -1, 0); + flags | MAP_ANONYMOUS | MAP_32BIT, -1, 0); if (ret == -1) return ret; prot1 = prot; @@ -217,7 +221,8 @@ abort(); host_len = HOST_PAGE_ALIGN(len) + qemu_host_page_size - TARGET_PAGE_SIZE; real_start = (long)mmap(g2h(real_start), host_len, PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT + , -1, 0); if (real_start == -1) return real_start; real_end = real_start + host_len; @@ -234,7 +239,7 @@ host_offset = offset & qemu_host_page_mask; host_len = len + offset - host_offset; host_start = (long)mmap(real_start ? g2h(real_start) : NULL, - host_len, prot, flags, fd, host_offset); + host_len, prot, flags | MAP_32BIT, fd, host_offset); if (host_start == -1) return host_start; /* update start so that it points to the file position at 'offset' */ @@ -312,7 +317,7 @@ else offset1 = offset + real_start - start; ret = (long)mmap(g2h(real_start), real_end - real_start, - prot, flags, fd, offset1); + prot, flags | MAP_32BIT, fd, offset1); if (ret == -1) return ret; } @@ -388,7 +393,7 @@ int prot; /* XXX: use 5 args syscall */ - new_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags); + new_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags | MAP_32BIT); if (new_addr == -1) return new_addr; new_addr = h2g(new_addr); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de