From patchwork Fri Dec 18 12:23:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 7882791 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 860029F387 for ; Fri, 18 Dec 2015 12:26:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B28B02043C for ; Fri, 18 Dec 2015 12:26:26 +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 1A99D2041D for ; Fri, 18 Dec 2015 12:26:25 +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 1a9u4y-0005Wy-E7; Fri, 18 Dec 2015 12:24:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4x-0005UN-06 for xen-devel@lists.xen.org; Fri, 18 Dec 2015 12:24:11 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 09/0D-18316-AEAF3765; Fri, 18 Dec 2015 12:24:10 +0000 X-Env-Sender: prvs=787e22e97=George.Dunlap@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450441446!6206524!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1615 invoked from network); 18 Dec 2015 12:24:09 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 18 Dec 2015 12:24:09 -0000 X-IronPort-AV: E=Sophos;i="5.20,446,1444694400"; d="scan'208";a="326245105" From: George Dunlap To: Date: Fri, 18 Dec 2015 12:23:44 +0000 Message-ID: <1450441425-10755-5-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 4/5] xl: Return an error on failed cd-insert 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 This makes xl more useful in scripts. The strange thing about this is that the internal cd_insert function *already* returned something appropriate, and cd-eject was using it, but cd-insert wasn't. Also: * Rework cd_insert to return EXIT_FAILURE and EXIT_SUCCESS rather than magic constants * Use 'r' for non-libxl return code, as specified in CODING_STYLE Signed-off-by: George Dunlap Reviewed-by: Dario Faggioli Acked-by: Ian Jackson --- v4: - Use EXIT_{SUCCESS,FAILURE} rather than magic constants in cd_insert - Use 'r' rather than 'rc' for non-libxl return code - Fixed typo in changelog CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxl/xl_cmdimpl.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 1a8b4a1..0c3756b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3336,7 +3336,7 @@ static int cd_insert(uint32_t domid, const char *virtdev, char *phys) char *buf = NULL; XLU_Config *config = 0; struct stat b; - int rc = 0; + int r; xasprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", virtdev, phys ? phys : ""); @@ -3352,18 +3352,22 @@ static int cd_insert(uint32_t domid, const char *virtdev, char *phys) && stat(disk.pdev_path, &b)) { fprintf(stderr, "Cannot stat file: %s\n", disk.pdev_path); - rc = 1; + r = EXIT_FAILURE; + goto out; + } + + if (libxl_cdrom_insert(ctx, domid, &disk, NULL)) { + r = EXIT_FAILURE; goto out; } - if (libxl_cdrom_insert(ctx, domid, &disk, NULL)) - rc=1; + r = EXIT_SUCCESS; out: libxl_device_disk_dispose(&disk); free(buf); - return rc; + return r; } int main_cd_eject(int argc, char **argv) @@ -3397,8 +3401,7 @@ int main_cd_insert(int argc, char **argv) virtdev = argv[optind + 1]; file = argv[optind + 2]; - cd_insert(domid, virtdev, file); - return 0; + return cd_insert(domid, virtdev, file); } int main_console(int argc, char **argv)