Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 87e7faa937f2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 112b5556afe0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 1, 2017

  1. 3
    Copy the full SHA
    df5d588 View commit details

Commits on May 9, 2017

  1. Merge pull request #25397 from clefru/qemu-OVMF-on-channels

    Introduce virtualisation.libvirtd.qemuOvmf.
    Peter Hoeg authored May 9, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    Copy the full SHA
    112b555 View commit details
Showing with 12 additions and 0 deletions.
  1. +12 −0 nixos/modules/virtualisation/libvirtd.nix
12 changes: 12 additions & 0 deletions nixos/modules/virtualisation/libvirtd.nix
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@ let
${cfg.extraConfig}
'';
qemuConfigFile = pkgs.writeText "qemu.conf" ''
${optionalString cfg.qemuOvmf ''
nvram = ["${pkgs.OVMF}/FV/OVMF_CODE.fd:${pkgs.OVMF}/FV/OVMF_VARS.fd"]
''}
${cfg.qemuVerbatimConfig}
'';

@@ -63,6 +66,15 @@ in {
'';
};

virtualisation.libvirtd.qemuOvmf = mkOption {
type = types.bool;
default = true;
description = ''
Allows libvirtd to take advantage of OVMF when creating new
QEMU VMs with UEFI boot.
'';
};

virtualisation.libvirtd.extraOptions = mkOption {
type = types.listOf types.str;
default = [ ];