openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spapr_pci: use g_strdup_printf() 

Building strings with g_strdup_printf() instead of snprintf() is
a QEMU common practice.

Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2017-09-09 17:06:18 +02:00 committed by David Gibson
parent d049bde69d
commit 549ce59e2b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/ppc/spapr_pci.c
View File

@ -61,8 +61,6 @@
#define RTAS_TYPE_MSI 1 #define RTAS_TYPE_MSI 1
#define RTAS_TYPE_MSIX 2 #define RTAS_TYPE_MSIX 2
#define FDT_NAME_MAX 128
#define _FDT(exp) \ #define _FDT(exp) \
do { \ do { \
int ret = (exp); \ int ret = (exp); \
@ -1194,7 +1192,7 @@ static const char *pci_find_device_name(uint8_t class, uint8_t subclass,
return name; return name;
} }
static void pci_get_node_name(char *nodename, int len, PCIDevice *dev) static gchar *pci_get_node_name(PCIDevice *dev)
{ {
int slot = PCI_SLOT(dev->devfn); int slot = PCI_SLOT(dev->devfn);
int func = PCI_FUNC(dev->devfn); int func = PCI_FUNC(dev->devfn);
@ -1205,9 +1203,9 @@ static void pci_get_node_name(char *nodename, int len, PCIDevice *dev)
ccode & 0xff); ccode & 0xff);
if (func != 0) { if (func != 0) {
snprintf(nodename, len, "%s@%x,%x", name, slot, func); return g_strdup_printf("%s@%x,%x", name, slot, func);
} else { } else {
snprintf(nodename, len, "%s@%x", name, slot); return g_strdup_printf("%s@%x", name, slot);
} }
} }
@ -1325,10 +1323,12 @@ static int spapr_create_pci_child_dt(sPAPRPHBState *phb, PCIDevice *dev,
void *fdt, int node_offset) void *fdt, int node_offset)
{ {
int offset, ret; int offset, ret;
char nodename[FDT_NAME_MAX]; gchar *nodename;
pci_get_node_name(nodename, FDT_NAME_MAX, dev); nodename = pci_get_node_name(dev);
offset = fdt_add_subnode(fdt, node_offset, nodename); offset = fdt_add_subnode(fdt, node_offset, nodename);
g_free(nodename);
ret = spapr_populate_pci_child_dt(dev, fdt, offset, phb); ret = spapr_populate_pci_child_dt(dev, fdt, offset, phb);
g_assert(!ret); g_assert(!ret);
@ -2072,7 +2072,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
void *fdt) void *fdt)
{ {
int bus_off, i, j, ret; int bus_off, i, j, ret;
char nodename[FDT_NAME_MAX]; gchar *nodename;
uint32_t bus_range[] = { cpu_to_be32(0), cpu_to_be32(0xff) }; uint32_t bus_range[] = { cpu_to_be32(0), cpu_to_be32(0xff) };
struct { struct {
uint32_t hi; uint32_t hi;
@ -2121,8 +2121,9 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
sPAPRFDT s_fdt; sPAPRFDT s_fdt;
/* Start populating the FDT */ /* Start populating the FDT */
snprintf(nodename, FDT_NAME_MAX, "pci@%" PRIx64, phb->buid); nodename = g_strdup_printf("pci@%" PRIx64, phb->buid);
bus_off = fdt_add_subnode(fdt, 0, nodename); bus_off = fdt_add_subnode(fdt, 0, nodename);
g_free(nodename);
if (bus_off < 0) { if (bus_off < 0) {
return bus_off; return bus_off;
} }