diff options
-rw-r--r-- | img/app/Makefile | 24 | ||||
-rw-r--r-- | vm/sys/net/Makefile | 18 |
2 files changed, 21 insertions, 21 deletions
diff --git a/img/app/Makefile b/img/app/Makefile index 372e14c..7af7fcb 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -88,18 +88,18 @@ start-virtiofsd: run-qemu: $(imgdir)/appvm/blk/root.img start-virtiofsd $(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \ - -drive file=$(imgdir)/appvm/blk/root.img,if=virtio,format=raw,readonly=on \ - -drive file=$(RUN_IMG),if=virtio,format=raw,readonly=on \ - -append "console=ttyS0 root=PARTLABEL=root" \ - -netdev user,id=net0 \ - -device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \ - -chardev socket,id=virtiofsd,path=build/virtiofsd.sock \ - -device vhost-user-fs-pci,chardev=virtiofsd,tag=virtiofs0 \ - -object memory-backend-memfd,id=mem,size=128M,share=on \ - -numa node,memdev=mem \ - -chardev vc,id=virtiocon0 \ - -device virtio-serial-pci \ - -device virtconsole,chardev=virtiocon0 + -drive file=$(imgdir)/appvm/blk/root.img,if=virtio,format=raw,readonly=on \ + -drive file=$(RUN_IMG),if=virtio,format=raw,readonly=on \ + -append "console=ttyS0 root=PARTLABEL=root" \ + -netdev user,id=net0 \ + -device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \ + -chardev socket,id=virtiofsd,path=build/virtiofsd.sock \ + -device vhost-user-fs-pci,chardev=virtiofsd,tag=virtiofs0 \ + -object memory-backend-memfd,id=mem,size=128M,share=on \ + -numa node,memdev=mem \ + -chardev vc,id=virtiocon0 \ + -device virtio-serial-pci \ + -device virtconsole,chardev=virtiocon0 .PHONY: run-qemu run-cloud-hypervisor: $(imgdir)/appvm/blk/root.img start-virtiofsd diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index b47babe..57a1fd7 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -96,15 +96,15 @@ build/etc/s6-rc: $(VM_S6_RC_FILES) run-qemu: build/host/data/netvm/blk/root.img $(QEMU_KVM) -m 128 -cpu host -machine q35,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" \ - -netdev user,id=net0 \ - -device e1000e,netdev=net0 \ - -netdev user,id=net1 \ - -device virtio-net,netdev=net1,mac=0A:B3:EC:80:00:00 \ - -chardev vc,id=virtiocon0 \ - -device virtio-serial-pci \ - -device virtconsole,chardev=virtiocon0 + -drive file=build/host/data/netvm/blk/root.img,if=virtio,format=raw,readonly=on \ + -append "console=ttyS0 root=PARTLABEL=root" \ + -netdev user,id=net0 \ + -device e1000e,netdev=net0 \ + -netdev user,id=net1 \ + -device virtio-net,netdev=net1,mac=0A:B3:EC:80:00:00 \ + -chardev vc,id=virtiocon0 \ + -device virtio-serial-pci \ + -device virtconsole,chardev=virtiocon0 .PHONY: run-qemu run-cloud-hypervisor: build/host/data/netvm/blk/root.img |