From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJssK-0002zL-SB for qemu-devel@nongnu.org; Mon, 27 Jul 2015 20:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJssH-0006CB-Lx for qemu-devel@nongnu.org; Mon, 27 Jul 2015 20:36:08 -0400 Received: from mail-qg0-x22a.google.com ([2607:f8b0:400d:c04::22a]:34759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJssH-0006C3-HC for qemu-devel@nongnu.org; Mon, 27 Jul 2015 20:36:05 -0400 Received: by qgeu79 with SMTP id u79so64825914qge.1 for ; Mon, 27 Jul 2015 17:36:05 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 28 Jul 2015 02:32:53 +0200 Message-Id: <1438043577-28636-42-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1438043577-28636-1-git-send-email-marcandre.lureau@redhat.com> References: <1438043577-28636-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 41/45] ivshmem: rename ivshmem_get_size/parse_mem_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , drjones@redhat.com, cam@cs.ualberta.ca, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com From: Marc-André Lureau Use a more explicit and reusable function name. 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 b85fcd4..ecf31f9 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -644,12 +644,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; @@ -658,7 +658,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; } @@ -705,7 +705,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; -- 2.4.3