From patchwork Wed Aug 15 15:09:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 177713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B9D12C0092 for ; Thu, 16 Aug 2012 01:56:14 +1000 (EST) Received: from localhost ([::1]:36260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1fEY-0007Ti-1C for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 11:10:10 -0400 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 b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 15 Aug 2012 16:09:24 +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 Received: from localhost (sig-9-145-129-230.de.ibm.com [9.145.129.230]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7FF9MwW015213; Wed, 15 Aug 2012 09:09:23 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Wed, 15 Aug 2012 16:09:04 +0100 Message-Id: <1345043344-3978-10-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 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> x-cbid: 12081515-0542-0000-0000-000002BE1C54 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.113 Cc: Alberto Garcia , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 9/9] ivshmem, qdev-monitor: fix order of qerror parameters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; } }