From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvrQk-00008Q-SM for qemu-devel@nongnu.org; Sat, 14 Jun 2014 13:07:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvrQf-0008D8-P8 for qemu-devel@nongnu.org; Sat, 14 Jun 2014 13:07:50 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:60334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvrQf-0008Cz-Gx for qemu-devel@nongnu.org; Sat, 14 Jun 2014 13:07:45 -0400 Received: by mail-wi0-f171.google.com with SMTP id n15so2238423wiw.10 for ; Sat, 14 Jun 2014 10:07:44 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <539C815B.3000203@redhat.com> Date: Sat, 14 Jun 2014 19:07:39 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <0c6badd4ed1f0f3af9de36e4b5a17952922fdd05.1402720673.git.hutao@cn.fujitsu.com> In-Reply-To: <0c6badd4ed1f0f3af9de36e4b5a17952922fdd05.1402720673.git.hutao@cn.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH RFC 3/4] exec: don't exit unconditionally if failed to allocate memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao , qemu-devel@nongnu.org Cc: Yasunori Goto , "Michael S. Tsirkin" , Igor Mammedov Il 14/06/2014 06:48, Hu Tao ha scritto: > return -1 instead. > > Now user can add objects memory-backend-ram on-the-fly, fail it if > cannot allocate memory rather than quit qemu. > > Signed-off-by: Hu Tao This needs an audit of all callers or, alternatively, we need to add memory_region_init_ram_nofail. Better leave it for after the merge. Paolo > --- > backends/hostmem-ram.c | 3 +++ > exec.c | 6 +++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c > index d9a8290..afb305d 100644 > --- a/backends/hostmem-ram.c > +++ b/backends/hostmem-ram.c > @@ -28,6 +28,9 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) > path = object_get_canonical_path_component(OBJECT(backend)); > memory_region_init_ram(&backend->mr, OBJECT(backend), path, > backend->size); > + if (backend->mr.ram_addr == -1) { > + error_setg(errp, "can't allocate memory"); > + } > g_free(path); > } > > diff --git a/exec.c b/exec.c > index 8705cc5..74560e5 100644 > --- a/exec.c > +++ b/exec.c > @@ -1228,7 +1228,7 @@ static ram_addr_t ram_block_add(RAMBlock *new_block) > if (!new_block->host) { > fprintf(stderr, "Cannot set up guest memory '%s': %s\n", > new_block->mr->name, strerror(errno)); > - exit(1); > + return -1; > } > memory_try_enable_merging(new_block->host, new_block->length); > } > @@ -1356,6 +1356,10 @@ void qemu_ram_free(ram_addr_t addr) > { > RAMBlock *block; > > + if (addr == -1) { > + return; > + } > + > /* This assumes the iothread lock is taken here too. */ > qemu_mutex_lock_ramlist(); > QTAILQ_FOREACH(block, &ram_list.blocks, next) { >