From 95e2af98d4edb59780e47da2085ea9133f6466bb Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Wed, 17 Apr 2013 17:49:00 +1000 Subject: [PATCH] qbus: remove wrong error messages The existing code shows the "Bus '%s' is full" message even if name is specified and different from bus->name (i.e. match=0). The patch excludes unnecessary error message. Signed-off-by: Alexey Kardashevskiy Message-id: 1366184940-13516-1-git-send-email-aik@ozlabs.ru Signed-off-by: Anthony Liguori --- qdev-monitor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 73d79461db..2cb5600d63 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -292,11 +292,9 @@ static BusState *qbus_find_recursive(BusState *bus, const char *name, if (name && (strcmp(bus->name, name) != 0)) { match = 0; - } - if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) { + } else if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) { match = 0; - } - if ((bus_class->max_dev != 0) && (bus_class->max_dev <= bus->max_index)) { + } else if ((bus_class->max_dev != 0) && (bus_class->max_dev <= bus->max_index)) { if (name != NULL) { /* bus was explicitly specified: return an error. */ qerror_report(ERROR_CLASS_GENERIC_ERROR, "Bus '%s' is full",