From patchwork Wed Jan 18 16:16:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9524293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9863F60113 for ; Wed, 18 Jan 2017 16:57:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D0EE285AB for ; Wed, 18 Jan 2017 16:57:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81E9E2860B; Wed, 18 Jan 2017 16:57:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 303B4285AB for ; Wed, 18 Jan 2017 16:57:32 +0000 (UTC) Received: from localhost ([::1]:42647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTtYB-0004QQ-6e for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Jan 2017 11:57:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTsuy-0005Gi-Ll for qemu-devel@nongnu.org; Wed, 18 Jan 2017 11:17:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTsux-0005n2-R0 for qemu-devel@nongnu.org; Wed, 18 Jan 2017 11:17:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54654) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cTsux-0005me-IN for qemu-devel@nongnu.org; Wed, 18 Jan 2017 11:16:59 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C62A572CCD for ; Wed, 18 Jan 2017 16:16:59 +0000 (UTC) Received: from red.redhat.com (ovpn-117-52.rdu2.redhat.com [10.10.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C3AF97D07; Wed, 18 Jan 2017 16:16:58 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 18 Jan 2017 10:16:48 -0600 Message-Id: <20170118161653.19296-2-eblake@redhat.com> In-Reply-To: <20170118161653.19296-1-eblake@redhat.com> References: <20170118161653.19296-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 18 Jan 2017 16:16:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/6] pci: Use struct instead of QDict to pass back parameters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Apfelbaum , armbru@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP It's simpler to just use a C struct than it is to bundle things into a QDict in one function just to pull them back out in the caller. Plus, doing this gets rid of one more user of dynamic JSON through qobject_from_jsonf(). Signed-off-by: Eric Blake Acked-by: Michael S. Tsirkin Reviewed-by: Marc-André Lureau Reviewed-by: Markus Armbruster --- hw/pci/pcie_aer.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index daf1f65..78fd2c3 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -44,6 +44,13 @@ #define PCI_ERR_SRC_COR_OFFS 0 #define PCI_ERR_SRC_UNCOR_OFFS 2 +typedef struct PCIEErrorInject { + const char *id; + const char *root_bus; + int bus; + int devfn; +} PCIEErrorInject; + /* From 6.2.7 Error Listing and Rules. Table 6-2, 6-3 and 6-4 */ static uint32_t pcie_aer_uncor_default_severity(uint32_t status) { @@ -943,7 +950,8 @@ static int pcie_aer_parse_error_string(const char *error_name, } static int do_pcie_aer_inject_error(Monitor *mon, - const QDict *qdict, QObject **ret_data) + const QDict *qdict, + PCIEErrorInject *ret_data) { const char *id = qdict_get_str(qdict, "id"); const char *error_name; @@ -1004,34 +1012,24 @@ static int do_pcie_aer_inject_error(Monitor *mon, err.prefix[2] = qdict_get_try_int(qdict, "prefix2", 0); err.prefix[3] = qdict_get_try_int(qdict, "prefix3", 0); - ret = pcie_aer_inject_error(dev, &err); - *ret_data = qobject_from_jsonf("{'id': %s, " - "'root_bus': %s, 'bus': %d, 'devfn': %d, " - "'ret': %d}", - id, pci_root_bus_path(dev), - pci_bus_num(dev->bus), dev->devfn, - ret); - assert(*ret_data); + pcie_aer_inject_error(dev, &err); + ret_data->id = id; + ret_data->root_bus = pci_root_bus_path(dev); + ret_data->bus = pci_bus_num(dev->bus); + ret_data->devfn = dev->devfn; return 0; } void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) { - QObject *data; - int devfn; + PCIEErrorInject data; if (do_pcie_aer_inject_error(mon, qdict, &data) < 0) { return; } - assert(qobject_type(data) == QTYPE_QDICT); - qdict = qobject_to_qdict(data); - - devfn = (int)qdict_get_int(qdict, "devfn"); monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n", - qdict_get_str(qdict, "id"), - qdict_get_str(qdict, "root_bus"), - (int) qdict_get_int(qdict, "bus"), - PCI_SLOT(devfn), PCI_FUNC(devfn)); + data.id, data.root_bus, data.bus, + PCI_SLOT(data.devfn), PCI_FUNC(data.devfn)); }