From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcEZl-0005JP-V9 for qemu-devel@nongnu.org; Wed, 16 Sep 2015 11:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcEZh-00052Q-Cs for qemu-devel@nongnu.org; Wed, 16 Sep 2015 11:24:49 -0400 Received: from relay.parallels.com ([195.214.232.42]:55723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcEZh-00052I-1y for qemu-devel@nongnu.org; Wed, 16 Sep 2015 11:24:45 -0400 Message-ID: <55F989B1.7010409@virtuozzo.com> Date: Wed, 16 Sep 2015 18:24:33 +0300 From: Vladimir Sementsov-Ogievskiy MIME-Version: 1.0 References: <1442333283-13119-1-git-send-email-marcandre.lureau@redhat.com> <1442333283-13119-43-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1442333283-13119-43-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v3 42/46] ivshmem: make ivshmem_get_size() more generic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com Hi! On 15.09.2015 19:07, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Use a more explicit function name parse_mem_size(). I guess such > function could be common (or exists already somewhere). strtosz() from include/qemu-common.h is appropriate > > Signed-off-by: Marc-André Lureau > --- > hw/misc/ivshmem.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index f9ac955..5fb2123 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -643,12 +643,12 @@ static void ivshmem_reset(DeviceState *d) > ivshmem_use_msix(s); > } > > -static uint64_t ivshmem_get_size(IVShmemState * s, Error **errp) { > - > +static uint64_t parse_mem_size(const char *sizearg, Error **errp) > +{ > uint64_t value; > char *ptr; > > - value = strtoull(s->sizearg, &ptr, 10); > + value = strtoull(sizearg, &ptr, 10); > switch (*ptr) { > case 0: case 'M': case 'm': > value <<= 20; > @@ -657,7 +657,7 @@ static uint64_t ivshmem_get_size(IVShmemState * s, Error **errp) { > value <<= 30; > break; > default: > - error_setg(errp, "invalid ram size: %s", s->sizearg); > + error_setg(errp, "invalid ram size: %s", sizearg); > return 0; > } > > @@ -704,7 +704,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) > if (s->sizearg == NULL) { > s->ivshmem_size = 4 << 20; /* 4 MB default */ > } else { > - s->ivshmem_size = ivshmem_get_size(s, &local_err); > + s->ivshmem_size = parse_mem_size(s->sizearg, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; -- Best regards, Vladimir * now, @virtuozzo.com instead of @parallels.com. Sorry for this inconvenience.