AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix libvirt-guests

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-04-08 22:47:27 +03:00
parent edaf1bcc03
commit 6172dda5e7
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/libvirt-guests/default.nix
View File

@ -36,7 +36,7 @@ let
options = rec { options = rec {
# TODO # TODO
guestOsType = mkOption { guestOsType = mkOption {
type = enum [ "linux" "windows" ]; type = types.enum [ "linux" "windows" ];
default = "linux"; default = "linux";
}; };
uefi = mkOption { uefi = mkOption {
@ -237,7 +237,11 @@ in {
<cpu mode="host-passthrough" check="none" migratable="on"> <cpu mode="host-passthrough" check="none" migratable="on">
${ ${
with guest.cpu; '' with guest.cpu; ''
<topology sockets="${sockets}" cores="${cores}" threads="${threads}"/> <topology
sockets="${toString sockets}"
cores="${toString cores}"
threads="${toString threads}"
/>
'' ''
} }
</cpu> </cpu>
@ -260,7 +264,7 @@ in {
${ ${
lib.concatStrings (map (disk: '' lib.concatStrings (map (disk: ''
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu" type="${disk.type}"/> <driver name="qemu" type="${disk.type}" discard="unmap"/>
<source file="${disk.diskFile}"/> <source file="${disk.diskFile}"/>
<target dev="vda" bus="${disk.bus}"/> <target dev="vda" bus="${disk.bus}"/>
</disk> </disk>
@ -349,9 +353,16 @@ in {
"" ""
} }
${ ${
lib.optionalString guest.devices.video.enable '' with guest.devices.video;
with lib;
optionalString enable ''
<video> <video>
<model type="${guest.devices.video.type}" heads="1"/> ${if type == "virtio" then ''
<model type="virtio" heads="1"/>
'' else if type == "qxl" then ''
<model type="qxl" ram="65536" vram="65536" vgamem="16384" heads="1"/>
'' else
""}
</video> </video>
'' ''
} }
@ -371,6 +382,9 @@ in {
in '' in ''
uuid="$(${pkgs.libvirt}/bin/virsh domuuid '${name}' || true)" uuid="$(${pkgs.libvirt}/bin/virsh domuuid '${name}' || true)"
${pkgs.libvirt}/bin/virsh define <(sed "s/UUID/$uuid/" '${xml}') ${pkgs.libvirt}/bin/virsh define <(sed "s/UUID/$uuid/" '${xml}')
${lib.optionalString
(guest.devices.network.interfaceType == "network")
"${pkgs.libvirt}/bin/virsh net-start ${guest.devices.network.sourceDev}"}
${pkgs.libvirt}/bin/virsh start '${name}' ${pkgs.libvirt}/bin/virsh start '${name}'
''; '';
preStop = '' preStop = ''