diff options
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kvm/74.nix (renamed from pkgs/os-specific/linux/kvm/73.nix) | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3f6969aa124bc..3b6c878f2016e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -5,12 +5,12 @@ with pkgs; rec { - inherit (kernelPackages) kernel klibcShrunk; + inherit (kernelPackages_2_6_26) kernel klibcShrunk; modulesClosure = makeModulesClosure { inherit kernel; - rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ata_piix" "sd_mod"]; + rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"]; }; @@ -78,8 +78,7 @@ rec { mknod /dev/null c 1 3 mknod /dev/zero c 1 5 mknod /dev/tty c 5 0 - mknod /dev/sda b 8 0 - mknod /dev/hda b 3 0 + mknod /dev/vda b 253 0 ipconfig 10.0.2.15:::::eth0:none @@ -88,7 +87,7 @@ rec { if test -z "$mountDisk"; then mount -t tmpfs none /fs else - mount -t ext2 /dev/sda /fs + mount -t ext2 /dev/vda /fs fi mkdir -p /fs/hostfs @@ -168,7 +167,8 @@ rec { qemuCommandLinux = '' qemu-system-x86_64 \ -nographic -no-reboot \ - -smb / -hda $diskImage \ + -net nic,model=virtio -net user -smb / \ + -drive file=$diskImage,if=virtio,boot=on \ -kernel ${kernel}/vmlinuz \ -initrd ${initrd}/initrd \ -append "console=ttyS0 panic=1 command=${stage2Init} tmpDir=$TMPDIR out=$out mountDisk=$mountDisk" \ @@ -221,8 +221,8 @@ rec { createRootFS = '' mkdir /mnt - ${e2fsprogs}/sbin/mke2fs -F /dev/sda - ${klibcShrunk}/bin/mount -t ext2 /dev/sda /mnt + ${e2fsprogs}/sbin/mke2fs -F /dev/vda + ${klibcShrunk}/bin/mount -t ext2 /dev/vda /mnt if test -e /mnt/.debug; then exec ${bash}/bin/sh diff --git a/pkgs/os-specific/linux/kvm/73.nix b/pkgs/os-specific/linux/kvm/74.nix index 8da5cec8bc88b..6d1a15baef813 100644 --- a/pkgs/os-specific/linux/kvm/73.nix +++ b/pkgs/os-specific/linux/kvm/74.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "kvm-73"; + name = "kvm-74"; src = fetchurl { - url = mirror://sourceforge/kvm/kvm-73.tar.gz; - sha256 = "1bpdwvnb027zj1q3q9fpsbka2f84nzirihh31dzxprm0p89hlpnd"; + url = mirror://sourceforge/kvm/kvm-74.tar.gz; + sha256 = "0gnd5r9wb8mar3jh8gv46vdm3qkbgiwzkim5ki67kx3ca71g0m24"; }; patches = [ @@ -15,7 +15,7 @@ stdenv.mkDerivation { ./smbd-path.patch # The makefile copies stuff from the kernel directory and then # tries to modify the copy, but it must be made writable first. - ./readonly-kernel.patch + ./readonly-kernel-r2.patch ]; configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fa4bbc144f73..ee296e2a21b38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5346,7 +5346,7 @@ let inherit fetchurl stdenv libxml2; }; - kvm = kvm57; + kvm = kvm74; kvm57 = import ../os-specific/linux/kvm/57.nix { inherit fetchurl zlib e2fsprogs SDL alsaLib; @@ -5354,7 +5354,7 @@ let kernelHeaders = kernelHeaders_2_6_23; }; - kvm73 = import ../os-specific/linux/kvm/73.nix { + kvm74 = import ../os-specific/linux/kvm/74.nix { inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync; kernelHeaders = kernelHeaders_2_6_26; }; |