From patchwork Tue Jul 28 00:32:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 500997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8BDC414029E for ; Tue, 28 Jul 2015 10:57:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hwUl18yA; dkim-atps=neutral Received: from localhost ([::1]:56560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJtCl-0006z0-RD for incoming@patchwork.ozlabs.org; Mon, 27 Jul 2015 20:57:15 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=+GkS8Z2/UDPWaZhULbB0xviBYZmYwSmjizEX8Dg3IMk=; b=hwUl18yA+0X9JwXqo9joSDUiH7G4USTDn0poS++53jnl+PFl9cxkYWEb3KmVeiP09X q2tHy99qmNwMTneO3hQr/zJOohSs2liUfWWxxScUgDVroIr6Lg3IiIlvlhT4BxikUJLt WP4c2J+5eGv1d7aRT/R6aXVNGKqyV7u0QZ1rkZjzPAOsgyuPdupE53fYufistOiJRU2B BQil/9IEaROOHIFwL1rZCUNpQQJ8gvHraunknEHUw+u8wPdEAdjvlYAtZUknZG6zlyek NxX2qe+gZd83hlriA9joAZO5JL33OQDNUHc1Ak1iDuV+t6htScIJt0E3JlHIoIuFhgYm ZDow== X-Received: by 10.140.21.81 with SMTP id 75mr44576010qgk.86.1438043765263; Mon, 27 Jul 2015 17:36:05 -0700 (PDT) Received: from localhost (APoitiers-257-1-37-212.w90-38.abo.wanadoo.fr. [90.38.212.212]) by smtp.gmail.com with ESMTPSA id b71sm10295070qkh.17.2015.07.27.17.36.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jul 2015 17:36:04 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 28 Jul 2015 02:32:53 +0200 Message-Id: <1438043577-28636-42-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 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 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22a 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 Subject: [Qemu-devel] [PATCH v2 41/45] ivshmem: rename ivshmem_get_size/parse_mem_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;