summaryrefslogtreecommitdiffstats
path: root/hw/spapr_vio.c
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-01-16 18:22:29 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-16 12:02:30 -0600
commit4ecf8aa5a06a830b05c035a5d6184bf991931d20 (patch)
treebb284f1cdf84ea500875745a01582aa49f00309a /hw/spapr_vio.c
parentb8e76b35d47d03f6f9bb3a7455316aaed8b25795 (diff)
downloadhqemu-4ecf8aa5a06a830b05c035a5d6184bf991931d20.zip
hqemu-4ecf8aa5a06a830b05c035a5d6184bf991931d20.tar.gz
pseries: Replace non-portable asprintf by g_strdup_printf
g_strdup_printf already handles OOM errors, so some error handling in QEMU code can be removed. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/spapr_vio.c')
-rw-r--r--hw/spapr_vio.c29
1 files changed, 6 insertions, 23 deletions
diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index 3a1a486..2054219 100644
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -80,9 +80,7 @@ static char *vio_format_dev_name(VIOsPAPRDevice *dev)
char *name;
/* Device tree style name device@reg */
- if (asprintf(&name, "%s@%x", pc->dt_name, dev->reg) < 0) {
- return NULL;
- }
+ name = g_strdup_printf("%s@%x", pc->dt_name, dev->reg);
return name;
}
@@ -101,12 +99,8 @@ static int vio_make_devnode(VIOsPAPRDevice *dev,
}
dt_name = vio_format_dev_name(dev);
- if (!dt_name) {
- return -ENOMEM;
- }
-
node_off = fdt_add_subnode(fdt, vdevice_off, dt_name);
- free(dt_name);
+ g_free(dt_name);
if (node_off < 0) {
return node_off;
}
@@ -444,9 +438,6 @@ static int spapr_vio_busdev_init(DeviceState *qdev)
/* Don't overwrite ids assigned on the command line */
if (!dev->qdev.id) {
id = vio_format_dev_name(dev);
- if (!id) {
- return -1;
- }
dev->qdev.id = id;
}
@@ -646,20 +637,12 @@ int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus)
}
name = vio_format_dev_name(dev);
- if (!name) {
- return -ENOMEM;
- }
-
- if (asprintf(&path, "/vdevice/%s", name) < 0) {
- path = NULL;
- ret = -ENOMEM;
- goto out;
- }
+ path = g_strdup_printf("/vdevice/%s", name);
ret = fdt_setprop_string(fdt, offset, "linux,stdout-path", path);
-out:
- free(name);
- free(path);
+
+ g_free(name);
+ g_free(path);
return ret;
}
OpenPOWER on IntegriCloud