From patchwork Wed Aug 15 11:12:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 177628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B935A2C0088 for ; Wed, 15 Aug 2012 21:12:39 +1000 (EST) Received: from localhost ([::1]:59761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bWf-0006T6-Jz for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 07:12:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bWT-0006IX-Bc for qemu-devel@nongnu.org; Wed, 15 Aug 2012 07:12:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1bWQ-0002GW-Q5 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 07:12:25 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:34622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bWQ-0002G7-Iy for qemu-devel@nongnu.org; Wed, 15 Aug 2012 07:12:22 -0400 Received: from blackfin.pond.sub.org (p57B0FBD1.dip.t-dialin.net [87.176.251.209]) by oxygen.pond.sub.org (Postfix) with ESMTPA id BA01D9FE64; Wed, 15 Aug 2012 13:12:20 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3339A20060; Wed, 15 Aug 2012 13:12:20 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 13:12:19 +0200 Message-Id: <1345029140-12338-2-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345029140-12338-1-git-send-email-armbru@redhat.com> References: <1345029140-12338-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: blauwirbel@gmail.com, anthony@codemonkey.ws, avi@redhat.com, gleb@redhat.com Subject: [Qemu-devel] [PATCH v3 1/2] vl: Round argument of -m up to multiple of 8KiB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Partial pages make little sense and don't work. Ensure the RAM size is a multiple of any possible target's page size. Fixes $ qemu-system-x86_64 -nodefaults -S -vnc :0 -m 0.8 qemu-system-x86_64: /work/armbru/qemu/exec.c:2255: register_subpage: Assertion `existing->mr->subpage || existing->mr == &io_mem_unassigned' failed. Signed-off-by: Markus Armbruster --- vl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index d01256a..a63e16b 100644 --- a/vl.c +++ b/vl.c @@ -2701,6 +2701,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_m: { int64_t value; + uint64_t sz; char *end; value = strtosz(optarg, &end); @@ -2708,12 +2709,12 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: invalid ram size: %s\n", optarg); exit(1); } - - if (value != (uint64_t)(ram_addr_t)value) { + sz = QEMU_ALIGN_UP((uint64_t)value, 8192); + ram_size = sz; + if (ram_size != sz) { fprintf(stderr, "qemu: ram size too large\n"); exit(1); } - ram_size = value; break; } case QEMU_OPTION_mempath: