From aea2f4470071bb8e7f62182bff9546f01c321c7e Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Wed, 19 Feb 2020 22:42:49 +0100
Subject: [PATCH] misc correction

---
 Makefile             | 14 +++++++-------
 kaleid/drivers/ata.c |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ef8b839..41ec9d5 100644
--- a/Makefile
+++ b/Makefile
@@ -291,21 +291,21 @@ test: all installonimage
 run: test
 
 testnokvm: all installonimage
-	@qemu-system-x86_64 -vga std -cpu $(cpu) -soundhw pcspk -s \
+	@qemu-system-x86_64 -vga std -cpu $(cpu) -machine type=q35 -soundhw pcspk -s \
 	 -rtc base=localtime -m $(ram) -hda $(installdisk) \
 	 -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
 testnosnd: all installonimage
-	@qemu-system-x86_64 -vga std -enable-kvm -cpu host -s \
+	@qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 -cpu host -s \
 	 -rtc base=localtime -m $(ram) -hda $(installdisk) \
 	 -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
 test32: all installonimage
-	@qemu-system-i386 -m $(ram) -hda $(installdisk) -d \
+	@qemu-system-i386 -m $(ram) -hda $(installdisk) -machine type=q35 -d \
 	 cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
 gdb: all installonimage
-	@setsid qemu-system-x86_64 -m $(ram) -enable-kvm -rtc base=localtime \
+	@setsid qemu-system-x86_64 -m $(ram) -enable-kvm -machine type=q35 -rtc base=localtime \
 	 -hda $(installdisk) -no-reboot -no-shutdown -d \
 	 cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
 	@gdb \
@@ -315,13 +315,13 @@ gdb: all installonimage
 	-ex "break BtStartKern"            \
 
 ddd: all installonimage
-	@setsid qemu-system-x86_64 -m $(ram) -enable-kvm -rtc base=localtime \
+	@setsid qemu-system-x86_64 -m $(ram) -enable-kvm -machine type=q35 -rtc base=localtime \
 	 -hda $(installdisk) -no-reboot -no-shutdown -d \
 	 cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
 	@ddd -n
 
 gdbnokvm: all installonimage
-	@setsid qemu-system-x86_64 -m $(ram) -rtc base=localtime \
+	@setsid qemu-system-x86_64 -m $(ram) -machine type=q35 -rtc base=localtime \
 	 -hda $(installdisk) -no-reboot -no-shutdown -d \
 	 cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
 	@gdb \
@@ -331,7 +331,7 @@ gdbnokvm: all installonimage
 	-ex "break BtStartKern"            \
 
 dddnokvm: all installonimage
-	@setsid qemu-system-x86_64 -m $(ram) -rtc base=localtime \
+	@setsid qemu-system-x86_64 -m $(ram) -machine type=q35 -rtc base=localtime \
 	 -hda $(installdisk) -no-reboot -no-shutdown -d \
 	 cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
 	@ddd -n
diff --git a/kaleid/drivers/ata.c b/kaleid/drivers/ata.c
index 8ba1b6a..9eace40 100644
--- a/kaleid/drivers/ata.c
+++ b/kaleid/drivers/ata.c
@@ -52,6 +52,6 @@ void IoDetectATA(void)
         return;
     }
 
-    DebugLog("AHCI controller found ! PCI config addr = %p\n",
+    DebugLog("AHCI controller found at PCI config addr = %p\n",
                  ataDevice->configAddr);
 }