diff -u qemu-kvm-0.12.3+noroms/debian/changelog qemu-kvm-0.12.3+noroms/debian/changelog --- qemu-kvm-0.12.3+noroms/debian/changelog +++ qemu-kvm-0.12.3+noroms/debian/changelog @@ -1,3 +1,9 @@ +qemu-kvm (0.12.3+noroms-0ubuntu9.1) lucid-proposed; urgency=low + + * Apply a patch to fix a slow (but huge) memory leak (LP: #588293) + + -- Serge Hallyn Tue, 15 Jun 2010 07:52:46 -0500 + qemu-kvm (0.12.3+noroms-0ubuntu9) lucid; urgency=low * Architecture-specific fixes (LP: #568904) diff -u qemu-kvm-0.12.3+noroms/debian/patches/series qemu-kvm-0.12.3+noroms/debian/patches/series --- qemu-kvm-0.12.3+noroms/debian/patches/series +++ qemu-kvm-0.12.3+noroms/debian/patches/series @@ -11,0 +12 @@ +block-Fix-multiwrite-memory-leak-in-error-case.patch only in patch2: unchanged: --- qemu-kvm-0.12.3+noroms.orig/debian/patches/block-Fix-multiwrite-memory-leak-in-error-case.patch +++ qemu-kvm-0.12.3+noroms/debian/patches/block-Fix-multiwrite-memory-leak-in-error-case.patch @@ -0,0 +1,30 @@ +commit 7eb58a6c556c3880e6712cbf6d24d681261c5095 +Author: Kevin Wolf +Date: Tue Apr 6 18:24:07 2010 +0200 + + block: Fix multiwrite memory leak in error case + + Previously multiwrite_user_cb was never called if a request in the multiwrite + batch failed right away because it did set mcb->error immediately. Make it look + more like a normal callback to fix this. + + (re-based from upstream fix) + + Reported-by: Juan Quintela + Signed-off-by: Kevin Wolf + Signed-off-by: Aurelien Jarno + +Index: qemu-kvm-0.12.3+noroms/block.c +=================================================================== +--- qemu-kvm-0.12.3+noroms.orig/block.c 2010-06-15 08:27:50.000000000 -0500 ++++ qemu-kvm-0.12.3+noroms/block.c 2010-06-15 08:29:10.244281888 -0500 +@@ -1761,7 +1761,8 @@ + reqs[i].error = EIO; + goto fail; + } else { +- mcb->error = EIO; ++ mcb->num_requests++; ++ multiwrite_cb(mcb, -EIO); + break; + } + } else {