[Qemu-ppc] [PATCH v7 4/6] spapr_pci: set device node unit address as hex

[Nikunj A Dadhania]

Device node names should encode the unit address as hex, while the
code was encodind it as integers.

Also, use FDT_NAME_MAX macro for allocating and composing the name.

Signed-off-by: Nikunj A Dadhania <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
 hw/ppc/spapr_pci.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 6ef7f44..a289ae9 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -52,6 +52,8 @@
 #define RTAS_TYPE_MSI           1
 #define RTAS_TYPE_MSIX          2
 
+#define FDT_NAME_MAX          128
+
 #define _FDT(exp) \
     do { \
         int ret = (exp);                                           \
@@ -987,13 +989,13 @@ static int spapr_create_pci_child_dt(PCIDevice *dev, 
sPAPRFDT *p,
     int offset, ret;
     int slot = PCI_SLOT(dev->devfn);
     int func = PCI_FUNC(dev->devfn);
-    char nodename[512];
+    char nodename[FDT_NAME_MAX];
     uint32_t drc_index = spapr_phb_get_pci_drc_index(p->sphb, dev);
 
     if (func != 0) {
-        sprintf(nodename, "address@hidden,%d", slot, func);
+        snprintf(nodename, FDT_NAME_MAX, "address@hidden,%x", slot, func);
     } else {
-        sprintf(nodename, "address@hidden", slot);
+        snprintf(nodename, FDT_NAME_MAX, "address@hidden", slot);
     }
     offset = fdt_add_subnode(p->fdt, p->node_off, nodename);
     ret = spapr_populate_pci_child_dt(dev, p->fdt, offset, p->sphb->index,
@@ -1592,7 +1594,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
                           void *fdt)
 {
     int bus_off, i, j, ret;
-    char nodename[256];
+    char nodename[FDT_NAME_MAX];
     uint32_t bus_range[] = { cpu_to_be32(0), cpu_to_be32(0xff) };
     const uint64_t mmiosize = memory_region_size(&phb->memwindow);
     const uint64_t w32max = (1ULL << 32) - SPAPR_PCI_MEM_WIN_BUS_OFFSET;
@@ -1630,7 +1632,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
     sPAPRFDT s_fdt;
 
     /* Start populating the FDT */
-    sprintf(nodename, "address@hidden" PRIx64, phb->buid);
+    snprintf(nodename, FDT_NAME_MAX, "address@hidden" PRIx64, phb->buid);
     bus_off = fdt_add_subnode(fdt, 0, nodename);
     if (bus_off < 0) {
         return bus_off;
-- 
1.8.3.1