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: 657f4927ebcd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3590f02e7d57
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 7, 2020

  1. nixos/qemu-vm: add option to use a non-standard BIOS 

    I'd like to change the default on x86 platforms to qboot at some point, since it
saves a fair bit of startup time.
    @JJJollyjim
    JJJollyjim committed Jun 7, 2020
    Copy the full SHA
    55912f3 View commit details

Commits on Jun 8, 2020

  1. Merge pull request #88574 from JJJollyjim/qemu-vm-qboot-opt 

    nixos/qemu-vm: add option to use qboot
    @flokli
    flokli authored Jun 8, 2020
    Copy the full SHA
    3590f02 View commit details
Showing with 32 additions and 1 deletion.
  1. +15 −0 nixos/modules/virtualisation/qemu-vm.nix
  2. +1 −0 nixos/tests/all-tests.nix
  3. +13 −0 nixos/tests/qboot.nix
  4. +3 −1 pkgs/applications/virtualization/qboot/default.nix
15 changes: 15 additions & 0 deletions nixos/modules/virtualisation/qemu-vm.nix
View file
Original file line number Diff line number Diff line change
@@ -441,6 +441,18 @@ in
'';
};

virtualisation.bios =
mkOption {
default = null;
type = types.nullOr types.package;
description =
''
An alternate BIOS (such as <package>qboot</package>) with which to start the VM.
Should containin a file named <literal>bios.bin</literal>.
If <literal>null</literal>, QEMU's builtin SeaBIOS will be used.
'';
};

};

config = {
@@ -521,6 +533,9 @@ in
(mkIf cfg.useEFIBoot [
"-pflash $TMPDIR/bios.bin"
])
(mkIf (cfg.bios != null) [
"-bios ${cfg.bios}/bios.bin"
])
(mkIf (!cfg.graphics) [
"-nographic"
])
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
View file
Original file line number Diff line number Diff line change
@@ -273,6 +273,7 @@ in
prosody = handleTest ./xmpp/prosody.nix {};
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
proxy = handleTest ./proxy.nix {};
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
quagga = handleTest ./quagga.nix {};
quorum = handleTest ./quorum.nix {};
rabbitmq = handleTest ./rabbitmq.nix {};
13 changes: 13 additions & 0 deletions nixos/tests/qboot.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "qboot";

machine = { ... }: {
virtualisation.bios = pkgs.qboot;
};

testScript =
''
start_all()
machine.wait_for_unit("multi-user.target")
'';
})
4 changes: 3 additions & 1 deletion pkgs/applications/virtualization/qboot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, meson, ninja, fetchFromGitHub }:
{ stdenv, meson, ninja, fetchFromGitHub, nixosTests }:

stdenv.mkDerivation {
name = "qboot-20200423";
@@ -19,6 +19,8 @@ stdenv.mkDerivation {

hardeningDisable = [ "stackprotector" "pic" ];

passthru.tests = { qboot = nixosTests.qboot; };

meta = {
description = "A simple x86 firmware for booting Linux";
homepage = "https://github.com/bonzini/qboot";