From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4X7r-00062h-34 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 10:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4WBS-0006TW-F4 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:27 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:60883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WBR-0006SX-Tc for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:18 -0400 From: Markus Armbruster Date: Wed, 31 Jul 2013 15:11:04 +0200 Message-Id: <1375276272-15988-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 for 1.6 0/8] Guest memory allocation fixes & cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, stefano.stabellini@eu.citrix.com, mtosatti@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, mkletzan@redhat.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net All I wanted to do is exit(1) instead of abort() on guest memory allocation failure [07/08]. But that lead me into a minor #ifdef bog, and here's what I brought back. Enjoy! Testing: * Christian Borntraeger reports v1 works fine under LPAR (new S390 KVM, i.e. generic allocation) and as second guest under z/VM (old S390 KVM, i.e. legacy S390 allocation). Thanks for testing, and for catching a stupid mistake. v2 differs from v1 only in code that isn't reachable on S390. Changes since v2: * Straightforward rebase, only 4/8 conflicted Changes since v1: * 5/8: Fix assertion in qemu_ram_remap() (Paolo) * All other patches unchanged except for Acked-by in commit messages Changes since RFC: * 1-3+8/8 unchanged except for commit message tweaks * 4+6/8 rewritten to address Paolo's review * 5/8 rewritten: don't fix dead code, just assert it's dead * 7/8 fix mistakes caught by Richard Henderson and Peter Maydell Markus Armbruster (8): exec: Fix Xen RAM allocation with unusual options exec: Clean up fall back when -mem-path allocation fails exec: Reduce ifdeffery around -mem-path exec: Simplify the guest physical memory allocation hook exec: Drop incorrect & dead S390 code in qemu_ram_remap() exec: Clean up unnecessary S390 ifdeffery exec: Don't abort when we can't allocate guest memory pc_sysfw: Fix ISA BIOS init for ridiculously big flash exec.c | 120 ++++++++++++++++++++++++++---------------------- hw/block/pc_sysfw.c | 5 +- include/exec/cpu-all.h | 2 - include/exec/exec-all.h | 2 + include/sysemu/kvm.h | 5 -- kvm-all.c | 13 ------ target-s390x/kvm.c | 23 +++------- util/oslib-posix.c | 4 +- util/oslib-win32.c | 5 +- 9 files changed, 77 insertions(+), 102 deletions(-) -- 1.7.11.7