[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 41/45] ivshmem: rename ivshmem_get_size/parse_mem
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 41/45] ivshmem: rename ivshmem_get_size/parse_mem_size |
Date: |
Tue, 28 Jul 2015 02:32:53 +0200 |
From: Marc-André Lureau <address@hidden>
Use a more explicit and reusable function name.
Signed-off-by: Marc-André Lureau <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH v2 33/45] ivshmem-server: fix hugetlbfs support, (continued)
[Qemu-devel] [PATCH v2 34/45] docs: update ivshmem device spec, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 35/45] ivshmem: add check on protocol version in QEMU, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 36/45] contrib: remove unnecessary strdup(), Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 37/45] msix: implement pba write (but read-only), Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 38/45] qtest: add qtest_add_abrt_handler(), Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 39/45] tests: add ivshmem qtest, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 40/45] ivshmem: do not keep shm_fd open, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 41/45] ivshmem: rename ivshmem_get_size/parse_mem_size,
Marc-André Lureau <=
[Qemu-devel] [PATCH v2 42/45] ivshmem: add hostmem backend, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 43/45] ivshmem: remove EventfdEntry.vector, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 44/45] ivshmem: rename MSI eventfd_table, Marc-André Lureau, 2015/07/27
[Qemu-devel] [PATCH v2 45/45] ivshmem: use kvm irqfd for msi notifications, Marc-André Lureau, 2015/07/27