diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-11-24 14:48:18 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-11-26 11:22:39 +0200 |
| commit | f3794bb8cb417ca1fdafe785e5090b72d62b4d66 (patch) | |
| tree | bcf803fe2c6eb87a04658e0f1b87705263749fb2 | |
| parent | 8762490337b69b2428628c333873c752beac9e85 (diff) | |
| download | nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.tar nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.tar.gz nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.tar.bz2 nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.tar.lz nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.tar.xz nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.tar.zst nixpkgs-f3794bb8cb417ca1fdafe785e5090b72d62b4d66.zip | |
nixos/qemu-guest: Ensure virtio_mmio is available in initrd
ARM and AArch64 might use virtio_mmio in some cases.
| -rw-r--r-- | nixos/modules/profiles/qemu-guest.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index 987eb051b98..a1ec1d45395 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -4,7 +4,7 @@ { config, pkgs, ... }: { - boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; + boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ]; boot.initrd.postDeviceCommands = diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 26c66dca8a5..fdd7c2013b4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,7 +3,7 @@ , img ? "bzImage" , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] }: with pkgs; |