diff --git a/arch/x86_64/extra.mk b/arch/x86_64/extra.mk
index de8352f..872c7fe 100644
--- a/arch/x86_64/extra.mk
+++ b/arch/x86_64/extra.mk
@@ -1,5 +1,12 @@
 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
 
@@ -17,12 +24,12 @@ $(BUILD_DIR)/socks-kernel.iso: $(BUILD_DIR)/$(KERNEL_EXEC)
 run: $(BUILD_DIR)/$(KERNEL_EXEC) $(BUILD_DIR)/$(KERNEL_EXEC).elf32
 	@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
 	@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
 	@printf "    \033[1;93mQEMU\033[0m   $<\n"