From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37183 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZijN-00027T-Jl for qemu-devel@nongnu.org; Fri, 16 Jul 2010 07:05:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZijM-0002ST-9f for qemu-devel@nongnu.org; Fri, 16 Jul 2010 07:05:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51875) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZijM-0002SD-1i for qemu-devel@nongnu.org; Fri, 16 Jul 2010 07:05:24 -0400 Date: Fri, 16 Jul 2010 14:00:04 +0300 From: "Michael S. Tsirkin" Message-ID: <20100716110004.GA28018@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pc: unbreak vhost List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alex.williamson@redhat.com, Anthony Liguori , qemu-devel@nongnu.org Commit 44ae28f3152138e71ccad66c201d730b93374bc2 breaks vhost on small guests as we get a zero-sized memory slot at >4G, which that code does not expect. The removal of if (above_4g_size > 0) seems unintentional (commit log only mentions allocation memory in a single chunk) so just put it back in. Signed-off-by: Michael S. Tsirkin --- hw/pc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 89bd4af..77b1592 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -920,8 +920,10 @@ void pc_memory_init(ram_addr_t ram_size, below_4g_mem_size - 0x100000, ram_addr + 0x100000); #if TARGET_PHYS_ADDR_BITS > 32 - cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, - ram_addr + below_4g_mem_size); + if (above_4g_mem_size > 0) { + cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, + ram_addr + below_4g_mem_size); + } #endif /* BIOS load */ -- 1.7.2.rc0.14.g41c1c