Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Jun 2014 19:34:06 +0000 (UTC)
From:      Juergen Lock <nox@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r357631 - in head/emulators/qemu-devel: . files
Message-ID:  <201406121934.s5CJY6un018807@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nox
Date: Thu Jun 12 19:34:06 2014
New Revision: 357631
URL: http://svnweb.freebsd.org/changeset/ports/357631
QAT: https://qat.redports.org/buildarchive/r357631/

Log:
  - Fix bsd-user x86_64 target failing with stk mmap: Invalid argument .
  - Bump PORTREVISION.
  
  Reported by:	sbruno

Added:
  head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h   (contents, props changed)
Modified:
  head/emulators/qemu-devel/Makefile

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Thu Jun 12 19:24:22 2014	(r357630)
+++ head/emulators/qemu-devel/Makefile	Thu Jun 12 19:34:06 2014	(r357631)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
@@ -67,6 +67,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sysctl-0oldlen
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bsd-user-mmap.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sysctl-hw-pagesizes
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bsd-user-x86_64-target_arch_vmparam.h
 .endif
 
 CONFIGURE_ARGS+=	--extra-ldflags=-L${LOCALBASE}/lib

Added: head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-devel/files/extra-patch-bsd-user-x86_64-target_arch_vmparam.h	Thu Jun 12 19:34:06 2014	(r357631)
@@ -0,0 +1,19 @@
+From nox Mon Sep 17 00:00:00 2001
+From: Juergen Lock <nox@jelal.kn-bremen.de>
+Date: 12 Jun 2014 19:55:52 +0200
+Subject: Fix bsd-user x86_64 target failing with stk mmap: Invalid argument
+
+Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
+
+--- a/bsd-user/x86_64/target_arch_vmparam.h
++++ b/bsd-user/x86_64/target_arch_vmparam.h
+@@ -11,7 +11,8 @@
+ #define TARGET_MAXSSIZ  (512UL*1024*1024)   /* max stack size */
+ #define TARGET_SGROWSIZ (128UL*1024)        /* amount to grow stack */
+ 
+-#define TARGET_VM_MAXUSER_ADDRESS   (0x0000800000000000UL)
++/* #define TARGET_VM_MAXUSER_ADDRESS   (0x0000800000000000UL) */
++#define TARGET_VM_MAXUSER_ADDRESS   (0x00007fffff000000UL)
+ 
+ #define TARGET_USRSTACK (TARGET_VM_MAXUSER_ADDRESS - TARGET_PAGE_SIZE)
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406121934.s5CJY6un018807>