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

Switch extra.qcow2 to extra.bin

Browse source
This commit is contained in:
Jeremy Soller 2019-09-15 13:41:21 -06:00
parent cf27f48361
commit d876f58b00
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
mk/qemu.mk
View file

@ -44,85 +44,89 @@ endif
#,int,pcall #,int,pcall
#-device intel-iommu #-device intel-iommu
build/extra.qcow2: build/extra.bin:
qemu-img create -f qcow2 $@ 1G fallocate --posix --length 1G $@
qemu: build/harddrive.bin build/extra.qcow2 qemu: build/harddrive.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive.bin,format=raw \ -drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_no_build: build/extra.qcow2 qemu_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive.bin,format=raw \ -drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_efi: build/harddrive-efi.bin build/extra.qcow2 qemu_efi: build/harddrive-efi.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios /usr/share/OVMF/OVMF_CODE.fd \
-drive file=build/harddrive-efi.bin,format=raw \ -drive file=build/harddrive-efi.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_efi_no_build: build/extra.qcow2 qemu_efi_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios /usr/share/OVMF/OVMF_CODE.fd \
-drive file=build/harddrive-efi.bin,format=raw \ -drive file=build/harddrive-efi.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_nvme: build/harddrive.bin build/extra.qcow2 qemu_nvme: build/harddrive.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(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 -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
qemu_nvme_no_build: build/extra.qcow2 qemu_nvme_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(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 -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
qemu_nvme_efi: build/harddrive-efi.bin build/extra.qcow2 qemu_nvme_efi: build/harddrive-efi.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -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 -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
qemu_nvme_efi_no_build: build/extra.qcow2 qemu_nvme_efi_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -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 -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
qemu_live: build/livedisk.bin build/extra.qcow2 qemu_live: build/livedisk.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/livedisk.bin,format=raw \ -drive file=build/livedisk.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_live_no_build: build/extra.qcow2 qemu_live_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/livedisk.bin,format=raw \ -drive file=build/livedisk.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_iso: build/livedisk.iso build/extra.qcow2 qemu_iso: build/livedisk.iso build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-boot d -cdrom build/livedisk.iso \ -boot d -cdrom build/livedisk.iso \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_iso_no_build: build/extra.qcow2 qemu_iso_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-boot d -cdrom build/livedisk.iso \ -boot d -cdrom build/livedisk.iso \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_iso_efi: build/livedisk-efi.iso build/extra.qcow2 qemu_iso_efi: build/livedisk-efi.iso build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios /usr/share/OVMF/OVMF_CODE.fd \
-boot d -cdrom build/livedisk-efi.iso \ -boot d -cdrom build/livedisk-efi.iso \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_iso_efi_no_build: build/extra.qcow2 qemu_iso_efi_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios /usr/share/OVMF/OVMF_CODE.fd \
-boot d -cdrom build/livedisk-efi.iso \ -boot d -cdrom build/livedisk-efi.iso \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_extra: build/extra.qcow2 qemu_extra: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/extra.qcow2 -drive file=build/extra.bin,format=raw
qemu_nvme_extra: build/extra.bin
$(QEMU) $(QEMUFLAGS) \
-drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA