Commit 95e2af98 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Anthony Liguori
Browse files

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: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Message-id: 1366184940-13516-1-git-send-email-aik@ozlabs.ru
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent bd5ac203

qdev-monitor.c

+2 −4
Original line number Diff line number Diff line
@@ -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",