[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/50] error: Don't abuse qemu_error() for non-error
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 14/50] error: Don't abuse qemu_error() for non-error in qbus_find() |
Date: |
Thu, 4 Mar 2010 16:56:35 +0100 |
qbus_find() adds an informational line to error messages, and prints
both lines with one qemu_error(). Use error_printf() for the
informational line instead.
While there, simplify: instead of printing buffers filled by
qbus_list_bus() and qbus_list_dev() in one go, make them print it.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/qdev.c | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 6842bd6..253b992 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -456,35 +456,33 @@ static DeviceState *qdev_find_recursive(BusState *bus,
const char *id)
return NULL;
}
-static void qbus_list_bus(DeviceState *dev, char *dest, int len)
+static void qbus_list_bus(DeviceState *dev)
{
BusState *child;
const char *sep = " ";
- int pos = 0;
- pos += snprintf(dest+pos, len-pos,"child busses at \"%s\":",
- dev->id ? dev->id : dev->info->name);
+ error_printf("child busses at \"%s\":",
+ dev->id ? dev->id : dev->info->name);
QLIST_FOREACH(child, &dev->child_bus, sibling) {
- pos += snprintf(dest+pos, len-pos, "%s\"%s\"", sep, child->name);
+ error_printf("%s\"%s\"", sep, child->name);
sep = ", ";
}
+ error_printf("\n");
}
-static void qbus_list_dev(BusState *bus, char *dest, int len)
+static void qbus_list_dev(BusState *bus)
{
DeviceState *dev;
const char *sep = " ";
- int pos = 0;
- pos += snprintf(dest+pos, len-pos, "devices at \"%s\":",
- bus->name);
+ error_printf("devices at \"%s\":", bus->name);
QLIST_FOREACH(dev, &bus->children, sibling) {
- pos += snprintf(dest+pos, len-pos, "%s\"%s\"",
- sep, dev->info->name);
+ error_printf("%s\"%s\"", sep, dev->info->name);
if (dev->id)
- pos += snprintf(dest+pos, len-pos, "/\"%s\"", dev->id);
+ error_printf("/\"%s\"", dev->id);
sep = ", ";
}
+ error_printf("\n");
}
static BusState *qbus_find_bus(DeviceState *dev, char *elem)
@@ -531,7 +529,7 @@ static BusState *qbus_find(const char *path)
{
DeviceState *dev;
BusState *bus;
- char elem[128], msg[256];
+ char elem[128];
int pos, len;
/* find start element */
@@ -565,8 +563,8 @@ static BusState *qbus_find(const char *path)
pos += len;
dev = qbus_find_dev(bus, elem);
if (!dev) {
- qbus_list_dev(bus, msg, sizeof(msg));
- qemu_error("device \"%s\" not found\n%s\n", elem, msg);
+ qemu_error("device \"%s\" not found\n", elem);
+ qbus_list_dev(bus);
return NULL;
}
if (path[pos] == '\0') {
@@ -579,9 +577,8 @@ static BusState *qbus_find(const char *path)
case 1:
return QLIST_FIRST(&dev->child_bus);
default:
- qbus_list_bus(dev, msg, sizeof(msg));
- qemu_error("device has multiple child busses (%s)\n%s\n",
- path, msg);
+ qemu_error("device has multiple child busses (%s)\n", path);
+ qbus_list_bus(dev);
return NULL;
}
}
@@ -594,8 +591,8 @@ static BusState *qbus_find(const char *path)
pos += len;
bus = qbus_find_bus(dev, elem);
if (!bus) {
- qbus_list_bus(dev, msg, sizeof(msg));
- qemu_error("child bus \"%s\" not found\n%s\n", elem, msg);
+ qemu_error("child bus \"%s\" not found\n", elem);
+ qbus_list_bus(dev);
return NULL;
}
}
--
1.6.6.1
- [Qemu-devel] [PATCH 05/50] tools: Remove unused cur_mon from qemu-tool.c, (continued)
- [Qemu-devel] [PATCH 05/50] tools: Remove unused cur_mon from qemu-tool.c, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 02/50] savevm: Fix -loadvm to report errors to stderr, not the monitor, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 03/50] pc: Fix error reporting for -boot once, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 10/50] error: Simplify error sink setup, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 04/50] pc: Factor common code out of pc_boot_set() and cmos_init(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 12/50] error: New error_printf() and error_vprintf(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 09/50] error: Move qemu_error() & friends from monitor.c to own file, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 11/50] error: Move qemu_error & friends into their own header, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 35/50] error: New QERR_DEVICE_MULTIPLE_BUSSES, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle unsuitable bus gracefully, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 14/50] error: Don't abuse qemu_error() for non-error in qbus_find(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 26/50] qdev: Hide "ptr" properties from users, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 08/50] monitor: Factor monitor_set_error() out of qemu_error_internal(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 41/50] error: New QERR_DEVICE_INIT_FAILED, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 31/50] error: New QERR_PROPERTY_VALUE_BAD, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 13/50] error: Don't abuse qemu_error() for non-error in qdev_device_help(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 07/50] block: Simplify usb_msd_initfn() test for "can read bdrv key", Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 06/50] monitor: Separate "default monitor" and "current monitor" cleanly, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 40/50] error: New QERR_BUS_NO_HOTPLUG, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 18/50] error: Infrastructure to track locations for error reporting, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 15/50] error: Don't abuse qemu_error() for non-error in scsi_hot_add(), Markus Armbruster, 2010/03/04