Commit c3594ed7 authored by Alberto Garcia's avatar Alberto Garcia Committed by Stefan Hajnoczi
Browse files

ivshmem, qdev-monitor: fix order of qerror parameters 



Now that the QERR_ macros no longer contain a json dictionary,
the order of some parameters needs to be fixed for them to appear
correctly.

Signed-off-by: default avatarAlberto Garcia <agarcia@igalia.com>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parent bb955867

hw/ivshmem.c

+2 −1
Original line number Diff line number Diff line
@@ -677,7 +677,8 @@ static int pci_ivshmem_init(PCIDevice *dev) 
    }



    if (s->role_val == IVSHMEM_PEER) {

        error_set(&s->migration_blocker, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION, "ivshmem", "peer mode");

        error_set(&s->migration_blocker, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,

                  "peer mode", "ivshmem");

        migrate_add_blocker(s->migration_blocker);

    }

hw/qdev-monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) 
        bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type);

        if (!bus) {

            qerror_report(QERR_NO_BUS_FOR_DEVICE,

                          driver, k->bus_type);

                          k->bus_type, driver);

            return NULL;

        }

    }