wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: add test AHCI drives to VM

Browse Source
This commit is contained in:
max 🍓
2023-07-08 15:56:20 +01:00
parent db992a0994
commit 2ea509c4dc
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86_64/extra.mk
View File

@@ -1,5 +1,12 @@
QEMU := qemu-system-x86_64 QEMU := qemu-system-x86_64
QEMU_FLAGS := -m 10M -smp 4 -cpu qemu64,pdpe1gb #QEMU_MONITOR_FLAGS := -serial file:$(BUILD_DIR)socks.log -monitor stdio
QEMU_MONITOR_FLAGS := -serial stdio
QEMU_FLAGS := \
-m 10M \
-smp 4 -cpu qemu64,pdpe1gb \
-device ahci,id=ahci \
-drive id=hd0,file=$(BUILD_DIR)/disk.img,if=none -device ide-hd,drive=hd0,bus=ahci.0 \
-drive id=cd0,file=$(BUILD_DIR)/disk2.img,if=none -device ide-cd,drive=cd0,bus=ahci.1
ARCH_TEMP_FILES := $(BUILD_DIR)/$(KERNEL_EXEC).elf32 ARCH_TEMP_FILES := $(BUILD_DIR)/$(KERNEL_EXEC).elf32
@@ -17,12 +24,12 @@ $(BUILD_DIR)/socks-kernel.iso: $(BUILD_DIR)/$(KERNEL_EXEC)
run: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 run: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32
@printf " \033[1;93mQEMU\033[0m $<\n" @printf " \033[1;93mQEMU\033[0m $<\n"
@$(QEMU) -kernel $(BUILD_DIR)/$(KERNEL_EXEC).elf32 -monitor stdio $(QEMU_FLAGS) -serial file:$(BUILD_DIR)/socks.log @$(QEMU) -kernel $(BUILD_DIR)/$(KERNEL_EXEC).elf32 $(QEMU_FLAGS) $(QEMU_MONITOR_FLAGS)
run-curses: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32 run-curses: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32
@printf " \033[1;93mQEMU\033[0m $<\n" @printf " \033[1;93mQEMU\033[0m $<\n"
@$(QEMU) -kernel $(BUILD_DIR)/$(KERNEL_EXEC).elf32 -monitor stdio $(QEMU_FLAGS) -display curses -serial file:$(BUILD_DIR)/socks.log @$(QEMU) -kernel $(BUILD_DIR)/$(KERNEL_EXEC).elf32 $(QEMU_FLAGS) $(QEMU_MONITOR_FLAGS)
run-cd-curses: $(BUILD_DIR)/socks-kernel.iso run-cd-curses: $(BUILD_DIR)/socks-kernel.iso
@printf " \033[1;93mQEMU\033[0m $<\n" @printf " \033[1;93mQEMU\033[0m $<\n"