From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm3c1-0006fj-RG for qemu-devel@nongnu.org; Wed, 27 Jul 2011 08:53:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qm3c0-0005Lz-IZ for qemu-devel@nongnu.org; Wed, 27 Jul 2011 08:53:21 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47629 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm3c0-0005Lr-Ds for qemu-devel@nongnu.org; Wed, 27 Jul 2011 08:53:20 -0400 Message-ID: <4E300A3C.9020307@suse.de> Date: Wed, 27 Jul 2011 14:53:16 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1311185864-32745-1-git-send-email-anthony.perard@citrix.com> <1311185864-32745-4-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1311185864-32745-4-git-send-email-anthony.perard@citrix.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V2 3/3] vl.c: Check the asked ram_size later. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony PERARD Cc: Xen Devel , QEMU-devel , Stefano Stabellini On 07/20/2011 08:17 PM, Anthony PERARD wrote: > As a Xen guest can have more than 2GB of RAM on a 32bit host, we move > the conditions after than we now if we run one Xen or not. > > Signed-off-by: Anthony PERARD > --- > vl.c | 14 ++++++++------ > 1 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/vl.c b/vl.c > index fcd7395..c2efedf 100644 > --- a/vl.c > +++ b/vl.c > @@ -2433,11 +2433,6 @@ int main(int argc, char **argv, char **envp) > exit(1); > } > > - /* On 32-bit hosts, QEMU is limited by virtual address space */ > - if (value> (2047<< 20)&& HOST_LONG_BITS == 32) { > - fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n"); > - exit(1); > - } > if (value != (uint64_t)(ram_addr_t)value) { > fprintf(stderr, "qemu: ram size too large\n"); > exit(1); > @@ -3091,8 +3086,15 @@ int main(int argc, char **argv, char **envp) > exit(1); > > /* init the memory */ > - if (ram_size == 0) > + if (ram_size == 0) { > ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; > + } else if (!xen_enabled()) { I don't see why those are mutually exclusive. > + /* On 32-bit hosts, QEMU is limited by virtual address space */ > + if (ram_size> (2047<< 20)&& HOST_LONG_BITS == 32) { > + fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n"); > + exit(1); > + } > + } > > /* init the dynamic translator */ > cpu_exec_init_all(tb_size * 1024 * 1024); Alex From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Subject: Re: [PATCH V2 3/3] vl.c: Check the asked ram_size later. Date: Wed, 27 Jul 2011 14:53:16 +0200 Message-ID: <4E300A3C.9020307@suse.de> References: <1311185864-32745-1-git-send-email-anthony.perard@citrix.com> <1311185864-32745-4-git-send-email-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1311185864-32745-4-git-send-email-anthony.perard@citrix.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: Anthony PERARD Cc: Xen Devel , QEMU-devel , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org On 07/20/2011 08:17 PM, Anthony PERARD wrote: > As a Xen guest can have more than 2GB of RAM on a 32bit host, we move > the conditions after than we now if we run one Xen or not. > > Signed-off-by: Anthony PERARD > --- > vl.c | 14 ++++++++------ > 1 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/vl.c b/vl.c > index fcd7395..c2efedf 100644 > --- a/vl.c > +++ b/vl.c > @@ -2433,11 +2433,6 @@ int main(int argc, char **argv, char **envp) > exit(1); > } > > - /* On 32-bit hosts, QEMU is limited by virtual address space */ > - if (value> (2047<< 20)&& HOST_LONG_BITS == 32) { > - fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n"); > - exit(1); > - } > if (value != (uint64_t)(ram_addr_t)value) { > fprintf(stderr, "qemu: ram size too large\n"); > exit(1); > @@ -3091,8 +3086,15 @@ int main(int argc, char **argv, char **envp) > exit(1); > > /* init the memory */ > - if (ram_size == 0) > + if (ram_size == 0) { > ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; > + } else if (!xen_enabled()) { I don't see why those are mutually exclusive. > + /* On 32-bit hosts, QEMU is limited by virtual address space */ > + if (ram_size> (2047<< 20)&& HOST_LONG_BITS == 32) { > + fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n"); > + exit(1); > + } > + } > > /* init the dynamic translator */ > cpu_exec_init_all(tb_size * 1024 * 1024); Alex