From patchwork Wed Mar 30 15:02:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 8697821 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 179779F3D1 for ; Wed, 30 Mar 2016 15:06:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40D302038F for ; Wed, 30 Mar 2016 15:06:25 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 5092720386 for ; Wed, 30 Mar 2016 15:06:23 +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 1alHf6-0007Ha-Jv; Wed, 30 Mar 2016 15:04:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alHf5-0007HG-Kk for xen-devel@lists.xenproject.org; Wed, 30 Mar 2016 15:03:59 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id EC/D8-02994-DDAEBF65; Wed, 30 Mar 2016 15:03:57 +0000 X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1459350237!5888320!1 X-Originating-IP: [209.85.217.171] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30887 invoked from network); 30 Mar 2016 15:03:57 -0000 Received: from mail-lb0-f171.google.com (HELO mail-lb0-f171.google.com) (209.85.217.171) by server-6.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 30 Mar 2016 15:03:57 -0000 Received: by mail-lb0-f171.google.com with SMTP id u8so33921571lbk.0 for ; Wed, 30 Mar 2016 08:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=caIWPihicTmHbwDhaxBbnExgiwPmm/lkJpvWz3koPnI=; b=pzjWndj3hAYhD/y3Ritj1wloE+vfUvqyNVhurcLCyG9vxEGHRX3u1RamDgOYYYFrOx uH6TpRNrh/AGyPVSk07z9yPJ/zODL2IzXSUB2KTCFBjIA8vuYlzLo9kF8bG9rq027jfZ W/0i9/gIOiEpei8d0YvxQ0tX1W/852XIgsV6qTyULKbTVQ1r5gs9xu9b4tmIG2D3ivhT BLMBmSdbB4rZZVAE6TcF/fBveVjJXMKbGJpYqGio+HYBnObJLrtIWWEg1pHOktqp/Ape PTnbwkCLx8YEYlQ0Crg5shPmCdioTaFDhXEjecxNr8lHAJ+0hR9lGeBjUgwgDIpRf90m hdew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=caIWPihicTmHbwDhaxBbnExgiwPmm/lkJpvWz3koPnI=; b=YczB+k/yTy0AbwKbZgkggDj85Auw9hZypIRH9D/moVRaZIjHQ6fwaVfXZ27U8zGiNu 3qcac9HxQofICBCIW9sd7nkz3Relq+5FjkexJ2DkcHRH4s8RV6jELFeMXvPE/yTv1EGz x/tNjIg3250XbhkC9kvU28OYcjceC5EKlsGM7Zha8FgdkN5OTEdx3AiOJzM2XC7tn5Qs KN+jSwl7+JeZ16AisGJkjRhy/jEvNxAFX4RuaJ9uatVaNpmQhweo+8yJk37KyqRF2vk8 e/GJzwuyiYRBQDmM39dd+W15uNpBcG8ZRPAhkxmE/9kAQmO5klMTQHn7Sr2j/N6dJFnB cpug== X-Gm-Message-State: AD7BkJIAWc3Fc5wlrx9dTWAEg37+eeCZG5PGS/isgC5bs+dJftnPLD+721K1lR0skdDfow== X-Received: by 10.112.170.137 with SMTP id am9mr3580995lbc.84.1459350236893; Wed, 30 Mar 2016 08:03:56 -0700 (PDT) Received: from localhost.localdomain (84-10-74-207.static.chello.pl. [84.10.74.207]) by smtp.gmail.com with ESMTPSA id pe7sm644769lbc.14.2016.03.30.08.03.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 08:03:55 -0700 (PDT) From: Paulina Szubarczyk To: roger.pau@citrix.com, George.Dunlap@eu.citrix.com, xen-devel@lists.xenproject.org Date: Wed, 30 Mar 2016 17:02:40 +0200 Message-Id: <1459350170-9573-2-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459350170-9573-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1459350170-9573-1-git-send-email-paulinaszubarczyk@gmail.com> Cc: Dario Faggioli , Paulina Szubarczyk , Ian Campbell Subject: [Xen-devel] [PATCH 01/11] libxl_pci: improve return codes for more xl commands 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Return error code instead of always 0. Remove assigned-only ret variable in libxl__create_pci_backend. Signed-off-by: Paulina Szubarczyk CC: Wei Liu CC: Ian Jackson CC: Dario Faggioli CC: Ian Campbell --- tools/libxl/libxl_pci.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index dc10cb7..3435ce2 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -84,13 +84,11 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, flexarray_t *front = NULL; flexarray_t *back = NULL; libxl__device device; - int ret = ERROR_NOMEM, i; + int i; front = flexarray_make(gc, 16, 1); back = flexarray_make(gc, 16, 1); - ret = 0; - LOG(DEBUG, "Creating pci backend"); /* add pci device */ @@ -108,12 +106,10 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, flexarray_append_pair(front, "backend-id", GCSPRINTF("%d", 0)); flexarray_append_pair(front, "state", GCSPRINTF("%d", XenbusStateInitialising)); - libxl__device_generic_add(gc, XBT_NULL, &device, + return libxl__device_generic_add(gc, XBT_NULL, &device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count), NULL); - - return 0; } static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting)