diff options
| author | Alberto Garcia <agarcia@igalia.com> | 2012-08-14 14:41:28 +0300 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-08-15 15:37:08 +0100 |
| commit | c3594ed73e0a7e7feae309be79f0eb6bafcc02ab (patch) | |
| tree | f5d18a18b09c79b36b3790710f5a8a1212fe91f1 | |
| parent | bb9558679ffaae062ea26ef97d2273b148e9c515 (diff) | |
| download | focaccia-qemu-c3594ed73e0a7e7feae309be79f0eb6bafcc02ab.tar.gz focaccia-qemu-c3594ed73e0a7e7feae309be79f0eb6bafcc02ab.zip | |
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>
| -rw-r--r-- | hw/ivshmem.c | 3 | ||||
| -rw-r--r-- | hw/qdev-monitor.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 0c58161565..b4d65a6db5 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -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); } diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index b22a37a00c..018b386782 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -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; } } |