Skip to contentSkip to conversation

Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()"

PATCH In review Michael S. Tsirkin 5 participants 7 messages Nov 20, 2020 – Nov 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()"

This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff.

Cc "Philippe Mathieu-Daudé" <[email protected]>
Fixes bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()")

---

checkpatch will complain since it does not like strtoul but we had it for years so should be ok for 5.2, right?

 hw/core/qdev-properties-system.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
hw/core/qdev-properties-system.c +13 -12
index b81a4e8d14..9d80a07d26 100644
@@ -858,7 +858,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
     Property *prop = opaque;
     PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
     char *str, *p;
-    const char *e;
+    char *e;
     unsigned long val;
     unsigned long dom = 0, bus = 0;
     unsigned int slot = 0, func = 0;
@@ -873,23 +873,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
     }
 
     p = str;
-    if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e == p) {
-        goto inval;
-    }
-    if (*e != ':') {
+    val = strtoul(p, &e, 16);
+    if (e == p || *e != ':') {
         goto inval;
     }
     bus = val;
 
-    p = (char *)e + 1;
-    if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
+    p = e + 1;
+    val = strtoul(p, &e, 16);
+    if (e == p) {
         goto inval;
     }
     if (*e == ':') {
         dom = bus;
         bus = val;
-        p = (char *)e + 1;
-        if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
+        p = e + 1;
+        val = strtoul(p, &e, 16);
+        if (e == p) {
             goto inval;
         }
     }
@@ -898,13 +898,14 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
     if (*e != '.') {
         goto inval;
     }
-    p = (char *)e + 1;
-    if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e == p) {
+    p = e + 1;
+    val = strtoul(p, &e, 10);
+    if (e == p) {
         goto inval;
     }
     func = val;
 
-    if (bus > 0xff) {
+    if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) {
         goto inval;
     }
 
Signature · 1 line
MST
#1 lore raw
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Type: series
Message-id: [email protected]
Subject: [PATCH for-5.2] Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()"

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
1d9f6bd Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()"

=== OUTPUT BEGIN ===
ERROR: consider using qemu_strtoul in preference to strtoul #39: FILE: hw/core/qdev-properties-system.c:876:
+ val = strtoul(p, &e, 16);

ERROR: consider using qemu_strtoul in preference to strtoul #48: FILE: hw/core/qdev-properties-system.c:883:
+ val = strtoul(p, &e, 16);

ERROR: consider using qemu_strtoul in preference to strtoul #58: FILE: hw/core/qdev-properties-system.c:891:
+ val = strtoul(p, &e, 16);

ERROR: consider using qemu_strtoul in preference to strtoul #70: FILE: hw/core/qdev-properties-system.c:902:
+ val = strtoul(p, &e, 10);

total: 4 errors, 0 warnings, 56 lines checked

Commit 1d9f6bd1223f (Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()") has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1

The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

#2 lore raw
In reply to Michael S. Tsirkin
Quoted 9 lines · Michael S. Tsirkin

This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff.

Cc "Philippe Mathieu-Daudé" <[email protected]>
Fixes bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()")
Quoted 4 lines

---

checkpatch will complain since it does not like strtoul but we had it for years so should be ok for 5.2, right?

Yes, of course.

Paolo

Quoted 67 lines
  hw/core/qdev-properties-system.c | 25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
hw/core/qdev-properties-system.c +13 -12
index b81a4e8d14..9d80a07d26 100644
@@ -858,7 +858,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
      Property *prop = opaque;
      PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
      char *str, *p;
-    const char *e;
+    char *e;
      unsigned long val;
      unsigned long dom = 0, bus = 0;
      unsigned int slot = 0, func = 0;
@@ -873,23 +873,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
      }
 
      p = str;
-    if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e == p) {
-        goto inval;
-    }
-    if (*e != ':') {
+    val = strtoul(p, &e, 16);
+    if (e == p || *e != ':') {
          goto inval;
      }
      bus = val;
 
-    p = (char *)e + 1;
-    if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
+    p = e + 1;
+    val = strtoul(p, &e, 16);
+    if (e == p) {
          goto inval;
      }
      if (*e == ':') {
          dom = bus;
          bus = val;
-        p = (char *)e + 1;
-        if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e == p) {
+        p = e + 1;
+        val = strtoul(p, &e, 16);
+        if (e == p) {
              goto inval;
          }
      }
@@ -898,13 +898,14 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
      if (*e != '.') {
          goto inval;
      }
-    p = (char *)e + 1;
-    if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e == p) {
+    p = e + 1;
+    val = strtoul(p, &e, 10);
+    if (e == p) {
          goto inval;
      }
      func = val;
 
-    if (bus > 0xff) {
+    if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) {
          goto inval;
      }
 
#3 lore raw
Quoted 12 lines · Paolo Bonzini
Quoted 11 lines · Michael S. Tsirkin

This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff.

Cc "Philippe Mathieu-Daudé" <[email protected]>
Fixes bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()")

---

Quoted 6 lines
Quoted 2 lines

checkpatch will complain since it does not like strtoul but we had it for years so should be ok for 5.2, right?

Yes, of course.

Paolo

Which tree is going to merge this patch?

#4 lore raw
Quoted 13 lines · Philippe Mathieu-Daudé
Quoted 12 lines · Paolo Bonzini
Quoted 11 lines · Michael S. Tsirkin

This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff.

Cc "Philippe Mathieu-Daudé" <[email protected]>
Fixes bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()")

---

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

checkpatch will complain since it does not like strtoul but we had it for years so should be ok for 5.2, right?

Yes, of course.

Paolo

Which tree is going to merge this patch?

Sorry, I was expecting Michael to merge it, as it's PCI-specific but it looks like people were waiting for me to merge it.

I'll merge it and submit a pull request ASAP.

Signature · 1 line
Eduardo
#5 lore raw
Quoted 19 lines · Eduardo Habkost
Quoted 18 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Paolo Bonzini
Quoted 9 lines · Michael S. Tsirkin

This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff.

Cc "Philippe Mathieu-Daudé" <[email protected]>
Fixes bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()")
Quoted 4 lines

---

checkpatch will complain since it does not like strtoul but we had it for years so should be ok for 5.2, right?

Yes, of course.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Paolo

Which tree is going to merge this patch?

Sorry, I was expecting Michael to merge it, as it's PCI-specific but it looks like people were waiting for me to merge it.

I'll merge it and submit a pull request ASAP.

Thanks!

Reviewed-by on v1 1/1
#6 lore raw
In reply to Michael S. Tsirkin
Quoted 9 lines · Michael S. Tsirkin

This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff.

Cc "Philippe Mathieu-Daudé" <[email protected]>
Fixes bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()")
Quoted 7 lines

---

checkpatch will complain since it does not like strtoul but we had it for years so should be ok for 5.2, right?

 hw/core/qdev-properties-system.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

Thanks!