From patchwork Tue Mar 8 19:02:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harmandeep Kaur X-Patchwork-Id: 8536791 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 5B1F59F372 for ; Tue, 8 Mar 2016 19:05:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 735902015E for ; Tue, 8 Mar 2016 19:05:28 +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 854A72017D for ; Tue, 8 Mar 2016 19:05:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adMuJ-0000uc-1Z; Tue, 08 Mar 2016 19:02:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adMuH-0000tp-Dl for xen-devel@lists.xenproject.org; Tue, 08 Mar 2016 19:02:57 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 02/F0-23864-0E12FD65; Tue, 08 Mar 2016 19:02:56 +0000 X-Env-Sender: write.harmandeep@gmail.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1457463776!5479561!1 X-Originating-IP: [74.125.82.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3923 invoked from network); 8 Mar 2016 19:02:56 -0000 Received: from mail-wm0-f67.google.com (HELO mail-wm0-f67.google.com) (74.125.82.67) by server-9.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 8 Mar 2016 19:02:56 -0000 Received: by mail-wm0-f67.google.com with SMTP id l68so5892764wml.3 for ; Tue, 08 Mar 2016 11:02:56 -0800 (PST) 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=GJFjy8aUxu0hUKrYMexIJmV8//oUEDOvLxQuNSd4pgA=; b=KalRlgQK9XTJ5ke04btObBINZs+ZFz6RFynFNVdf/TA9djKn3Y7b3tFfv1fYsV9pQ8 kwgj/Jbx4ixJvU02/eD7DgjcOahqFuK+5qL//2m8ASOT6ZmbfdwbvDu6XSF/7obXNiuI xOkrcUpJRajatPqDLznPZx8eOcSUGfly7qGl26CZmjJj9/TdbRKkheHOGwtbQmzidzqd aP8h8T0XUt2t907IGhFw1h0svcHlP/A6r7QLe8N4W37xjoR3dljZhABc5SXqkpDlAoii QIjdJMvxgDwXms1yIHpA7T6erazHSQUrPfQskep/kRfC3n905rUhMgEYJn6Y1d1HmY2g Q+hA== 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=GJFjy8aUxu0hUKrYMexIJmV8//oUEDOvLxQuNSd4pgA=; b=N0V5foWeTdklEq4D1PKSY/xkv85unpK+FrK8RxEViUu7XBA3Y0sdg6MiItShXtroRE a+V8N4UYpfg791ARy8QsPvyYrep3slMzafxMegM/vFTEZ8PJL7mLW/4EM+wHli0XKft+ ZfN4EesK6oCfVjdfN1yLW15lEAhN483cDMGaaxc6kgjceYcTNNI1Y/kN+L5DRW/dLs/d edpaIIvwCkIfZNtz4taiB+dJk0+rsdmGMPkeTySMMcc0bhdE2KMbp8GI9iXPNFieAy2X sQtWBSU5kQfB+e/nvH5g0cHwuH3Vl1X5HmWVt+rL9fOdDJtLX7+6eaXI2JFc1rB9hr0J 6TbA== X-Gm-Message-State: AD7BkJKdIJSymA5G0pPsWwnZ947dK0KML5qzgAeuN+3hjpfTmvP1Tz60pfIkBFkPvAiLFg== X-Received: by 10.28.141.141 with SMTP id p135mr21363282wmd.30.1457463775914; Tue, 08 Mar 2016 11:02:55 -0800 (PST) Received: from localhost.localdomain ([124.253.57.150]) by smtp.googlemail.com with ESMTPSA id hu1sm4310795wjb.36.2016.03.08.11.02.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Mar 2016 11:02:55 -0800 (PST) From: Harmandeep Kaur To: xen-devel@lists.xenproject.org Date: Wed, 9 Mar 2016 00:32:06 +0530 Message-Id: <1457463730-4712-6-git-send-email-write.harmandeep@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457463730-4712-1-git-send-email-write.harmandeep@gmail.com> References: <1457463730-4712-1-git-send-email-write.harmandeep@gmail.com> Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Harmandeep Kaur Subject: [Xen-devel] [PATCH 5/9 v2] xl: Improve return and exit codes of pause, destroy and shutdown related functions. 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=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no 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 destroy_domain(), wait_for_domain_deaths(), shutdown_domain(), reboot_domain(), main_pause(), main_unpause(), main_destroy() and main_shutdown_or_reboot() are fixed. Signed-off-by: Harmandeep Kaur --- v2: No changes. --- tools/libxl/xl_cmdimpl.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5cedfe8..02aec34 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3705,10 +3705,10 @@ static void destroy_domain(uint32_t domid, int force) fprintf(stderr, "Not destroying domain 0; use -f to force.\n" "This can only be done when using a disaggregated " "hardware domain and toolstack.\n\n"); - exit(-1); + exit(EXIT_FAILURE); } rc = libxl_domain_destroy(ctx, domid, 0); - if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n",rc); exit(-1); } + if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n",rc); exit(EXIT_FAILURE); } } static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr) @@ -3720,7 +3720,7 @@ static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr) rc = libxl_event_wait(ctx, &event, LIBXL_EVENTMASK_ALL, 0,0); if (rc) { LOG("Failed to get event, quitting (rc=%d)", rc); - exit(-1); + exit(EXIT_FAILURE); } switch (event->type) { @@ -3765,14 +3765,14 @@ static void shutdown_domain(uint32_t domid, } if (rc) { - fprintf(stderr,"shutdown failed (rc=%d)\n",rc);exit(-1); + fprintf(stderr,"shutdown failed (rc=%d)\n",rc);exit(EXIT_FAILURE); } if (deathw) { rc = libxl_evenable_domain_death(ctx, domid, for_user, deathw); if (rc) { fprintf(stderr,"wait for death failed (evgen, rc=%d)\n",rc); - exit(-1); + exit(EXIT_FAILURE); } } } @@ -3796,14 +3796,14 @@ static void reboot_domain(uint32_t domid, libxl_evgen_domain_death **deathw, } } if (rc) { - fprintf(stderr,"reboot failed (rc=%d)\n",rc);exit(-1); + fprintf(stderr,"reboot failed (rc=%d)\n",rc);exit(EXIT_FAILURE); } if (deathw) { rc = libxl_evenable_domain_death(ctx, domid, for_user, deathw); if (rc) { fprintf(stderr,"wait for death failed (evgen, rc=%d)\n",rc); - exit(-1); + exit(EXIT_FAILURE); } } } @@ -4802,7 +4802,7 @@ int main_pause(int argc, char **argv) pause_domain(find_domain(argv[optind])); - return 0; + return EXIT_SUCCESS; } int main_unpause(int argc, char **argv) @@ -4815,7 +4815,7 @@ int main_unpause(int argc, char **argv) unpause_domain(find_domain(argv[optind])); - return 0; + return EXIT_SUCCESS; } int main_destroy(int argc, char **argv) @@ -4830,7 +4830,7 @@ int main_destroy(int argc, char **argv) } destroy_domain(find_domain(argv[optind]), force); - return 0; + return EXIT_SUCCESS; } static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) @@ -4862,7 +4862,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) if (!argv[optind] && !all) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); - return opt; + return EXIT_FAILURE; } if (all) { @@ -4870,7 +4870,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) libxl_evgen_domain_death **deathws = NULL; if (!(dominfo = libxl_list_domain(ctx, &nb_domain))) { fprintf(stderr, "libxl_list_domain failed.\n"); - return -1; + return EXIT_FAILURE; } if (wait_for_it) @@ -4901,7 +4901,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) } - return 0; + return EXIT_SUCCESS; } int main_shutdown(int argc, char **argv)