diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-22 23:20:44 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-22 23:20:57 +0200 |
| commit | c43f385e67619d2ac88780550bfc51b348a8578d (patch) | |
| tree | 03bce1dbbd9bd9562adbac9788b8f1909512d84f /pkgs/os-specific/linux/qemu-kvm | |
| parent | e188f8ec66ba628e51c7f0c34f1a56dd6882d5b4 (diff) | |
qemu-kvm: update to 1.1.1
Diffstat (limited to 'pkgs/os-specific/linux/qemu-kvm')
| -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 f6709bb439f49..a24b06cb5b93b 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,17 +3,17 @@ assert stdenv.isLinux; -let version = "1.0.1"; in +let version = "1.1.1"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { - url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; + url = "mirror://sourceforge/kvm/${name}.tar.gz"; + sha256 = "1pwnqxcz0xxm7ljhr7gjr3rs0h811a2271kj6kmmvbfwr9ybbyn6"; }; - patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; + patches = [ ./smb-tmpdir.patch ]; postPatch = '' for i in $(find kvm -type f) 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 446a69a146b03..0000000000000 --- 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); |