From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1fE8-0006bx-O6 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 11:09:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1fE7-0001JK-Bl for qemu-devel@nongnu.org; Wed, 15 Aug 2012 11:09:44 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:33735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1fE7-0001JC-38 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 11:09:43 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Aug 2012 16:09:41 +0100 Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7FF9HRC27787352 for ; Wed, 15 Aug 2012 15:09:17 GMT Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7FF9NO0015218 for ; Wed, 15 Aug 2012 09:09:23 -0600 From: Stefan Hajnoczi Date: Wed, 15 Aug 2012 16:09:04 +0100 Message-Id: <1345043344-3978-10-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1345043344-3978-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1345043344-3978-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 9/9] ivshmem, qdev-monitor: fix order of qerror parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Alberto Garcia , qemu-devel@nongnu.org, Stefan Hajnoczi From: Alberto Garcia 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 Reviewed-by: Luiz Capitulino Signed-off-by: Stefan Hajnoczi --- hw/ivshmem.c | 3 ++- hw/qdev-monitor.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 0c58161..b4d65a6 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 b22a37a..018b386 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; } } -- 1.7.10.4