Do last changes to finally start benchmarks.

diff --git a/build/boot-linux b/build/boot-linux
index 516c3ba71d6d217b88bb4e1d471fca62ef6f556d..afeaff64ee2bc4dc6b3055d3818cffc9f9b65a05 100755 (executable)
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -1,6 +1,7 @@
 #!/usr/bin/env novaboot
 
-# 
-load buildroot/images/bzImage console=ttyS2,115200  memmap=0x7C00000$0x37600000 nohpet intel_iommu=off kvm-intel.nested=1 kvm-intel.ept=1
+#intel_iommu=off
+ 
+load buildroot/images/bzImage console=ttyS2,115200  memmap=0x7C00000$0x37600000 nohpet  kvm-intel.nested=1 kvm-intel.ept=1
 load buildroot/images/rootfs.cpio.gz
 

diff --git a/build/buildroot/.config b/build/buildroot/.config
index 8a6712228002eaa6bdcae37dee3882b7de12b258..4a983ef07de174069d93ed702ce2c6acc62d08eb 100644 (file)
--- a/build/buildroot/.config
+++ b/build/buildroot/.config
@@ -325,7 +325,7 @@ BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS=y
 #
 # BR2_PACKAGE_BLKTRACE is not set
 # BR2_PACKAGE_BONNIE is not set
-# BR2_PACKAGE_CACHE_CALIBRATOR is not set
+BR2_PACKAGE_CACHE_CALIBRATOR=y
 # BR2_PACKAGE_DHRYSTONE is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_DROPWATCH is not set
@@ -339,7 +339,7 @@ BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
 # BR2_PACKAGE_KEXEC is not set
 # BR2_PACKAGE_KTAP is not set
 # BR2_PACKAGE_LATENCYTOP is not set
-# BR2_PACKAGE_LMBENCH is not set
+BR2_PACKAGE_LMBENCH=y
 # BR2_PACKAGE_LTP_TESTSUITE is not set
 # BR2_PACKAGE_LTRACE is not set
 # BR2_PACKAGE_LTTNG_BABELTRACE is not set
@@ -363,7 +363,7 @@ BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
 # BR2_PACKAGE_STRESS is not set
 # BR2_PACKAGE_SYSDIG is not set
 # BR2_PACKAGE_SYSPROF is not set
-# BR2_PACKAGE_TINYMEMBENCH is not set
+BR2_PACKAGE_TINYMEMBENCH=y
 # BR2_PACKAGE_TRACE_CMD is not set
 # BR2_PACKAGE_TRINITY is not set
 # BR2_PACKAGE_VALGRIND is not set
@@ -1600,7 +1600,53 @@ BR2_PACKAGE_INITSCRIPTS=y
 # BR2_PACKAGE_SMACK is not set
 # BR2_PACKAGE_SUPERVISOR is not set
 BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y
-# BR2_PACKAGE_UTIL_LINUX is not set
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
+BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
+BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y
+BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
+# BR2_PACKAGE_UTIL_LINUX_ARCH is not set
+# BR2_PACKAGE_UTIL_LINUX_BFS is not set
+# BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH is not set
+# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
+# BR2_PACKAGE_UTIL_LINUX_DDATE is not set
+# BR2_PACKAGE_UTIL_LINUX_EJECT is not set
+# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
+# BR2_PACKAGE_UTIL_LINUX_FDFORMAT is not set
+# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
+# BR2_PACKAGE_UTIL_LINUX_HWCLOCK is not set
+# BR2_PACKAGE_UTIL_LINUX_KILL is not set
+# BR2_PACKAGE_UTIL_LINUX_LAST is not set
+# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
+# BR2_PACKAGE_UTIL_LINUX_LOSETUP is not set
+# BR2_PACKAGE_UTIL_LINUX_MESG is not set
+# BR2_PACKAGE_UTIL_LINUX_MINIX is not set
+# BR2_PACKAGE_UTIL_LINUX_NSENTER is not set
+# BR2_PACKAGE_UTIL_LINUX_MORE is not set
+# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
+# BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT is not set
+# BR2_PACKAGE_UTIL_LINUX_NEWGRP is not set
+# BR2_PACKAGE_UTIL_LINUX_NOLOGIN is not set
+# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
+# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
+# BR2_PACKAGE_UTIL_LINUX_RAW is not set
+# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
+# BR2_PACKAGE_UTIL_LINUX_RESET is not set
+# BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set
+# BR2_PACKAGE_UTIL_LINUX_SETPRIV is not set
+# BR2_PACKAGE_UTIL_LINUX_SETTERM is not set
+# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
+# BR2_PACKAGE_UTIL_LINUX_UL is not set
+# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
+# BR2_PACKAGE_UTIL_LINUX_UTMPDUMP is not set
+# BR2_PACKAGE_UTIL_LINUX_UUIDD is not set
+# BR2_PACKAGE_UTIL_LINUX_VIPW is not set
+# BR2_PACKAGE_UTIL_LINUX_WALL is not set
+# BR2_PACKAGE_UTIL_LINUX_WDCTL is not set
+# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
+# BR2_PACKAGE_UTIL_LINUX_ZRAMCTL is not set
 
 #
 # Text editors and viewers

diff --git a/build/l4/ferret-modules.list b/build/l4/ferret-modules.list
index 64e11b43ca848ea61cdf85a2ec88f2afa28b54c7..bbdbcc13c90ac97fadf6ad47aab50dd6042fac9d 100644 (file)
--- a/build/l4/ferret-modules.list
+++ b/build/l4/ferret-modules.list
@@ -34,6 +34,6 @@ module benchmark
 
 entry bench-bare
 kernel fiasco -serial_esc
-roottask moe --init=rom/benchmark
+roottask moe --init=rom/benchmark -- -s 4097 -i -t 2 
 module l4re
 module benchmark

diff --git a/jailhouse b/jailhouse
index d6b459944c037d6226f1e2fededcf47b0c3dcfee..4e0ea74420900c7a66d265117b09fddbc3aaa754 160000 (submodule)
--- a/jailhouse
+++ b/jailhouse
@@ -1 +1 @@
-Subproject commit d6b459944c037d6226f1e2fededcf47b0c3dcfee
+Subproject commit 4e0ea74420900c7a66d265117b09fddbc3aaa754

diff --git a/l4 b/l4
index fb3ab8c986aa897e3f3d1e5e5f191af3978a921c..50ca6001808e13cf1f12bfdafc9d8c1422e8f1a4 160000 (submodule)
--- a/l4
+++ b/l4
@@ -1 +1 @@
-Subproject commit fb3ab8c986aa897e3f3d1e5e5f191af3978a921c
+Subproject commit 50ca6001808e13cf1f12bfdafc9d8c1422e8f1a4

diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index 8c87b72088b84201edb189cc5a77b216760c1460..8a50569be7d5a39a38c78f00555bd8e1e04e7dc8 100755 (executable)
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -3,6 +3,9 @@
 set -e;
 set -x;
 
+gcc -O2 bench-linux.c -o bench-linux
+mv bench-linux ../buildroot-overlay/root/bench-linux -f 
+
 if [ -z $ARCH_IMAGE]; then
        ARCH_IMAGE="x86_pentium"
 fi