Skip to content

Commit 62b9252

Browse files
committed
stratovirt: remove leftovers
1 parent 70b346e commit 62b9252

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

lib/runners/stratovirt.nix

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let
88

99
inherit (microvmConfig)
1010
hostName
11-
vcpu mem balloonMem interfaces shares socket forwardPorts devices
11+
vcpu mem interfaces shares socket forwardPorts devices
1212
kernel initrdPath
1313
storeOnDisk storeDisk;
1414

@@ -72,7 +72,7 @@ in {
7272
"${pkgs.stratovirt}/bin/stratovirt"
7373
"-name" hostName
7474
"-machine" machine
75-
"-m" (toString (mem + balloonMem))
75+
"-m" (toString mem)
7676
"-smp" (toString vcpu)
7777

7878
"-kernel" "${kernel}/bzImage"
@@ -88,16 +88,11 @@ in {
8888
"-device" "virtio-blk-${devType 2},drive=store,id=blk_store"
8989
] ++
9090
lib.optionals (socket != null) [ "-qmp" "unix:${socket},server,nowait" ] ++
91-
# lib.optionals (balloonMem > 0) [ "-device" "virtio-balloon-${devType 3}" ] ++
9291
builtins.concatMap ({ image, letter, ... }: [
9392
"-drive" "id=vd${letter},format=raw,file=${image},aio=io_uring"
9493
"-device" "virtio-blk-${devType 4},drive=vd${letter},id=blk_vd${letter}"
9594
]) volumes ++
9695
lib.optionals (shares != []) (
97-
[
98-
# "-object" "memory-backend-memfd,id=mem,size=${toString (mem + balloonMem)}M,share=on"
99-
# "-numa" "node,memdev=mem"
100-
] ++
10196
builtins.concatMap ({ proto, index, socket, source, tag, ... }: {
10297
"virtiofs" = [
10398
"-chardev" "socket,id=fs${toString index},path=${socket}"
@@ -147,7 +142,6 @@ in {
147142
}.${bus}) devices
148143
++
149144
lib.optionals (lib.hasPrefix "q35" machine) [
150-
# "-drive" "file=${pkgs.qboot}/bios.bin,if=pflash,unit=0,readonly=true"
151145
"-drive" "file=${pkgs.OVMF.fd}/FV/OVMF_CODE.fd,if=pflash,unit=0,readonly=true"
152146
"-drive" "file=${pkgs.OVMF.fd}/FV/OVMF_VARS.fd,if=pflash,unit=1,readonly=true"
153147
]

0 commit comments

Comments
 (0)