hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()
Replace strtoul() by qemu_strtoul() so checkpatch.pl won't complain if we move this code later. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200930164949.1425294-4-philmd@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
c0d67ade53
commit
bccb20c49d
|
@ -951,7 +951,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
|
PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
|
||||||
char *str, *p;
|
char *str, *p;
|
||||||
char *e;
|
const char *e;
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
unsigned long dom = 0, bus = 0;
|
unsigned long dom = 0, bus = 0;
|
||||||
unsigned int slot = 0, func = 0;
|
unsigned int slot = 0, func = 0;
|
||||||
|
@ -966,23 +966,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
p = str;
|
p = str;
|
||||||
val = strtoul(p, &e, 16);
|
if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e == p) {
|
||||||
if (e == p || *e != ':') {
|
goto inval;
|
||||||
|
}
|
||||||
|
if (*e != ':') {
|
||||||
goto inval;
|
goto inval;
|
||||||
}
|
}
|
||||||
bus = val;
|
bus = val;
|
||||||
|
|
||||||
p = e + 1;
|
p = (char *)e + 1;
|
||||||
val = strtoul(p, &e, 16);
|
if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
|
||||||
if (e == p) {
|
|
||||||
goto inval;
|
goto inval;
|
||||||
}
|
}
|
||||||
if (*e == ':') {
|
if (*e == ':') {
|
||||||
dom = bus;
|
dom = bus;
|
||||||
bus = val;
|
bus = val;
|
||||||
p = e + 1;
|
p = (char *)e + 1;
|
||||||
val = strtoul(p, &e, 16);
|
if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
|
||||||
if (e == p) {
|
|
||||||
goto inval;
|
goto inval;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -991,14 +991,13 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
|
||||||
if (*e != '.') {
|
if (*e != '.') {
|
||||||
goto inval;
|
goto inval;
|
||||||
}
|
}
|
||||||
p = e + 1;
|
p = (char *)e + 1;
|
||||||
val = strtoul(p, &e, 10);
|
if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e == p) {
|
||||||
if (e == p) {
|
|
||||||
goto inval;
|
goto inval;
|
||||||
}
|
}
|
||||||
func = val;
|
func = val;
|
||||||
|
|
||||||
if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) {
|
if (bus > 0xff) {
|
||||||
goto inval;
|
goto inval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue