swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qemu-kvm: update to 1.1.0"

Browse source 
This reverts commit df645c22cc.

KVM 1.1.0 breaks several VM builds.  The NixOS installer tests hang:

  http://hydra.nixos.org/build/2763935

but worse, some builds give random failures indicating corruption:

  http://hydra.nixos.org/build/2776221
  http://hydra.nixos.org/build/2776180
  http://hydra.nixos.org/build/2769347
  http://hydra.nixos.org/build/2769337
This commit is contained in:
Eelco Dolstra 2012-07-08 18:42:55 -04:00
parent ac1081fb48
commit 9abd2194ce
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/qemu-kvm/default.nix
View file

@ -3,20 +3,20 @@
assert stdenv.isLinux;
let version = "1.1.0"; in
let version = "1.0.1"; in
stdenv.mkDerivation rec {
name = "qemu-kvm-${version}";
src = fetchurl {
url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
sha256 = "1gzch3yshq7yirc5k3cn0m3ibd6qbl2hvl1lbh7lychfc7s4a963";
sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
};
patches = [ ./smb-tmpdir.patch ];
patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
postPatch =
'' for i in $(find . -type f)
'' for i in $(find kvm -type f)
do
sed -i "$i" \
-e 's|/bin/bash|/bin/sh|g ;

27
pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch Normal file
View file

@ -0,0 +1,27 @@
From http://patchwork.ozlabs.org/patch/137186/
diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c
--- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200
+++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100
@@ -1,7 +1,7 @@
/*
* Block driver for the Virtual Disk Image (VDI) format
*
- * Copyright (c) 2009 Stefan Weil
+ * Copyright (c) 2009, 2012 Stefan Weil
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -767,8 +767,12 @@
acb->header_modified = 1;
}
acb->bmap_last = block_index;
+ /* Copy data to be written to new block and zero unused parts. */
+ memset(block, 0, sector_in_block * SECTOR_SIZE);
memcpy(block + sector_in_block * SECTOR_SIZE,
acb->buf, n_sectors * SECTOR_SIZE);
+ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0,
+ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE);
acb->hd_iov.iov_base = (void *)block;
acb->hd_iov.iov_len = s->block_size;
qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1);