From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgvzG-0000bc-2k for qemu-devel@nongnu.org; Tue, 29 Sep 2015 10:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgvzB-0004l5-VK for qemu-devel@nongnu.org; Tue, 29 Sep 2015 10:34:33 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:9220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgvzB-0004kn-FS for qemu-devel@nongnu.org; Tue, 29 Sep 2015 10:34:29 -0400 References: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> <1443094669-4144-43-git-send-email-marcandre.lureau@redhat.com> From: Claudio Fontana Message-ID: <560AA16F.50507@huawei.com> Date: Tue, 29 Sep 2015 16:34:23 +0200 MIME-Version: 1.0 In-Reply-To: <1443094669-4144-43-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 42/47] ivshmem: use strtosz() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: pbonzini@redhat.com, drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com On 24.09.2015 13:37, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Use the common qemu utility function to parse the memory size. > > Signed-off-by: Marc-André Lureau > --- > hw/misc/ivshmem.c | 36 +++++------------------------------- > 1 file changed, 5 insertions(+), 31 deletions(-) > > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index 273db36..0ee61d5 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -646,33 +646,6 @@ static void ivshmem_reset(DeviceState *d) > ivshmem_use_msix(s); > } > > -static uint64_t ivshmem_get_size(IVShmemState * s, Error **errp) { > - > - uint64_t value; > - char *ptr; > - > - value = strtoull(s->sizearg, &ptr, 10); > - switch (*ptr) { > - case 0: case 'M': case 'm': > - value <<= 20; > - break; > - case 'G': case 'g': > - value <<= 30; > - break; > - default: > - error_setg(errp, "invalid ram size: %s", s->sizearg); > - return 0; > - } > - > - /* BARs must be a power of 2 */ > - if (!is_power_of_2(value)) { > - error_setg(errp, "size must be power of 2"); > - return 0; > - } > - > - return value; > -} > - > static int ivshmem_setup_msi(IVShmemState * s) > { > if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) { > @@ -700,16 +673,17 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) > uint8_t *pci_conf; > uint8_t attr = PCI_BASE_ADDRESS_SPACE_MEMORY | > PCI_BASE_ADDRESS_MEM_PREFETCH; > - Error *local_err = NULL; > > if (s->sizearg == NULL) { > s->ivshmem_size = 4 << 20; /* 4 MB default */ > } else { > - s->ivshmem_size = ivshmem_get_size(s, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > + char *end; > + int64_t size = strtosz(s->sizearg, &end); > + if (size < 0 || *end != '\0') { If there is additional validation that you need to do (in light of your comments to this patch), it could be done here instead of failing later. > + error_setg(errp, "Invalid size %s", s->sizearg); > return; > } > + s->ivshmem_size = size; > } > > fifo8_create(&s->incoming_fifo, sizeof(long)); >