From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5fBl-0002nX-FP for qemu-devel@nongnu.org; Fri, 11 Jul 2014 14:04:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5fBf-0006zq-KH for qemu-devel@nongnu.org; Fri, 11 Jul 2014 14:04:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5fBf-0006zM-CL for qemu-devel@nongnu.org; Fri, 11 Jul 2014 14:04:47 -0400 Date: Fri, 11 Jul 2014 21:06:57 +0300 From: "Michael S. Tsirkin" Message-ID: <20140711180657.GA1439@redhat.com> References: <1404826186-15146-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1404826186-15146-1-git-send-email-imammedo@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-2.1] 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: Igor Mammedov Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, brogers@suse.com On Tue, Jul 08, 2014 at 03:29:46PM +0200, Igor Mammedov wrote: > 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 OK this is a regression fix so we need it for 2.1. Applied, thanks! > --- > 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"); > -- > 1.8.5.2 (Apple Git-48)