From 29a66e716f4b672290007bf97a32406ff32129a4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 7 Sep 2019 20:53:12 -0600 Subject: [PATCH] Add extra drive to qemu_nvme --- mk/qemu.mk | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mk/qemu.mk b/mk/qemu.mk index 99c9afd..b85eddd 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -69,23 +69,27 @@ qemu_efi_no_build: build/extra.qcow2 -drive file=build/harddrive-efi.bin,format=raw \ -drive file=build/extra.qcow2 -qemu_nvme: build/harddrive.bin +qemu_nvme: build/harddrive.bin build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ - -drive file=build/harddrive.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL + -drive file=build/harddrive.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ + -drive file=build/extra.qcow2,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -qemu_nvme_no_build: +qemu_nvme_no_build: build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ - -drive file=build/harddrive.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL + -drive file=build/harddrive.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ + -drive file=build/extra.qcow2,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -qemu_nvme_efi: build/harddrive-efi.bin +qemu_nvme_efi: build/harddrive-efi.bin build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ -bios /usr/share/OVMF/OVMF_CODE.fd \ - -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL + -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ + -drive file=build/extra.qcow2,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -qemu_nvme_efi_no_build: +qemu_nvme_efi_no_build: build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \ -bios /usr/share/OVMF/OVMF_CODE.fd \ - -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL + -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ + -drive file=build/extra.qcow2,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA qemu_live: build/livedisk.bin build/extra.qcow2 $(QEMU) $(QEMUFLAGS) \