From patchwork Fri Apr 1 12:40:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 8723511 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 02CF19F39A for ; Fri, 1 Apr 2016 12:43:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24B45203E3 for ; Fri, 1 Apr 2016 12:43:43 +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 46566203C2 for ; Fri, 1 Apr 2016 12:43:42 +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 1alyOA-0001ER-U9; Fri, 01 Apr 2016 12:41:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alyO9-0001DR-OU for xen-devel@lists.xenproject.org; Fri, 01 Apr 2016 12:41:21 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 13/19-04060-07C6EF65; Fri, 01 Apr 2016 12:41:20 +0000 X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1459514479!25023568!1 X-Originating-IP: [209.85.217.181] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14793 invoked from network); 1 Apr 2016 12:41:20 -0000 Received: from mail-lb0-f181.google.com (HELO mail-lb0-f181.google.com) (209.85.217.181) by server-16.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 1 Apr 2016 12:41:20 -0000 Received: by mail-lb0-f181.google.com with SMTP id u8so71264404lbk.0 for ; Fri, 01 Apr 2016 05:41:20 -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=SLUtPXxvntlvDRyeSICojkfmpK8RNmVnJxxkyJmsQZc=; b=akERprrMsS6ExA4dxqNyqQxCxmq+oEdtuxT/wK73DDL6HGz4OzAeU4OFaJWD5C4W7J Yu5rX9uSkc3XiNI37HehDmmKyTr8nZOMSRvOVviTxb+JxaHNKFUKT2aHVhFpGRVIUIMJ 20VXaTN5odjyczh7ZARNtARYcvcaHkDlFAt9zfVNsm88orwDn7hb+qRmCXF+8GAhUILO jBClTwebFHqhs1GUWDYZPkYUMhQksHFElNgFgDmgOkRZ0lUhE0NTpZHLhSp3C9qS5SiR lYJ4HZYKMM+VmsOZU9gQuRI/wbUv+l3I0Tt+3i9/ZOgOfBn6n+9z5o4/Xd8A+AshMhHt IJpw== 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=SLUtPXxvntlvDRyeSICojkfmpK8RNmVnJxxkyJmsQZc=; b=NsXX6SjrG5pYLuFRElmhKDhW4Rof+r8C2XLgpAZVX5bfnsXoxjqT/FOtADhx/+4DT/ t+WeoJS6pHbNd+dGK5b2M++VO/JKX4m8xUFXZMPjm6DNlOi9djo/IGZH4O5u4Ujeebk2 hliFtP7oKDdrLsRiQk5ZO2lgva+SRE0obSq8VRnBcyAtvu8etFUufqCKLPJwiBDDeHHD 3mpbeI6Jho7DpTw/FXAyCL7qwutoHGhQ//5qucG/XifgjWvrzV3vVgHaoW4B34iTqVTx R8O0au9/sHWOGiy5Dx6bFPDcf7P4aMEkrpiym6Dsy8TwcdWzXPbLKWwykrzD8c24174j gIHA== X-Gm-Message-State: AD7BkJKGENSVbalAKumyXMj2VGfq8JZ4HRTbulN6amOwE7ggtLC8zZt98RpbxNN69LbkOw== X-Received: by 10.112.189.137 with SMTP id gi9mr3455986lbc.125.1459514479761; Fri, 01 Apr 2016 05:41:19 -0700 (PDT) Received: from localhost.localdomain (84-10-74-207.static.chello.pl. [84.10.74.207]) by smtp.gmail.com with ESMTPSA id do4sm2134801lbc.35.2016.04.01.05.41.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 05:41:18 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Date: Fri, 1 Apr 2016 14:40:09 +0200 Message-Id: <1459514413-18682-7-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459514413-18682-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1459514413-18682-1-git-send-email-paulinaszubarczyk@gmail.com> Cc: Paulina Szubarczyk , dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH 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: , 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 - 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 | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 31f037f..2232a1e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3471,16 +3471,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); @@ -3502,7 +3502,11 @@ 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) @@ -3520,7 +3524,11 @@ 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)