ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Alberto Garcia <agarcia@igalia.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Alberto Garcia 2012-08-14 14:41:28 +03:00 committed by Stefan Hajnoczi
parent bb9558679f
commit c3594ed73e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ivshmem.c
View File

@ -677,7 +677,8 @@ static int pci_ivshmem_init(PCIDevice *dev)
} }
if (s->role_val == IVSHMEM_PEER) { 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); migrate_add_blocker(s->migration_blocker);
} }

2
hw/qdev-monitor.c
View File

@ -443,7 +443,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type); bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type);
if (!bus) { if (!bus) {
qerror_report(QERR_NO_BUS_FOR_DEVICE, qerror_report(QERR_NO_BUS_FOR_DEVICE,
driver, k->bus_type); k->bus_type, driver);
return NULL; return NULL;
} }
} }