From 9d4a2650ebeac0d1c47228757365398b277fdc86 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 2 Dec 2018 19:26:16 -0700 Subject: [PATCH] Fix running qemu_live, update kernel --- kernel | 2 +- mk/qemu.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel b/kernel index 69e3fe1..ecc0e74 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 69e3fe105df62f28a99d1a850f342ea69c6623d3 +Subproject commit ecc0e747fc703a1b95b4e0cdb194defd443cafd6 diff --git a/mk/qemu.mk b/mk/qemu.mk index 436440b..3f9e9df 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -66,22 +66,22 @@ qemu_efi_no_build: build/extra.qcow2 qemu_nvme: build/harddrive.bin build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ - -drive file=build/harddrive.bin,format=raw -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ - -drive file=build/extra.qcow2 + -drive file=build/harddrive.bin,format=raw \ + -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL qemu_nvme_no_build: build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ - -drive file=build/harddrive.bin,format=raw -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ - -drive file=build/extra.qcow2 + -drive file=build/harddrive.bin,format=raw \ + -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL qemu_live: build/livedisk.bin build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ - -device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 \ + -drive file=build/livedisk.bin,format=raw \ -drive file=build/extra.qcow2 qemu_live_no_build: build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ - -device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 \ + -drive file=build/livedisk.bin,format=raw \ -drive file=build/extra.qcow2 qemu_iso: build/livedisk.iso build/extra.qcow2