vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

QEMU tracing for NVME

Browse source
This commit is contained in:
Jeremy Soller 2022-08-30 11:09:49 -06:00
parent 1f60df9d0f
commit 0807904117
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mk/qemu.mk
View file

@ -1,15 +1,18 @@
QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH)
QEMUFLAGS=-d cpu_reset,guest_errors --trace "pci_nvme_*" --trace "nvme_*"
ifeq ($(ARCH),i686) ifeq ($(ARCH),i686)
efi=no efi=no
QEMU_ARCH=i386 QEMU_ARCH=i386
QEMU_MACHINE=q35 QEMU_MACHINE=q35
QEMU_CPU=pentium2 QEMU_CPU=pentium2
QEMUFLAGS=-smp 4 -m 2048 QEMUFLAGS+=-smp 4 -m 2048
else ifeq ($(ARCH),x86_64) else ifeq ($(ARCH),x86_64)
QEMU_ARCH=x86_64 QEMU_ARCH=x86_64
QEMU_MACHINE=q35 QEMU_MACHINE=q35
QEMU_CPU=core2duo QEMU_CPU=core2duo
QEMU_EFI=/usr/share/OVMF/OVMF_CODE.fd QEMU_EFI=/usr/share/OVMF/OVMF_CODE.fd
QEMUFLAGS=-smp 4 -m 2048 QEMUFLAGS+=-smp 4 -m 2048
else ifeq ($(ARCH),aarch64) else ifeq ($(ARCH),aarch64)
efi=yes efi=yes
kvm=no kvm=no
@ -20,7 +23,7 @@ else ifeq ($(ARCH),aarch64)
QEMU_MACHINE=virt QEMU_MACHINE=virt
QEMU_CPU=max QEMU_CPU=max
QEMU_EFI=/usr/share/AAVMF/AAVMF_CODE.fd QEMU_EFI=/usr/share/AAVMF/AAVMF_CODE.fd
QEMUFLAGS=-smp 1 -m 2048 QEMUFLAGS+=-smp 1 -m 2048
ifneq ($(vga),no) ifneq ($(vga),no)
QEMUFLAGS+=-device virtio-gpu-pci QEMUFLAGS+=-device virtio-gpu-pci
endif endif
@ -44,22 +47,23 @@ else
HARDDRIVE=build/harddrive.bin HARDDRIVE=build/harddrive.bin
endif endif
QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH)
QEMUFLAGS+=-d cpu_reset,guest_errors
ifeq ($(serial),no) ifeq ($(serial),no)
QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug
else else
QEMUFLAGS+=-chardev stdio,id=debug,signal=off,mux=on,"$(if $(qemu_serial_logfile),logfile=$(qemu_serial_logfile))" QEMUFLAGS+=-chardev stdio,id=debug,signal=off,mux=on,"$(if $(qemu_serial_logfile),logfile=$(qemu_serial_logfile))"
QEMUFLAGS+=-serial chardev:debug -mon chardev=debug QEMUFLAGS+=-serial chardev:debug -mon chardev=debug
endif endif
ifeq ($(iommu),yes) ifeq ($(iommu),yes)
QEMUFLAGS+=-machine $(QEMU_MACHINE),iommu=on QEMUFLAGS+=-machine $(QEMU_MACHINE),iommu=on
else else
QEMUFLAGS+=-machine $(QEMU_MACHINE) QEMUFLAGS+=-machine $(QEMU_MACHINE)
endif endif
ifneq ($(audio),no) ifneq ($(audio),no)
QEMUFLAGS+=-device ich9-intel-hda -device hda-duplex QEMUFLAGS+=-device ich9-intel-hda -device hda-duplex
endif endif
ifeq ($(net),no) ifeq ($(net),no)
QEMUFLAGS+=-net none QEMUFLAGS+=-net none
else else
@ -76,15 +80,19 @@ else
endif endif
endif endif
endif endif
ifeq ($(vga),no) ifeq ($(vga),no)
QEMUFLAGS+=-nographic -vga none QEMUFLAGS+=-nographic -vga none
endif endif
ifneq ($(usb),no) ifneq ($(usb),no)
QEMUFLAGS+=-device nec-usb-xhci,id=xhci QEMUFLAGS+=-device nec-usb-xhci,id=xhci
endif endif
ifeq ($(gdb),yes) ifeq ($(gdb),yes)
QEMUFLAGS+=-s -S QEMUFLAGS+=-s -S
endif endif
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
ifneq ($(kvm),no) ifneq ($(kvm),no)
QEMUFLAGS+=-enable-kvm -cpu host QEMUFLAGS+=-enable-kvm -cpu host
@ -92,8 +100,6 @@ ifeq ($(UNAME),Linux)
QEMUFLAGS+=-cpu $(QEMU_CPU) QEMUFLAGS+=-cpu $(QEMU_CPU)
endif endif
endif endif
#,int,pcall
#-device intel-iommu
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
build/extra.bin: build/extra.bin: