mirror of
https://github.com/Leonmmcoset/cleonos.git
synced 2026-04-27 05:34:00 +00:00
外网通讯+TTY优化
This commit is contained in:
@@ -25,7 +25,17 @@ set(OBJCOPY_FOR_TARGET "llvm-objcopy" CACHE STRING "objcopy tool for limine conf
|
||||
set(OBJDUMP_FOR_TARGET "llvm-objdump" CACHE STRING "objdump tool for limine configure")
|
||||
set(READELF_FOR_TARGET "llvm-readelf" CACHE STRING "readelf tool for limine configure")
|
||||
|
||||
set(QEMU_X86_64 "qemu-system-x86_64" CACHE STRING "QEMU executable")
|
||||
set(QEMU_X86_64 "qemu-system-x86_64" CACHE STRING "QEMU executable")
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(_cleonos_qemu_kvm_default ON)
|
||||
else()
|
||||
set(_cleonos_qemu_kvm_default OFF)
|
||||
endif()
|
||||
set(CLEONOS_QEMU_ENABLE_KVM ${_cleonos_qemu_kvm_default} CACHE BOOL "Enable QEMU KVM acceleration for run/debug targets")
|
||||
set(CLEONOS_QEMU_ACCEL_ARGS "")
|
||||
if(CLEONOS_QEMU_ENABLE_KVM)
|
||||
list(APPEND CLEONOS_QEMU_ACCEL_ARGS -enable-kvm -cpu host)
|
||||
endif()
|
||||
|
||||
set(CLEONOS_SOURCE_DIR "${CMAKE_SOURCE_DIR}/cleonos")
|
||||
if(EXISTS "${CLEONOS_SOURCE_DIR}/CMakeLists.txt")
|
||||
@@ -348,27 +358,27 @@ if(CLEONOS_ENABLE)
|
||||
add_custom_target(iso ALL DEPENDS "${ISO_IMAGE}")
|
||||
add_dependencies(iso setup-tools setup-limine kernel ramdisk)
|
||||
|
||||
add_custom_target(run
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
"-DNO_COLOR=${NO_COLOR}"
|
||||
"-DLOG_LEVEL=STEP"
|
||||
"-DLOG_TEXT=launching qemu run"
|
||||
-P "${CL_LOG_EMIT_SCRIPT}"
|
||||
COMMAND ${QEMU_X86_64} -M pc -m 1024M -boot order=d -cdrom "${ISO_IMAGE}" -drive "file=${DISK_IMAGE},format=raw,if=none,id=clksdisk,media=disk" -device "ide-hd,drive=clksdisk,bus=ide.0" -netdev "user,id=clksnet0" -device "e1000,netdev=clksnet0" -serial stdio
|
||||
DEPENDS iso disk-image
|
||||
USES_TERMINAL
|
||||
)
|
||||
add_custom_target(run
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
"-DNO_COLOR=${NO_COLOR}"
|
||||
"-DLOG_LEVEL=STEP"
|
||||
"-DLOG_TEXT=launching qemu run"
|
||||
-P "${CL_LOG_EMIT_SCRIPT}"
|
||||
COMMAND ${QEMU_X86_64} ${CLEONOS_QEMU_ACCEL_ARGS} -M pc -m 1024M -boot order=d -cdrom "${ISO_IMAGE}" -drive "file=${DISK_IMAGE},format=raw,if=none,id=clksdisk,media=disk" -device "ide-hd,drive=clksdisk,bus=ide.0" -netdev "user,id=clksnet0" -device "e1000,netdev=clksnet0" -serial stdio
|
||||
DEPENDS iso disk-image
|
||||
USES_TERMINAL
|
||||
)
|
||||
|
||||
add_custom_target(debug
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
"-DNO_COLOR=${NO_COLOR}"
|
||||
"-DLOG_LEVEL=STEP"
|
||||
"-DLOG_TEXT=launching qemu debug (-s -S)"
|
||||
-P "${CL_LOG_EMIT_SCRIPT}"
|
||||
COMMAND ${QEMU_X86_64} -M pc -m 1024M -boot order=d -cdrom "${ISO_IMAGE}" -drive "file=${DISK_IMAGE},format=raw,if=none,id=clksdisk,media=disk" -device "ide-hd,drive=clksdisk,bus=ide.0" -netdev "user,id=clksnet0" -device "e1000,netdev=clksnet0" -serial stdio -s -S
|
||||
DEPENDS iso disk-image
|
||||
USES_TERMINAL
|
||||
)
|
||||
add_custom_target(debug
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
"-DNO_COLOR=${NO_COLOR}"
|
||||
"-DLOG_LEVEL=STEP"
|
||||
"-DLOG_TEXT=launching qemu debug (-s -S)"
|
||||
-P "${CL_LOG_EMIT_SCRIPT}"
|
||||
COMMAND ${QEMU_X86_64} ${CLEONOS_QEMU_ACCEL_ARGS} -M pc -m 1024M -boot order=d -cdrom "${ISO_IMAGE}" -drive "file=${DISK_IMAGE},format=raw,if=none,id=clksdisk,media=disk" -device "ide-hd,drive=clksdisk,bus=ide.0" -netdev "user,id=clksnet0" -device "e1000,netdev=clksnet0" -serial stdio -s -S
|
||||
DEPENDS iso disk-image
|
||||
USES_TERMINAL
|
||||
)
|
||||
else()
|
||||
add_custom_target(clks-default ALL DEPENDS kernel)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user