diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-09-25 10:41:39 +0200 |
---|---|---|
committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-09-25 11:10:10 +0200 |
commit | ded8f28c3a3bd0204738275362dc9450755f9e6b (patch) | |
tree | bf473a90230a9c910d8b0ca94a5d668587a4d426 /pkgs/build-support | |
parent | 61abf3bbd9154d6b25234a877272d158144709ff (diff) | |
download | nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.tar nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.tar.gz nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.tar.bz2 nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.tar.lz nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.tar.xz nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.tar.zst nixlib-ded8f28c3a3bd0204738275362dc9450755f9e6b.zip |
Revert "virtualization/qemu-vm: fix and improve virtio/scsi switching"
This reverts commit f777d2b719be0db4cb7819d5b6dbdd121db29a37. cc #34409 This breaks evaluation of the tested job: attribute 'diskInterface' missing, at /nix/store/5k9kk52bv6zsvsyyvpxhm8xmwyn2yjvx-source/pkgs/build-support/vm/default.nix:316:24
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/vm/default.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 6e98099460f8..03b3fb1f9f27 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,9 +3,8 @@ , img ? pkgs.stdenv.hostPlatform.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" "sym53c8xx" "virtio_scsi" "ahci "] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" -, config }: with pkgs; @@ -197,17 +196,9 @@ rec { ${qemuBinary qemu} \ -nographic -no-reboot \ -device virtio-rng-pci \ - ${if "$diskInterface" == "scsi" then '' \ - \ # FIXME: /dev/sda is not created within the VM - -device lsi53c895a \ - -device scsi-hd,drive=hd,id=scsi1,bootindex=1 \ - ''${diskImage:+-drive file=$diskImage,media=disk,if=none,id=hd,cache=unsafe,werror=report} \ - '' else '' \ - -drive file=$diskImage,media=disk,if=none,id=hd \ - -device virtio-blk-pci,scsi=off,drive=hd,id=virtio0,bootindex=1 \ - \''} -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ + ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ -append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ @@ -307,13 +298,12 @@ rec { `run-vm' will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively. */ - runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... } @ moreArgs : { + runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... }: { requiredSystemFeatures = [ "kvm" ]; builder = "${bash}/bin/sh"; args = ["-e" (vmRunCommand qemuCommandLinux)]; origArgs = args; origBuilder = builder; - diskInterface = "${moreArgs.diskInterface}"; QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}"; passAsFile = []; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742 }); |