Skip to content

qemu: Specify PCI passthrough devices early to support low PCI addresses #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −15
Open

qemu: Specify PCI passthrough devices early to support low PCI addresses #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions lib/runners/qemu.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,21 @@ lib.warnIf (mem == 2048) ''

"-chardev" "stdio,id=stdio,signal=off"
"-device" "virtio-rng-${devType}"
] ++
])
+ " " + # Move vfio-pci outside of escapeShellArgs
lib.concatStringsSep " " (lib.concatMap ({ bus, path, qemu,... }: {
pci = [
"-device" "vfio-pci,host=${path},multifunction=on${
# Allow to pass additional arguments to pci device
lib.optionalString (qemu.deviceExtraArgs != null) ",${qemu.deviceExtraArgs}"
}"
];
usb = [
"-device" "usb-host,${path}"
];
}.${bus}) devices)
+ " " +
lib.escapeShellArgs(
builtins.concatMap (fwCfgOption: ["-fw_cfg" fwCfgOption]) fwCfgOptions ++
lib.optionals serialConsole [
"-serial" "chardev:stdio"
Expand Down Expand Up @@ -241,7 +255,7 @@ lib.warnIf (mem == 2048) ''
lib.optionals (user != null) [ "-user" user ] ++
lib.optionals (socket != null) [ "-qmp" "unix:${socket},server,nowait" ] ++
lib.optionals balloon [
"-device" ("virtio-balloon,free-page-reporting=on,id=balloon0" + lib.optionalString (deflateOnOOM) ",deflate-on-oom=on")
"-device" ("virtio-balloon,free-page-reporting=on,id=balloon0" + lib.optionalString (deflateOnOOM) ",deflate-on-oom=on")
] ++
builtins.concatMap ({ image, letter, serial, direct, readOnly, ... }:
[ "-drive"
Expand Down Expand Up @@ -328,19 +342,7 @@ lib.warnIf (mem == 2048) ''
]
++
extraArgs
)
+ " " + # Move vfio-pci outside of
lib.concatStringsSep " " (lib.concatMap ({ bus, path, qemu,... }: {
pci = [
"-device" "vfio-pci,host=${path},multifunction=on${
# Allow to pass additional arguments to pci device
lib.optionalString (qemu.deviceExtraArgs != null) ",${qemu.deviceExtraArgs}"
}"
];
usb = [
"-device" "usb-host,${path}"
];
}.${bus}) devices);
);

canShutdown = socket != null;

Expand Down