[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/9] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 2/9] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr() |
Date: |
Fri, 13 Mar 2020 19:46:00 +0100 |
Replace strtoul() by qemu_strtoul() so checkpatch.pl won't complain
if we move this code later.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/core/qdev-properties.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 48e4c98cf0..e1cefcaa61 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -820,7 +820,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v,
const char *name,
PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
Error *local_err = NULL;
char *str, *p;
- char *e;
+ const char *e;
unsigned long val;
unsigned long dom = 0, bus = 0;
unsigned int slot = 0, func = 0;
@@ -837,23 +837,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v,
const char *name,
}
p = str;
- val = strtoul(p, &e, 16);
- if (e == p || *e != ':') {
+ if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e == p) {
+ goto inval;
+ }
+ if (*e != ':') {
goto inval;
}
bus = val;
- p = e + 1;
- val = strtoul(p, &e, 16);
- if (e == p) {
+ p = (char *)e + 1;
+ if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
goto inval;
}
if (*e == ':') {
dom = bus;
bus = val;
- p = e + 1;
- val = strtoul(p, &e, 16);
- if (e == p) {
+ p = (char *)e + 1;
+ if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
goto inval;
}
}
@@ -862,14 +862,13 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v,
const char *name,
if (*e != '.') {
goto inval;
}
- p = e + 1;
- val = strtoul(p, &e, 10);
- if (e == p) {
+ p = (char *)e + 1;
+ if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e == p) {
goto inval;
}
func = val;
- if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) {
+ if (bus > 0xff) {
goto inval;
}
--
2.21.1