...

1 files changed, 16 insertions, 2 deletions

diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
index fb2da5fc..bd398e88 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -3,7 +3,13 @@
 with lib;
 with flakeInputs.nixVirt.lib;
 
-{
+let
+  libosinfo = id: with xml;
+    elem "libosinfo:libosinfo" [ (attr "xmlns:libosinfo" "http://libosinfo.org/xmlns/libvirt/domain/1.0") ]
+      [
+        (elem "libosinfo:os" [ (attr "id" id) ] [])
+      ];
+in {
   config = {
     virtualisation.libvirt = {
       enable = true;
@@ -20,6 +26,7 @@ with flakeInputs.nixVirt.lib;
               virtio_video = true;
               install_virtio = false;
             }) {
+              metadata = libosinfo "http://microsoft.com/win/11";
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -73,6 +80,7 @@ with flakeInputs.nixVirt.lib;
                   {
                     readonly = true;
                     type = "pflash";
+                    secure = false;
                     path = "${pkgs.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
                   };
                 nvram =
@@ -82,6 +90,7 @@ with flakeInputs.nixVirt.lib;
                   };
                 bootmenu.enable = true;
               };
+              metadata = libosinfo "http://ubuntu.com/ubuntu/20.04";
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -148,6 +157,7 @@ with flakeInputs.nixVirt.lib;
                   {
                     readonly = true;
                     type = "pflash";
+                    secure = false;
                     path = "${pkgs.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
                   };
                 nvram =
@@ -157,6 +167,7 @@ with flakeInputs.nixVirt.lib;
                   };
                 bootmenu.enable = true;
               };
+              metadata = libosinfo "http://ubuntu.com/ubuntu/24.04";
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -227,7 +238,8 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "lmmirzm-vmrz01.qcow2";
-                  capacity = { count = 40; unit = "GB"; };
+                  allocation = { count = 0; };
+                  capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
                     format.type = "qcow2";
@@ -238,6 +250,7 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "vmrz02.qcow2";
+                  allocation = { count = 0; };
                   capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/vmrz02.qcow2";
@@ -249,6 +262,7 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "vmrz03.qcow2";
+                  allocation = { count = 0; };
                   capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/vmrz03.qcow2";