From 62687629525873cf400bc06a529db38281dfc06c Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sun, 28 Feb 2021 15:34:19 +0100 Subject: [PATCH] Corrected deprecated qemu options --- Makefile | 70 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 95de132..c490a09 100644 --- a/Makefile +++ b/Makefile @@ -320,30 +320,45 @@ all : $(CROSS-CC-DIR)/bin/x86_64-elf-gcc ## QEMU/DEBUG RELATED test: all installonimage - @qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 -soundhw pcspk -cpu host -s \ - -rtc base=localtime -m $(ram) -hda $(installdisk) -net nic,model=rtl8139 \ - -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & + @qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa \ + -d guest_errors,int,pcall -D $(BUILDDIR)/qemu.log & run: test testnokvm: all installonimage - @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 & + @qemu-system-x86_64 -vga std -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa \ + -d guest_errors,int,pcall -D $(BUILDDIR)/qemu.log & testnosnd: all installonimage - @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 & + @qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 \ + -d guest_errors,int,pcall -D $(BUILDDIR)/qemu.log & test32: all installonimage - @qemu-system-i386 -m $(ram) -hda $(installdisk) -machine type=q35 -d \ - cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & + @qemu-system-i386 -vga std -enable-kvm -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa \ + -d guest_errors,int,pcall -D $(BUILDDIR)/qemu.log & gdb: all installonimage - @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 & + @setsid qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa -no-reboot -no-shutdown\ + -d guest_errors,int,pcall -s -S -D $(BUILDDIR)/qemu.log & @gdb \ -ex "set arch i386:x86-64" \ -ex "target extended-remote localhost:1234" \ @@ -352,15 +367,21 @@ gdb: all installonimage ddd: all installonimage - @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 & + @setsid qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa -no-reboot -no-shutdown\ + -d guest_errors,int,pcall -s -S -D $(BUILDDIR)/qemu.log & @ddd -n gdbnokvm: all installonimage - @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 & + @setsid qemu-system-x86_64 -vga std -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa -no-reboot -no-shutdown\ + -d guest_errors,int,pcall -s -S -D $(BUILDDIR)/qemu.log & @gdb \ -ex "set arch i386:x86-64" \ -ex "target extended-remote localhost:1234" \ @@ -368,9 +389,12 @@ gdbnokvm: all installonimage -ex "hbreak BtStartKern" \ dddnokvm: all installonimage - @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 & + @setsid qemu-system-x86_64 -vga std -machine type=q35 \ + -cpu host -s -rtc base=localtime -m $(ram) \ + -drive file=$(installdisk),index=0,media=disk,format=raw \ + -net nic,model=rtl8139 -audiodev id=pa,driver=pa \ + -machine pcspk-audiodev=pa -no-reboot -no-shutdown\ + -d guest_errors,int,pcall -s -S -D $(BUILDDIR)/qemu.log & @ddd -n