From patchwork Fri Dec 18 12:23:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 7882821 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EBB23BEEE5 for ; Fri, 18 Dec 2015 12:26:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F026A20431 for ; Fri, 18 Dec 2015 12:26:31 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA9E720429 for ; Fri, 18 Dec 2015 12:26:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4h-0005SU-Ld; Fri, 18 Dec 2015 12:23:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4g-0005SF-Cg for xen-devel@lists.xen.org; Fri, 18 Dec 2015 12:23:54 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 72/2F-01753-9DAF3765; Fri, 18 Dec 2015 12:23:53 +0000 X-Env-Sender: prvs=787e22e97=George.Dunlap@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1450441428!11518275!2 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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53492 invoked from network); 18 Dec 2015 12:23:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 18 Dec 2015 12:23:50 -0000 X-IronPort-AV: E=Sophos;i="5.20,446,1444694400"; d="scan'208";a="320263528" From: George Dunlap To: Date: Fri, 18 Dec 2015 12:23:45 +0000 Message-ID: <1450441425-10755-6-git-send-email-george.dunlap@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com> References: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: George Dunlap , Ian Jackson , Wei Liu , Ian Campbell Subject: [Xen-devel] [PATCH v4 5/5] xl: Return error codes for pci* commands X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove. Returning error codes makes it easier for shell scripts to tell if a command has failed or succeeded. NB this violates the CODING_STYLE preference for not initializing the return-value variable at declaration; but in these cases, having a "goto out" that jumped over nothing but an "rc = EXIT_SUCCESS" seemed a bit pointless. Signed-off-by: George Dunlap Reviewed-by: Dario Faggioli --- v4: - Use EXIT_{SUCCESS,FAILURE} rather than magic constants. - Use 'r' rather than 'rc' for non-libxl error codes CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxl/xl_cmdimpl.c | 56 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0c3756b..e0c962e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3491,10 +3491,11 @@ int main_pcilist(int argc, char **argv) return 0; } -static void pcidetach(uint32_t domid, const char *bdf, int force) +static int pcidetach(uint32_t domid, const char *bdf, int force) { libxl_device_pci pcidev; XLU_Config *config; + int r = EXIT_SUCCESS; libxl_device_pci_init(&pcidev); @@ -3505,13 +3506,18 @@ static void pcidetach(uint32_t domid, const char *bdf, int force) fprintf(stderr, "pci-detach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - if (force) - libxl_device_pci_destroy(ctx, domid, &pcidev, 0); - else - libxl_device_pci_remove(ctx, domid, &pcidev, 0); + if (force) { + if(libxl_device_pci_destroy(ctx, domid, &pcidev, 0)) + r = EXIT_FAILURE; + } else { + if(libxl_device_pci_remove(ctx, domid, &pcidev, 0)) + r = EXIT_FAILURE; + } libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pcidetach(int argc, char **argv) @@ -3530,13 +3536,14 @@ int main_pcidetach(int argc, char **argv) domid = find_domain(argv[optind]); bdf = argv[optind + 1]; - pcidetach(domid, bdf, force); - return 0; + return pcidetach(domid, bdf, force); } -static void pciattach(uint32_t domid, const char *bdf, const char *vs) + +static int pciattach(uint32_t domid, const char *bdf, const char *vs) { libxl_device_pci pcidev; XLU_Config *config; + int r = EXIT_SUCCESS; libxl_device_pci_init(&pcidev); @@ -3547,10 +3554,14 @@ static void pciattach(uint32_t domid, const char *bdf, const char *vs) fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_add(ctx, domid, &pcidev, 0); + + if(libxl_device_pci_add(ctx, domid, &pcidev, 0)) + r = EXIT_FAILURE; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pciattach(int argc, char **argv) @@ -3569,8 +3580,7 @@ int main_pciattach(int argc, char **argv) if (optind + 1 < argc) vs = argv[optind + 2]; - pciattach(domid, bdf, vs); - return 0; + return pciattach(domid, bdf, vs); } static void pciassignable_list(void) @@ -3602,10 +3612,11 @@ int main_pciassignable_list(int argc, char **argv) return 0; } -static void pciassignable_add(const char *bdf, int rebind) +static int pciassignable_add(const char *bdf, int rebind) { libxl_device_pci pcidev; XLU_Config *config; + int r = EXIT_SUCCESS; libxl_device_pci_init(&pcidev); @@ -3616,10 +3627,14 @@ static void pciassignable_add(const char *bdf, int rebind) fprintf(stderr, "pci-assignable-add: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_assignable_add(ctx, &pcidev, rebind); + + if (libxl_device_pci_assignable_add(ctx, &pcidev, rebind)) + r = EXIT_FAILURE; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pciassignable_add(int argc, char **argv) @@ -3633,14 +3648,14 @@ int main_pciassignable_add(int argc, char **argv) bdf = argv[optind]; - pciassignable_add(bdf, 1); - return 0; + return pciassignable_add(bdf, 1); } -static void pciassignable_remove(const char *bdf, int rebind) +static int pciassignable_remove(const char *bdf, int rebind) { libxl_device_pci pcidev; XLU_Config *config; + int r = EXIT_SUCCESS; libxl_device_pci_init(&pcidev); @@ -3651,10 +3666,14 @@ static void pciassignable_remove(const char *bdf, int rebind) fprintf(stderr, "pci-assignable-remove: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_assignable_remove(ctx, &pcidev, rebind); + + if(libxl_device_pci_assignable_remove(ctx, &pcidev, rebind)) + r = EXIT_FAILURE; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pciassignable_remove(int argc, char **argv) @@ -3671,8 +3690,7 @@ int main_pciassignable_remove(int argc, char **argv) bdf = argv[optind]; - pciassignable_remove(bdf, rebind); - return 0; + return pciassignable_remove(bdf, rebind); } static void pause_domain(uint32_t domid)