Merge master into staging-next

nixos/modules/virtualisation/disk-size-option.nix

@@ -18,7 +18,7 @@ in
       default = if config.virtualisation.diskSizeAutoSupported then "auto" else 1024;
       defaultText = lib.literalExpression "if virtualisation.diskSizeAutoSupported then \"auto\" else 1024";
       description = ''
-        The disk size in megabytes of the virtual machine.
+        The disk size in MiB (1024×1024 bytes) of the virtual machine.
       '';
     };
   };

nixos/modules/virtualisation/proxmox-image.nix

@@ -71,7 +71,7 @@ with lib;
         type = types.ints.positive;
         default = 1024;
         description = ''
-          Guest memory in MB
+          Guest memory in MiB (1024×1024 bytes)
         '';
       };
       bios = mkOption {

nixos/modules/virtualisation/qemu-vm.nix

@@ -405,7 +405,7 @@ in
       type = types.ints.positive;
       default = 1024;
       description = ''
-        The memory size in megabytes of the virtual machine.
+        The memory size of the virtual machine in MiB (1024×1024 bytes).
       '';
     };
 
@@ -480,7 +480,7 @@ in
       default = [ ];
       description = ''
         Additional disk images to provide to the VM. The value is
-        a list of size in megabytes of each disk. These disks are
+        a list of size in MiB (1024×1024 bytes) of each disk. These disks are
         writeable by the VM.
       '';
     };
@@ -1129,7 +1129,7 @@ in
         {
           assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047;
           message = ''
-            virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max.
+            virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047 MiB RAM on 32bit max.
           '';
         }
         {

nixos/modules/virtualisation/waagent.nix

@@ -174,7 +174,7 @@ let
           type = types.int;
           default = 0;
           description = ''
-            Specifies the size of the swap file in megabytes.
+            Specifies the size of the swap file in MiB (1024×1024 bytes).
 
             This configuration has no effect if resource disk is managed by cloud-init.
           '';