diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-04-13 19:14:32 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-05-09 12:08:18 +0000 |
| commit | 6c073176f5d9a803fb94d628b55d6dbaf673bc32 (patch) | |
| tree | c5034d643094e9277735716c97164865ea1a270a /vm | |
| parent | a6ea2c6376b49a6bfbe66613c6034c587bac8738 (diff) | |
| download | spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.tar spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.tar.gz spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.tar.bz2 spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.tar.lz spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.tar.xz spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.tar.zst spectrum-6c073176f5d9a803fb94d628b55d6dbaf673bc32.zip | |
vm: support "make run" on aarch64
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/sys/net/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 7a024bd..45d19d1 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -95,9 +95,9 @@ build/etc/s6-rc: $(VM_S6_RC_FILES) exit=$$?; rm -r $$dir; exit $$exit run-qemu: build/host/data/netvm/blk/root.img - $(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \ + @../../../scripts/run-qemu.sh -m 128 -cpu host -kernel $(KERNEL) -vga none \ -drive file=build/host/data/netvm/blk/root.img,if=virtio,format=raw,readonly=on \ - -append "console=ttyS0 root=PARTLABEL=root" \ + -append "root=PARTLABEL=root" \ -netdev user,id=net0 \ -device e1000e,netdev=net0 \ -netdev user,id=net1 \ @@ -109,14 +109,14 @@ run-qemu: build/host/data/netvm/blk/root.img run-cloud-hypervisor: build/host/data/netvm/blk/root.img rm -f build/vmm.sock - $(CLOUD_HYPERVISOR) \ + @../../../scripts/run-cloud-hypervisor.sh \ --api-socket path=build/vmm.sock \ --memory size=128M \ --disk path=build/host/data/netvm/blk/root.img,readonly=on \ --net tap=tap0 \ --net tap=tap1,mac=0A:B3:EC:80:00:00 \ --kernel $(KERNEL) \ - --cmdline "console=ttyS0 root=PARTLABEL=root" \ + --cmdline "root=PARTLABEL=root" \ --console tty \ --serial pty .PHONY: run-cloud-hypervisor |