diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-05 12:55:50 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-05 12:55:50 -0400 |
commit | df645c22cc8931f076c2c9fa4a982368633d83e9 (patch) | |
tree | 09af7bf2c12cf17ed26e018e8558277c0fd8fc19 /pkgs/os-specific | |
parent | 500037bb4b4c392a1855270d508ecc866dc0bcbf (diff) | |
download | nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.tar nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.tar.gz nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.tar.bz2 nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.tar.lz nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.tar.xz nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.tar.zst nixlib-df645c22cc8931f076c2c9fa4a982368633d83e9.zip |
qemu-kvm: update to 1.1.0
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/qemu-kvm/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 |
2 files changed, 4 insertions, 31 deletions
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index f6709bb439f4..af200c7a1ef1 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,20 +3,20 @@ assert stdenv.isLinux; -let version = "1.0.1"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; + sha256 = "1gzch3yshq7yirc5k3cn0m3ibd6qbl2hvl1lbh7lychfc7s4a963"; }; - patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; + patches = [ ./smb-tmpdir.patch ]; postPatch = - '' for i in $(find kvm -type f) + '' for i in $(find . -type f) do sed -i "$i" \ -e 's|/bin/bash|/bin/sh|g ; diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch deleted file mode 100644 index 446a69a146b0..000000000000 --- a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch +++ /dev/null @@ -1,27 +0,0 @@ -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); |