Draft 1 on instructions

diff --git a/include/memlayout.h b/include/memlayout.h
index bd574109f18a97135a4b8c37e5881673ba70e518..5f5b06458fdebe77bd8e7ae4d094a46beeaa65fc 100644 (file)
--- a/include/memlayout.h
+++ b/include/memlayout.h
@@ -17,3 +17,4 @@
 #define P2V_WO(x) ((x) + KERNBASE)    // same as P2V, but without casts
 
 #endif  // INCLUDE_MEMLAYOUT_h_
+

diff --git a/scripts/xv6-qemu b/scripts/xv6-qemu
index 17b9a26e38a2d26de8093763a844ade801f7cf60..f023a9eef1e5879e70743343bfc801b1b292b131 100755 (executable)
--- a/scripts/xv6-qemu
+++ b/scripts/xv6-qemu
@@ -16,8 +16,8 @@ function print_help() {
   print "    -m  --memory    -- Set the amount of memory to give to xv6 (default is ${MEMORY})"
 }
 
-OPTIONS="h?c:gxvm"
-LONGOPTS="help,num-cpus:,gdb,x-server,verbose,memory"
+OPTIONS="h?c:gxvm:"
+LONGOPTS="help,num-cpus:,gdb,x-server,verbose,memory:"
 
 ! PARSED=$(getopt --options=${OPTIONS} --longoptions=${LONGOPTS} --name "$0" -- "$@")
 
@@ -44,6 +44,10 @@ while true; do
       CPUS="$2"
       shift 2
       ;;
+    -m|--memory)
+      MEMORY="$2"
+      shift 2
+      ;;
     -g|--gdb)
       GDB="-S -gdb tcp::26000"
       shift