Let's switch to q35

toaruos · May 28, 2021 · 2db8f9d · 2db8f9d
1 parent 9c8caa6
commit 2db8f9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -40,9 +40,11 @@ MODULES = $(patsubst %.c,%.ko,$(wildcard modules/*.c))
 # Configs you can override.
 SMP ?= 1
 RAM ?= 3G
+EXTRA_ARGS ?=
 
 EMU = qemu-system-x86_64
 EMU_ARGS  = -kernel misaka-kernel
+EMU_ARGS += -M q35
 EMU_ARGS += -m $(RAM)
 EMU_ARGS += -smp $(SMP)
 EMU_ARGS += -no-reboot
@@ -109,7 +111,7 @@ $(BASE)/lib/ld.so: linker/linker.c $(BASE)/lib/libc.a | dirs $(LC)
 	$(CC) -g -static -Wl,-static $(CFLAGS) -o $@ -Os -T linker/link.ld $<
 
 run: system
-	${EMU} ${EMU_ARGS} ${EMU_KVM} -append "root=/dev/ram0 start=live-session migrate sharedps2" -initrd ramdisk.igz
+	${EMU} ${EMU_ARGS} ${EMU_KVM} -append "root=/dev/ram0 start=live-session migrate $(EXTRA_ARGS)" -initrd ramdisk.igz
 
 shell: system
 	${EMU} -m $(RAM) ${EMU_KVM} -kernel misaka-kernel -append "root=/dev/ram0 start=--headless migrate" -initrd ramdisk.igz \

diff --git a/apps/lspci.c b/apps/lspci.c
@@ -69,6 +69,10 @@ struct {
 	{0x8086, 0x10ea, "82577LM Gigabit Ethernet Controller (e1000)"},
 	{0x8086, 0x1237, "PCI & Memory"},
 	{0x8086, 0x2415, "82801AA AC'97 Audio Controller"},
+	{0x8086, 0x29c0, "DRAM Controller"},
+	{0x8086, 0x2918, "ICH9 LPC Interface Controller"},
+	{0x8086, 0x2922, "ICH9 6-port SATA Controller"},
+	{0x8086, 0x2930, "ICH9 SMBus Controller"},
 	{0x8086, 0x7000, "PCI-to-ISA Bridge"},
 	{0x8086, 0x7010, "IDE Interface"},
 	{0x8086, 0x7110, "PIIX4 ISA"},