From owner-svn-soc-all@FreeBSD.ORG  Fri Jul 25 12:20:32 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2AC81279
 for <svn-soc-all@FreeBSD.org>; Fri, 25 Jul 2014 12:20:32 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F143E2A40
 for <svn-soc-all@FreeBSD.org>; Fri, 25 Jul 2014 12:20:31 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PCKVJL065955
 for <svn-soc-all@FreeBSD.org>; Fri, 25 Jul 2014 12:20:31 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6PCKVoW065446
 for svn-soc-all@FreeBSD.org; Fri, 25 Jul 2014 12:20:31 GMT
 (envelope-from op@FreeBSD.org)
Date: Fri, 25 Jul 2014 12:20:31 GMT
Message-Id: <201407251220.s6PCKVoW065446@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271364 - soc2014/op/tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Jul 2014 12:20:32 -0000

Author: op
Date: Fri Jul 25 12:20:30 2014
New Revision: 271364
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271364

Log:
  added tools/run_smap_test_vm_64bit_with{,out}_smap.csh test
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  

Added:
  soc2014/op/tools/run_smap_test_vm_64bit_with_smap.csh
     - copied unchanged from r271357, soc2014/op/tools/run_smap_test_vm_64bit.csh
  soc2014/op/tools/run_smap_test_vm_64bit_without_smap.csh
     - copied, changed from r271357, soc2014/op/tools/run_smap_test_vm_64bit.csh

Copied: soc2014/op/tools/run_smap_test_vm_64bit_with_smap.csh (from r271357, soc2014/op/tools/run_smap_test_vm_64bit.csh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2014/op/tools/run_smap_test_vm_64bit_with_smap.csh	Fri Jul 25 12:20:30 2014	(r271364, copy of r271357, soc2014/op/tools/run_smap_test_vm_64bit.csh)
@@ -0,0 +1,21 @@
+#!/bin/csh
+
+set TARGET="amd64"
+
+if ( ${TARGET} == "amd64" ) then
+	set QTARGET="x86_64"
+	set QCPU="Haswell"
+else
+	set QTARGET=${TARGET}
+	set QCPU="qemu32"
+endif
+set FREEBSD_PREFIX="/usr/data/sys/freebsd/"
+set QEMU_PREFIX="/usr/local"
+
+set QEMU="${QEMU_PREFIX}/bin/qemu"
+set QEMU_BIN="${QEMU_PREFIX}/bin/qemu-system-${QTARGET}"
+set QEMU_OPTIONS="-cpu ${QCPU},enforce,+smap,+smep,-hypervisor -m 1024M"
+
+set FREEBSD_VMIMAGE="freebsd-${TARGET}.raw"
+
+${QEMU_BIN} ${QEMU_OPTIONS} -hda ${FREEBSD_PREFIX}/${FREEBSD_VMIMAGE}

Copied and modified: soc2014/op/tools/run_smap_test_vm_64bit_without_smap.csh (from r271357, soc2014/op/tools/run_smap_test_vm_64bit.csh)
==============================================================================
--- soc2014/op/tools/run_smap_test_vm_64bit.csh	Fri Jul 25 06:53:20 2014	(r271357, copy source)
+++ soc2014/op/tools/run_smap_test_vm_64bit_without_smap.csh	Fri Jul 25 12:20:30 2014	(r271364)
@@ -14,7 +14,7 @@
 
 set QEMU="${QEMU_PREFIX}/bin/qemu"
 set QEMU_BIN="${QEMU_PREFIX}/bin/qemu-system-${QTARGET}"
-set QEMU_OPTIONS="-cpu ${QCPU},enforce,+smap,+smep,-hypervisor -m 1024M"
+set QEMU_OPTIONS="-cpu ${QCPU},enforce,-smap,+smep,-hypervisor -m 1024M"
 
 set FREEBSD_VMIMAGE="freebsd-${TARGET}.raw"