[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/11] Xen: use qemu_strtoul instead of strtol
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 07/11] Xen: use qemu_strtoul instead of strtol |
Date: |
Thu, 21 Jan 2016 17:01:26 +0000 |
From: Cao jin <address@hidden>
No need to roll our own (with slightly incorrect handling of errno),
when we can use the common version.
Change signed parsing to unsigned, because what it read are values in
PCI config space, which are non-negative.
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/xen/xen-host-pci-device.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c
index 9c342e7..83da9c4 100644
--- a/hw/xen/xen-host-pci-device.c
+++ b/hw/xen/xen-host-pci-device.c
@@ -141,7 +141,7 @@ static int xen_host_pci_get_value(XenHostPCIDevice *d,
const char *name,
char buf[XEN_HOST_PCI_GET_VALUE_BUFFER_SIZE];
int fd, rc;
unsigned long value;
- char *endptr;
+ const char *endptr;
xen_host_pci_sysfs_path(d, name, path, sizeof(path));
@@ -158,13 +158,9 @@ static int xen_host_pci_get_value(XenHostPCIDevice *d,
const char *name,
}
} while (rc < 0);
buf[rc] = 0;
- value = strtol(buf, &endptr, base);
- if (endptr == buf || *endptr != '\n') {
- rc = -1;
- } else if ((value == LONG_MIN || value == LONG_MAX) && errno == ERANGE) {
- rc = -errno;
- } else {
- rc = 0;
+ rc = qemu_strtoul(buf, &endptr, base, &value);
+ if (!rc) {
+ assert(value <= UINT_MAX);
*pvalue = value;
}
out:
--
1.7.10.4
- [Qemu-devel] [PULL 0/11] xen-20160121, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 03/11] xen-hvm: Clean up xen_hvm_init() error handling, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 05/11] xen-pvdevice: convert to realize(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 01/11] MAINTAINERS: update Xen files, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 06/11] Change xen_host_pci_sysfs_path() to return void, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 08/11] Add Error **errp for xen_host_pci_device_get(), Stefano Stabellini, 2016/01/21