domain XML generation: add QEMU commandline (#18)

AshleyYakeley · Apr 2, 2024 · 348ec01 · 348ec01
1 parent 0af44a3
commit 348ec01
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## [0.4.2]
 
 * Lib:
+    * XML generation:
+        * Allow QEMU `commandline` in domains
     * Domain Templates:
         * Fix defect in `storage_vol` in Windows template
         * add `virtio_drive` option for all

diff --git a/checks/domain/template-windows-2/expected.xml b/checks/domain/template-windows-2/expected.xml
@@ -88,4 +88,10 @@
     <redirdev bus='usb' type='spicevmc'/>
     <redirdev bus='usb' type='spicevmc'/>
   </devices>
+  <commandline xmlns='http://libvirt.org/schemas/domain/qemu/1.0'>
+    <arg value='-newarg'/>
+    <arg value='parameter'/>
+    <env name='ID' value='wibble'/>
+    <env name='BAR'/>
+  </commandline>
 </domain>
diff --git a/checks/domain/template-windows-2/input.nix b/checks/domain/template-windows-2/input.nix
@@ -1,8 +1,23 @@
 lib: lib.domain.templates.windows
+  {
+    name = "test-windows-2";
+    uuid = "a67f3ed6-fdad-462a-8c3b-d970db34d8da";
+    storage_vol = { pool = "default"; volume = "win10.qcow2"; };
+    install_vol = /Source/Win11_23H2_EnglishInternational_x64v2.iso;
+    nvram_path = /Storage/MyNVRAM.fd;
+  } //
 {
-  name = "test-windows-2";
-  uuid = "a67f3ed6-fdad-462a-8c3b-d970db34d8da";
-  storage_vol = { pool = "default"; volume = "win10.qcow2"; };
-  install_vol = /Source/Win11_23H2_EnglishInternational_x64v2.iso;
-  nvram_path = /Storage/MyNVRAM.fd;
+  qemu-commandline =
+    {
+      arg =
+        [
+          { value = "-newarg"; }
+          { value = "parameter"; }
+        ];
+      env =
+        [
+          { name = "ID"; value = "wibble"; }
+          { name = "BAR"; }
+        ];
+    };
 }
diff --git a/generate-xml/domain.nix b/generate-xml/domain.nix
@@ -279,6 +279,12 @@ let
               (subelem "memballoon" [ (subattr "model" typeString) ] [ addresselem ])
             ]
         )
+        (sub "qemu-commandline" (elem "commandline"
+          [ (attr "xmlns" (typeConstant "http://libvirt.org/schemas/domain/qemu/1.0")) ]
+          [
+            (subelem "arg" [ (subattr "value" typeString) ] [ ])
+            (subelem "env" [ (subattr "name" typeString) (subattr "value" typeString) ] [ ])
+          ]))
       ];
 
 in

diff --git a/generate-xml/generate.nix b/generate-xml/generate.nix
@@ -37,6 +37,7 @@ rec
 
   subelem = etype: attrs: contents: sub etype (many (elem etype attrs contents));
 
+  typeConstant = c: x: c;
   typeString = typeConvert "string" builtins.isString id;
   typeInt = typeConvert "int" builtins.isInt builtins.toString;
   typeBoolYesNo = typeConvert "bool" builtins.isBool yesno;