From patchwork Fri Dec 16 17:40:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9478135 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 073B9607EE for ; Fri, 16 Dec 2016 17:42:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA2D1288B7 for ; Fri, 16 Dec 2016 17:42:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD55E288C5; Fri, 16 Dec 2016 17:42:35 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 39FD7288B7 for ; Fri, 16 Dec 2016 17:42:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cHwUQ-00086B-Kv; Fri, 16 Dec 2016 17:40:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cHwUP-000863-Ov for xen-devel@lists.xenproject.org; Fri, 16 Dec 2016 17:40:13 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 3E/36-00888-CF624585; Fri, 16 Dec 2016 17:40:12 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXitHRDpO4ftZA Ig2fbZC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxp20+xFjSKVbRf5WxgXM7fxcjJISHgL/Fn /Q1WEJtNQFniZ2cvG4gtIqAn0XTgOSOIzSzgJfFjRQ87iC0s4Cwxd9lLFhCbRUBVYu3HD2A1v AJOEp1TmlghZspJnD/+kxnEFhJQkOiYfowJokZQ4uTMJywQMyUkDr54wTyBkXsWktQsJKkFjE yrGDWKU4vKUot0Dc31kooy0zNKchMzc3QNDYz1clOLixPTU3MSk4r1kvNzNzECQ4EBCHYwvjz teYhRkoNJSZR3+Y7gCCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvI9VQyKEBItS01Mr0jJzgEEJ k5bg4FES4X2uAJTmLS5IzC3OTIdInWJUlBLnnQHSJwCSyCjNg2uDRcIlRlkpYV5GoEOEeApSi 3IzS1DlXzGKczAqCfOyAONKiCczrwRu+iugxUxAiy3mBYMsLklESEk1MF4Q0nviuE+k82Kzsu 7FpBm+U5of2EZs6Tp5LlsoIYv1eUdJ0vuFBr+3mU94eDTqphzHyxRRk2WPso7bMPbZ7JA9/mC Lpr84ox9fRbr8oulJfDH2zh3fonhNdtXv5OSRD+pU3bZ7hSLzkttMhalL1dfuPNERcubQlMbA x2tNo33/Zbb852G9qcRSnJFoqMVcVJwIAIRSOst/AgAA X-Env-Sender: prvs=151642c1c=wei.liu2@citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1481910010!76608444!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25627 invoked from network); 16 Dec 2016 17:40:12 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 16 Dec 2016 17:40:12 -0000 X-IronPort-AV: E=Sophos;i="5.33,358,1477958400"; d="scan'208";a="395231775" From: Wei Liu To: Xen-devel Date: Fri, 16 Dec 2016 17:40:09 +0000 Message-ID: <1481910009-4122-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH] libxl: fix coding style issues in init_acpi_config X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 1. Use "r" to store return values from xc calls. 2. Don't initialise "rc" at the beginning of the function. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl_x86_acpi.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c index 173188f..c0a6e32 100644 --- a/tools/libxl/libxl_x86_acpi.c +++ b/tools/libxl/libxl_x86_acpi.c @@ -98,14 +98,15 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_dominfo_t info; struct hvm_info_table *hvminfo; - int i, rc = 0; + int i, r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; - rc = xc_domain_getinfo(xch, domid, 1, &info); - if (rc < 0) { - LOG(ERROR, "getdomaininfo failed (rc=%d)", rc); + r = xc_domain_getinfo(xch, domid, 1, &info); + if (r < 0) { + LOG(ERROR, "getdomaininfo failed (rc=%d)", r); + rc = ERROR_FAIL; goto out; } @@ -118,11 +119,12 @@ static int init_acpi_config(libxl__gc *gc, struct xen_vmemrange *vmemrange; struct acpi_numa *numa = &config->numa; - rc = xc_domain_getvnuma(xch, domid, &numa->nr_vnodes, - &numa->nr_vmemranges, - &hvminfo->nr_vcpus, NULL, NULL, NULL); - if (rc) { - LOG(ERROR, "xc_domain_getvnuma failed (rc=%d)", rc); + r = xc_domain_getvnuma(xch, domid, &numa->nr_vnodes, + &numa->nr_vmemranges, + &hvminfo->nr_vcpus, NULL, NULL, NULL); + if (r) { + LOG(ERROR, "xc_domain_getvnuma failed (rc=%d)", r); + rc = ERROR_FAIL; goto out; } @@ -130,11 +132,12 @@ static int init_acpi_config(libxl__gc *gc, vdistance = libxl__zalloc(gc, dom->nr_vnodes * sizeof(*vdistance)); vcpu_to_vnode = libxl__zalloc(gc, hvminfo->nr_vcpus * sizeof(*vcpu_to_vnode)); - rc = xc_domain_getvnuma(xch, domid, &numa->nr_vnodes, - &numa->nr_vmemranges, &hvminfo->nr_vcpus, - vmemrange, vdistance, vcpu_to_vnode); - if (rc) { - LOG(ERROR, "xc_domain_getvnuma failed (rc=%d)", rc); + r = xc_domain_getvnuma(xch, domid, &numa->nr_vnodes, + &numa->nr_vmemranges, &hvminfo->nr_vcpus, + vmemrange, vdistance, vcpu_to_vnode); + if (r) { + LOG(ERROR, "xc_domain_getvnuma failed (rc=%d)", r); + rc = ERROR_FAIL; goto out; } numa->vmemrange = vmemrange;