diff options
Diffstat (limited to 'vm/sys')
| -rw-r--r-- | vm/sys/net/Makefile | 11 | ||||
| -rw-r--r-- | vm/sys/net/shell.nix | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index bbeb40b..d31477a 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -119,6 +119,17 @@ run-cloud-hypervisor: build/host/data/netvm/blk/root.img --serial pty .PHONY: run-cloud-hypervisor +run-crosvm: build/host/data/netvm/blk/root.img + $(CROSVM_RUN) \ + --disk build/host/data/netvm/blk/root.img \ + -p "console=ttyS0 root=PARTLABEL=root" \ + --net tap-name=tap0 \ + --net tap-name=tap1,mac=0A:B3:EC:80:00:00 \ + --serial type=file,hardware=serial,path=build/crosvm.log \ + --serial type=stdout,hardware=virtio-console,stdin=true \ + $(KERNEL) +.PHONY: run-crosvm + run: run-$(VMM) .PHONY: run diff --git a/vm/sys/net/shell.nix b/vm/sys/net/shell.nix index 7710438..39ba520 100644 --- a/vm/sys/net/shell.nix +++ b/vm/sys/net/shell.nix @@ -7,5 +7,5 @@ import ../../../lib/eval-config.nix ({ config, ... }: with config.pkgs; { nativeBuildInputs ? [], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ cloud-hypervisor jq qemu_kvm reuse ]; + nativeBuildInputs = nativeBuildInputs ++ [ cloud-hypervisor crosvm jq qemu_kvm reuse ]; })) |