Ver código fonte

Meta: Run 64-bit kernels with qemu-system-x86_64

Gunnar Beutner 4 anos atrás
pai
commit
1979c7d185
2 arquivos alterados com 8 adições e 2 exclusões
  1. 1 1
      CMakeLists.txt
  2. 7 1
      Meta/run.sh

+ 1 - 1
CMakeLists.txt

@@ -40,7 +40,7 @@ option(ENABLE_KERNEL_LTO "Build the kernel with link-time optimization" OFF)
 include(Meta/CMake/wasm_spec_tests.cmake)
 include(Meta/CMake/wasm_spec_tests.cmake)
 
 
 add_custom_target(run
 add_custom_target(run
-    COMMAND ${CMAKE_SOURCE_DIR}/Meta/run.sh
+    COMMAND ${CMAKE_COMMAND} -E env "SERENITY_ARCH=${SERENITY_ARCH}" ${CMAKE_SOURCE_DIR}/Meta/run.sh
     USES_TERMINAL
     USES_TERMINAL
 )
 )
 
 

+ 7 - 1
Meta/run.sh

@@ -27,7 +27,13 @@ fi
 
 
 SERENITY_RUN="${SERENITY_RUN:-$1}"
 SERENITY_RUN="${SERENITY_RUN:-$1}"
 
 
-[ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386"
+if [ -z "$SERENITY_QEMU_BIN" ]; then
+    if [ "$SERENITY_ARCH" = "x86_64" ]; then
+        SERENITY_QEMU_BIN="qemu-system-x86_64"
+    else
+        SERENITY_QEMU_BIN="qemu-system-i386"
+    fi
+fi
 
 
 [ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"
 [ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"