From: Harmandeep Kaur <write.harmandeep@gmail.com>
To: xen-devel@lists.xenproject.org
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 <write.harmandeep@gmail.com>
Subject: [PATCH 5/9] xl: Improve return and exit codes of main_pause(), main_unpause(), main_destroy() and main_shutdown_or_reboot() related functions.
Date: Wed, 24 Feb 2016 18:23:23 +0530 [thread overview]
Message-ID: <1456318407-3635-6-git-send-email-write.harmandeep@gmail.com> (raw)
In-Reply-To: <1456318407-3635-1-git-send-email-write.harmandeep@gmail.com>
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
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 e1b4286..b4920ff 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3696,10 +3696,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)
@@ -3711,7 +3711,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) {
@@ -3756,14 +3756,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);
}
}
}
@@ -3787,14 +3787,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);
}
}
}
@@ -4787,7 +4787,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)
@@ -4800,7 +4800,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)
@@ -4815,7 +4815,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)
@@ -4847,7 +4847,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) {
@@ -4855,7 +4855,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)
@@ -4886,7 +4886,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)
--
2.5.0
next prev parent reply other threads:[~2016-02-24 12:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 12:53 [PATCH 0/9] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
2016-02-24 12:53 ` [PATCH 1/9] xl: Improve return and exit codes of memory related functions Harmandeep Kaur
2016-02-24 13:55 ` Olaf Hering
2016-02-24 14:30 ` Dario Faggioli
2016-02-25 11:10 ` Dario Faggioli
2016-02-24 12:53 ` [PATCH 2/9] xl: Improve return and exit codes of restore and save " Harmandeep Kaur
2016-03-02 18:02 ` Dario Faggioli
2016-02-24 12:53 ` [PATCH 3/9] xl: Improve return and exit codes of migrate " Harmandeep Kaur
2016-03-02 17:53 ` Dario Faggioli
2016-02-24 12:53 ` [PATCH 4/9] xl: Improve return and exit codes of main_console(), main_vncviewer() and main_dump_core() Harmandeep Kaur
2016-02-25 11:33 ` Dario Faggioli
[not found] ` <CAPtdW15OwR5WmAnyr9+KqEbTFsPwX2d9_CzS945gzoLQyPBtOA@mail.gmail.com>
2016-03-08 14:16 ` Dario Faggioli
2016-02-24 12:53 ` Harmandeep Kaur [this message]
2016-03-02 16:59 ` [PATCH 5/9] xl: Improve return and exit codes of main_pause(), main_unpause(), main_destroy() and main_shutdown_or_reboot() related functions Dario Faggioli
2016-02-24 12:53 ` [PATCH 6/9] xl: Improve return and exit codes of main_list() and main_vm_list() " Harmandeep Kaur
2016-03-02 17:37 ` Dario Faggioli
2016-02-24 12:53 ` [PATCH 7/9] xl: Improve return and exit codes of main_create(), main_config_update(), main_sharing(), main_rename() and " Harmandeep Kaur
2016-03-02 17:29 ` Dario Faggioli
2016-02-24 12:53 ` [PATCH 8/9] xl: Improve return and exit codes main_button_press(), main_trigger(), main_remus() " Harmandeep Kaur
2016-02-25 11:26 ` Dario Faggioli
2016-02-24 12:53 ` [PATCH 9/9] xl: Improve return codes of main_domid(), main_domname() and main_sysrq() " Harmandeep Kaur
2016-02-25 11:18 ` Dario Faggioli
2016-02-25 10:57 ` [PATCH 0/9] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Dario Faggioli
2016-03-02 18:05 ` Dario Faggioli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456318407-3635-6-git-send-email-write.harmandeep@gmail.com \
--to=write.harmandeep@gmail.com \
--cc=dario.faggioli@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).