From e2f3446f227d4637f87cfa52cdd0ff87dae62858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 16 Apr 2014 15:52:28 +0200 Subject: [PATCH] dispvm: do not limit DispVM memory to reported allocated size Apparently it doesn't work with some kernels - saved domain still needs original memory amount to restore successfully. This happens at least on 3.12.14 kernel. Because qfile-daemon-dvm always requests 400MB from qmemman, this change should harm anyone - in any case DispVM needs 400MB free memory to start. Note that "xl mem-set" line is still there, which makes savefile somehow smaller (so faster restore). --- dispvm/qubes-prepare-saved-domain.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dispvm/qubes-prepare-saved-domain.sh b/dispvm/qubes-prepare-saved-domain.sh index 22b738d9..17c590b9 100755 --- a/dispvm/qubes-prepare-saved-domain.sh +++ b/dispvm/qubes-prepare-saved-domain.sh @@ -57,7 +57,8 @@ if ! xl save $1 $2 $VMDIR/$1.conf; then fi rm -f $QMEMMAN_STOP cd $VMDIR -# Fix start memory -sed -i -e "s/^memory.*/memory = $((MEM/1000))/" dvm.conf +# Apparently baloon driver isn't effective enough on some kernels - xl +# restore still needs initial memory amount +#sed -i -e "s/^memory.*/memory = $((MEM/1000))/" dvm.conf tar -Scvf saved-cows.tar volatile.img echo "DVM savefile created successfully."