From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwrT9-0007ad-54 for qemu-devel@nongnu.org; Tue, 17 Jun 2014 07:22:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwrT1-00078w-L5 for qemu-devel@nongnu.org; Tue, 17 Jun 2014 07:22:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwrT1-00078k-C7 for qemu-devel@nongnu.org; Tue, 17 Jun 2014 07:22:19 -0400 Date: Tue, 17 Jun 2014 14:22:42 +0300 From: "Michael S. Tsirkin" Message-ID: <20140617112242.GB7457@redhat.com> References: <1403000225-19812-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403000225-19812-1-git-send-email-imammedo@redhat.com> Subject: Re: [Qemu-devel] [PATCH for 2.1] numa: handle mmaped memory allocation failure correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: hutao@cn.fujitsu.com, qemu-devel@nongnu.org, gaowanlong@cn.fujitsu.com, pbonzini@redhat.com On Tue, Jun 17, 2014 at 12:17:05PM +0200, Igor Mammedov wrote: > when memory_region_init_ram_from_file() fails > memory_region_size() will still return size that was > provided at region init time. > Instead use errp to properly detect error condition. > > Signed-off-by: Igor Mammedov Obviously correct, applied. Thanks! > --- > patch depends on current PCI tree that stages last NUMA series > > numa.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/numa.c b/numa.c > index eef0717..e471afe 100644 > --- a/numa.c > +++ b/numa.c > @@ -238,7 +238,7 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, > /* Legacy behavior: if allocation failed, fall back to > * regular RAM allocation. > */ > - if (!memory_region_size(mr)) { > + if (err) { > qerror_report_err(err); > error_free(err); > memory_region_init_ram(mr, owner, name, ram_size); > -- > 1.7.1