From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vJg-0005kp-M9 for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7vJb-0000Vu-Pl for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vJb-0000UR-IG for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:19 -0400 Date: Fri, 18 Jul 2014 02:44:36 +0300 From: "Michael S. Tsirkin" Message-ID: <1405640614-9252-2-git-send-email-mst@redhat.com> References: <1405640614-9252-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1405640614-9252-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 1/7] pc: fix qemu exiting with error when -m X < 128 with old machines types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Bruce Rogers , Anthony Liguori , Igor Mammedov From: Igor Mammedov If machine doesn't support memory hotplug then staring QEMU with initial memory less than default will make QEMU exit with following error message: $QEMU -m 16 -M isapc qemu-system-i386: "-memory 'slots|maxmem'" is not supported by: isapc Set maxram_size to initial memory value before parsing 'maxmem' option allows to keep maxmem in sync with initial memory size if no maxmem option was specified. Signed-off-by: Igor Mammedov CC: Bruce Rogers Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- vl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vl.c b/vl.c index 6e084c2..6abedcf 100644 --- a/vl.c +++ b/vl.c @@ -3315,6 +3315,7 @@ int main(int argc, char **argv, char **envp) error_report("ram size too large"); exit(EXIT_FAILURE); } + maxram_size = ram_size; maxmem_str = qemu_opt_get(opts, "maxmem"); slots_str = qemu_opt_get(opts, "slots"); -- MST