From patchwork Wed Apr 6 11:45:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 8761591 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 4020E9F36E for ; Wed, 6 Apr 2016 11:49:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E012201D3 for ; Wed, 6 Apr 2016 11:49:14 +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 35EFB201F2 for ; Wed, 6 Apr 2016 11:49:13 +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 1anlvj-00040U-Ib; Wed, 06 Apr 2016 11:47:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1anlvi-0003zR-9t for xen-devel@lists.xenproject.org; Wed, 06 Apr 2016 11:47:26 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id F1/19-20731-D47F4075; Wed, 06 Apr 2016 11:47:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRWlGSWpSXmKPExsVyMfS6s67Pd5Z wg5uvLSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1owXM06zFnzgqVh58jtzA+N3zi5GLg4hgemM El++PGUHcVgEZrFKvOmZxQLiSAhsY5XYM+0IaxcjB5ATI/HvdHUXIyeQWSpx7O5cNhBbSEBL4 tLKFSwQ9lQmiRvzpEFsNgEziZmTf4LFRQTCJd7272AGmcksMIdRYv+7q2DNwgKBEvumv2AGmc 8ioCrxd6EbSJhXwFvi4sHX7BC75CROHpvMCmJzCvhIPFhynAlil7fE72cb2SDqBSVOznzCAjK GWUBdYv08IZAws4C8RPPW2cwTGIVnIamahVA1C0nVAkbmVYzqxalFZalFupZ6SUWZ6RkluYmZ ObqGBqZ6uanFxYnpqTmJScV6yfm5mxiBIc4ABDsY17Y6H2KU5GBSEuUV+sASLsSXlJ9SmZFYn BFfVJqTWnyIUYaDQ0mCd8FXoJxgUWp6akVaZg4w2mDSEhw8SiK8t0HSvMUFibnFmekQqVOMxh xbfl9by8Sxbeq9tUxCLHn5ealS4rybQEoFQEozSvPgBsGSwCVGWSlhXkag04R4ClKLcjNLUOV fMYpzMCoJ8/4AmcKTmVcCt+8V0ClMQKfUCzOBnFKSiJCSamCMFpVpkOyMqI3ZOpNDoez1pmPq e0V3nJMOt1VQMJePnr6Qs7K82PTA5lon1s7TCw79dyhyf7pgn0By11oX7ckF8YVZrw9O+fs6Q 1kvUtRnQ579vUb5s3t/1FcpJykmfdLm1j+lsoZ7PnfsxzUP+/Xkpy2y//KwqZXhK+ezuS5SZY o3b1RNXqjEUpyRaKjFXFScCADpRx4y/QIAAA== X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1459943244!24885058!1 X-Originating-IP: [209.85.215.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9352 invoked from network); 6 Apr 2016 11:47:24 -0000 Received: from mail-lf0-f67.google.com (HELO mail-lf0-f67.google.com) (209.85.215.67) by server-15.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 6 Apr 2016 11:47:24 -0000 Received: by mail-lf0-f67.google.com with SMTP id t203so933726lfd.0 for ; Wed, 06 Apr 2016 04:47:24 -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 :mime-version:content-transfer-encoding; bh=8Bq7s8OwnFtfXzVaMJBGl3r1OhXB7elM4eLUipFJAys=; b=qwbXfQSFvHvtkw66xiHqAcmI/tDjJ7FMmLJZs2jwASg2sfyTnZP8X95rXjS284wOzx IB5M3jLRUjZL+sHCC+bR1g5MUaWcV4trOHWJDpi9iiWeGws2RhMSuytfEPUNXQGCC4lq 9h1rEmMrMTDllU/jttajev3JBtLqV1rAse35tgTsjvSzi+4T5PMni2ERipagWXjOBEFf Ipsdm969xMzict35Kj+wFH+l6aCqs0Q+UAanNszr5vx7wDfDuOVGNqnPbZ3VZfZFR7a1 Fg5Wdk8T4oQShwH0uroNR/lppoG59RuTfjlEVKRcFFK+el6AmSU32cZizp8P/QWH8kyH ZRug== 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:mime-version:content-transfer-encoding; bh=8Bq7s8OwnFtfXzVaMJBGl3r1OhXB7elM4eLUipFJAys=; b=W3h1cHCtfWQvJQtE/hp79ble4I2F1XQnouKP74a3BRmhuVGF5gvOcaoFWo4OzZRtTU 3E3OqYr5+7PMYZvcPZ8p49KGlZdzj7RLQyGGURZQ/3Z0Hat+fR5zJQMh6Z1qwDjewYOF P+QjL0Lbjn9FuzaEOxB7jErzI+/oHu8/7rtrNQy+m0z15INSjlszBy+tjRuRTAg+lmRT PzroI7WhM/2PSsJH/txgteQW8k/wu+ctVsKWgpN6IbDYB4uCK/pBmghNpc3rsSmDGGzf tvAVBZ90QiCd9UV+nUvXDLbOgm/Qk7KkCZRQ1/Xnmd9IzlH3X1wHtA8/QUax1wlojCaB L8yw== X-Gm-Message-State: AD7BkJIqGm9BP+yAu1X5uLQ9VLyUD2qh2yFHt614wiF7Zq6EEFaxVZiCWgefQQPbueewfQ== X-Received: by 10.25.25.7 with SMTP id 7mr4886695lfz.166.1459943244421; Wed, 06 Apr 2016 04:47:24 -0700 (PDT) Received: from localhost.localdomain (84-10-74-207.static.chello.pl. [84.10.74.207]) by smtp.gmail.com with ESMTPSA id ke9sm407808lbc.28.2016.04.06.04.47.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 04:47:23 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Date: Wed, 6 Apr 2016 13:45:59 +0200 Message-Id: <1459943163-18697-7-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com> MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, Paulina Szubarczyk Subject: [Xen-devel] [PATCH v2 06/10] xl_cmdimpl: improve return codes for cd-insert 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: , 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 - Use EXIT_{SUCCESS,FAILURE} for main_cd*() function - Use 0/1 as return values of cd_insert function Signed-off-by: Paulina Szubarczyk Acked-by: Roger Pau Monné --- tools/libxl/xl_cmdimpl.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ad88b4b..fd23f23 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3482,16 +3482,16 @@ 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); - r = EXIT_FAILURE; + r = 1; goto out; } if (libxl_cdrom_insert(ctx, domid, &disk, NULL)) { - r = EXIT_FAILURE; + r = 1; goto out; } - r = EXIT_SUCCESS; + r = 0; out: libxl_device_disk_dispose(&disk); @@ -3513,7 +3513,10 @@ int main_cd_eject(int argc, char **argv) domid = find_domain(argv[optind]); virtdev = argv[optind + 1]; - return cd_insert(domid, virtdev, NULL); + if (cd_insert(domid, virtdev, NULL)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_cd_insert(int argc, char **argv) @@ -3531,7 +3534,10 @@ int main_cd_insert(int argc, char **argv) virtdev = argv[optind + 1]; file = argv[optind + 2]; - return cd_insert(domid, virtdev, file); + if (cd_insert(domid, virtdev, file)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_usbctrl_attach(int argc, char **argv)