[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 44/50] ivshmem: use qemu_strtosz()
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 44/50] ivshmem: use qemu_strtosz() |
Date: |
Mon, 12 Oct 2015 18:41:38 +0200 |
From: Marc-André Lureau <address@hidden>
Use the common qemu utility function to parse the memory size.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
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 b873c23..707e82c 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 = qemu_strtosz(s->sizearg, &end);
+ if (size < 0 || *end != '\0' || !is_power_of_2(size)) {
+ error_setg(errp, "Invalid size %s", s->sizearg);
return;
}
+ s->ivshmem_size = size;
}
fifo8_create(&s->incoming_fifo, sizeof(long));
--
2.4.3
- [Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropriately, (continued)
- [Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropriately, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 31/50] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 33/50] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 32/50] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 34/50] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 37/50] ivshmem: add check on protocol version in QEMU, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 38/50] contrib: remove unnecessary strdup(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 40/50] qtest: add qtest_add_abrt_handler(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 41/50] glib-compat: add 2.38/2.40/2.46 asserts, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 42/50] tests: add ivshmem qtest, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 44/50] ivshmem: use qemu_strtosz(),
marcandre . lureau <=
- [Qemu-devel] [PULL v2 47/50] ivshmem: rename MSI eventfd_table, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 48/50] ivshmem: use kvm irqfd for msi notifications, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 49/50] ivshmem: use little-endian int64_t for the protocol, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 50/50] doc: document ivshmem & hugepages, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 39/50] msix: implement pba write (but read-only), marcandre . lureau, 2015/10/12
- Re: [Qemu-devel] [PULL v2 00/50] Ivshmem patches, Peter Maydell, 2015/10/13
- [Qemu-devel] [PULL v2 01/50] tests: Add ivshmem qtest, marcandre . lureau, 2015/10/15