Skip to content

Fix compilation of arcd #79

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
manalito wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation of arcd #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83db5d5
Fixed dump
Aragas Nov 4, 2023
ad167e0
fixed compilation with nim 2.0.0
Nov 24, 2023
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
9 changes: 5 additions & 4 deletions src/libvfio/control/iommu.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import ../types
type
Physical = object ## Internal structure to help us with sorting
## the files.
numVfs: Positive ## Number of virtual functions exposed by the PCI.
numVfs: Positive = 1 ## Number of virtual functions exposed by the PCI.
baseDir: string ## Base directory holding the physical device.
case kind: VfioTypes
of vtGPU:
Expand Down Expand Up @@ -149,9 +149,10 @@ proc getVfios*(cfg: Config, uuid: string, monad: CommandMonad): seq[Vfio] =
result = (ret, newList)

func lowCpuLoadSort(a, b: (string, seq[Physical])): int =
const
# Nim is complaining about this syntax
f = (y: seq[Physical]) => sum(map(y, (x: Physical) => x.numVfs))

proc f(y: seq[Physical]): int =
result = sum(map(y, proc (x: Physical): int = x.numVfs))

let
aSum: int = f(a[1])
bSum: int = f(b[1])
Expand Down
3 changes: 2 additions & 1 deletion src/libvfio/types/config.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,5 +372,6 @@ proc writeConfigFile*(s: string, cfg: Config) =
##
## Side effects - Writes a configuration file.
let fileStream = newFileStream(s, fmWrite)
dump(cfg, fileStream)
let dumper = canonicalDumper()
dumper.dump(cfg, fileStream)
close(fileStream)