* [PATCH 1/9 v2] xl: Improve return and exit codes of memory related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 2/9 v2] xl: Improve return and exit codes of restore and save " Harmandeep Kaur
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
Return and exit codes of freemem(), set_memory_max(), main_memmax(),
set_memory_target(), main_memset() and main_sharing() in the file
xl_cmdimpl are fixed.
Add comment to explain return vaule of parse_mem_size_kb().
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add comment to explain return vaule of parse_mem_size_kb().
Add freemem() and main_sharing().
Remove find_domain().
---
tools/libxl/xl_cmdimpl.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 990d3c9..088971e 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -2581,30 +2581,30 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info)
rc = libxl_domain_need_memory(ctx, b_info, &need_memkb);
if (rc < 0)
- return rc;
+ return -1;
do {
rc = libxl_get_free_memory(ctx, &free_memkb);
if (rc < 0)
- return rc;
+ return -1;
if (free_memkb >= need_memkb)
return 0;
rc = libxl_set_memory_target(ctx, 0, free_memkb - need_memkb, 1, 0);
if (rc < 0)
- return rc;
+ return -1;
/* wait until dom0 reaches its target, as long as we are making
* progress */
rc = libxl_wait_for_memory_target(ctx, 0, 10);
if (rc < 0)
- return rc;
+ return -1;
retries--;
} while (retries > 0);
- return ERROR_NOMEM;
+ return -1;
}
static void autoconnect_console(libxl_ctx *ctx_ignored,
@@ -3133,6 +3133,10 @@ void help(const char *command)
}
}
+/*
+ * parse_mem_size_kb() returns -1 on failure, or the amount of memory,
+ * on success.
+ */
static int64_t parse_mem_size_kb(const char *mem)
{
char *endptr;
@@ -3275,17 +3279,17 @@ static int def_getopt(int argc, char * const argv[],
static int set_memory_max(uint32_t domid, const char *mem)
{
int64_t memorykb;
- int rc;
memorykb = parse_mem_size_kb(mem);
if (memorykb == -1) {
fprintf(stderr, "invalid memory size: %s\n", mem);
- exit(3);
+ exit(EXIT_FAILURE);
}
- rc = libxl_domain_setmaxmem(ctx, domid, memorykb);
+ if (libxl_domain_setmaxmem(ctx, domid, memorykb))
+ return 1;
- return rc;
+ return 0;
}
int main_memmax(int argc, char **argv)
@@ -3305,10 +3309,10 @@ int main_memmax(int argc, char **argv)
rc = set_memory_max(domid, mem);
if (rc) {
fprintf(stderr, "cannot set domid %d static max memory to : %s\n", domid, mem);
- return 1;
+ return EXIT_FAILURE;
}
- return 0;
+ return EXIT_SUCCESS;
}
static void set_memory_target(uint32_t domid, const char *mem)
@@ -3318,7 +3322,7 @@ static void set_memory_target(uint32_t domid, const char *mem)
memorykb = parse_mem_size_kb(mem);
if (memorykb == -1) {
fprintf(stderr, "invalid memory size: %s\n", mem);
- exit(3);
+ exit(EXIT_FAILURE);
}
libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1);
@@ -3338,7 +3342,7 @@ int main_memset(int argc, char **argv)
mem = argv[optind + 1];
set_memory_target(domid, mem);
- return 0;
+ return EXIT_SUCCESS;
}
static int cd_insert(uint32_t domid, const char *virtdev, char *phys)
@@ -5783,7 +5787,7 @@ int main_sharing(int argc, char **argv)
info = libxl_list_domain(ctx, &nb_domain);
if (!info) {
fprintf(stderr, "libxl_list_domain failed.\n");
- return 1;
+ return EXIT_FAILURE;
}
info_free = info;
} else if (optind == argc-1) {
@@ -5792,17 +5796,17 @@ int main_sharing(int argc, char **argv)
if (rc == ERROR_DOMAIN_NOTFOUND) {
fprintf(stderr, "Error: Domain \'%s\' does not exist.\n",
argv[optind]);
- return -rc;
+ return EXIT_FAILURE;
}
if (rc) {
fprintf(stderr, "libxl_domain_info failed (code %d).\n", rc);
- return -rc;
+ return EXIT_FAILURE;
}
info = &info_buf;
nb_domain = 1;
} else {
help("sharing");
- return 2;
+ return EXIT_FAILURE;
}
sharing(info, nb_domain);
@@ -5812,7 +5816,7 @@ int main_sharing(int argc, char **argv)
else
libxl_dominfo_dispose(info);
- return 0;
+ return EXIT_SUCCESS;
}
static int sched_domain_get(libxl_scheduler sched, int domid,
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/9 v2] xl: Improve return and exit codes of restore and save related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 1/9 v2] xl: Improve return and exit codes of memory related functions Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 3/9 v2] xl: Improve return and exit codes of migrate " Harmandeep Kaur
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
save_domain(), main_restore(), main_save() and main_remus() in the file
xl_cmdimpl are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add main_remus().
Remove create_domain().
---
tools/libxl/xl_cmdimpl.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 088971e..690eb91 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -4131,7 +4131,7 @@ static int save_domain(uint32_t domid, const char *filename, int checkpoint,
fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644);
if (fd < 0) {
fprintf(stderr, "Failed to open temp file %s for writing\n", filename);
- exit(2);
+ exit(EXIT_FAILURE);
}
save_domain_core_writeconfig(fd, filename, config_data, config_len);
@@ -4151,7 +4151,7 @@ static int save_domain(uint32_t domid, const char *filename, int checkpoint,
else
libxl_domain_destroy(ctx, domid, 0);
- exit(rc < 0 ? 1 : 0);
+ exit(rc < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
}
static pid_t create_migration_child(const char *rune, int *send_fd,
@@ -4625,7 +4625,7 @@ int main_restore(int argc, char **argv)
checkpoint_file = argv[optind + 1];
} else {
help("restore");
- return 2;
+ return EXIT_FAILURE;
}
memset(&dom_info, 0, sizeof(dom_info));
@@ -4642,9 +4642,9 @@ int main_restore(int argc, char **argv)
rc = create_domain(&dom_info);
if (rc < 0)
- return -rc;
+ return EXIT_FAILURE;
- return 0;
+ return EXIT_SUCCESS;
}
int main_migrate_receive(int argc, char **argv)
@@ -4700,7 +4700,7 @@ int main_save(int argc, char **argv)
if (argc-optind > 3) {
help("save");
- return 2;
+ return EXIT_FAILURE;
}
domid = find_domain(argv[optind]);
@@ -4709,7 +4709,7 @@ int main_save(int argc, char **argv)
config_filename = argv[optind + 2];
save_domain(domid, filename, checkpoint, leavepaused, config_filename);
- return 0;
+ return EXIT_SUCCESS;
}
int main_migrate(int argc, char **argv)
@@ -8085,7 +8085,7 @@ int main_remus(int argc, char **argv)
send_fd = open("/dev/null", O_RDWR, 0644);
if (send_fd < 0) {
perror("failed to open /dev/null");
- exit(-1);
+ exit(EXIT_FAILURE);
}
} else {
@@ -8102,7 +8102,7 @@ int main_remus(int argc, char **argv)
if (!config_len) {
fprintf(stderr, "No config file stored for running domain and "
"none supplied - cannot start remus.\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
child = create_migration_child(rune, &send_fd, &recv_fd);
@@ -8123,7 +8123,7 @@ int main_remus(int argc, char **argv)
if (libxl_domain_info(ctx, 0, domid)) {
fprintf(stderr, "Remus: Primary domain has been destroyed.\n");
close(send_fd);
- return 0;
+ return EXIT_SUCCESS;
}
/* If we are here, it means remus setup/domain suspend/backup has
@@ -8138,7 +8138,7 @@ int main_remus(int argc, char **argv)
}
close(send_fd);
- return -ERROR_FAIL;
+ return EXIT_FAILURE;
}
#endif
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/9 v2] xl: Improve return and exit codes of migrate related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 1/9 v2] xl: Improve return and exit codes of memory related functions Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 2/9 v2] xl: Improve return and exit codes of restore and save " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 4/9 v2] xl: Improve return and exit codes of console, vnc and core dump " Harmandeep Kaur
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
Micros CHK_ERRNOVAL, CHK_SYSCALL, MUST are fixed.
xvasprintf(), save_domain_core_begin(), create_migration_child(),
migrate_read_fixedmessage(), migrate_do_preamble(), migrate_domain(),
migrate_receive(), main_migrate_receive() and main_migrate() in the
file xl_cmdimpl are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add CHK_SYSCALL, MUST micros.
Add xvasprintf().
---
tools/libxl/xl_cmdimpl.c | 58 ++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 690eb91..9ec3b2a 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -50,7 +50,7 @@
else if (chk_errnoval > 0) { \
fprintf(stderr,"xl: fatal error: %s:%d: %s: %s\n", \
__FILE__,__LINE__, strerror(chk_errnoval), #call); \
- exit(-ERROR_FAIL); \
+ exit(EXIT_FAILURE); \
} \
})
@@ -59,7 +59,7 @@
if ((call) == -1) { \
fprintf(stderr,"xl: fatal error: %s:%d: %s: %s\n", \
__FILE__,__LINE__, strerror(errno), #call); \
- exit(-ERROR_FAIL); \
+ exit(EXIT_FAILURE); \
} \
})
@@ -68,7 +68,7 @@
if (must_rc < 0) { \
fprintf(stderr,"xl: fatal error: %s:%d, rc=%d: %s\n", \
__FILE__,__LINE__, must_rc, #call); \
- exit(-must_rc); \
+ exit(EXIT_FAILURE); \
} \
})
@@ -374,7 +374,7 @@ static void xvasprintf(char **strp, const char *fmt, va_list ap)
int r = vasprintf(strp, fmt, ap);
if (r == -1) {
perror("asprintf failed");
- exit(-ERROR_FAIL);
+ exit(EXIT_FAILURE);
}
}
@@ -4045,7 +4045,7 @@ static void save_domain_core_begin(uint32_t domid,
&config_v, config_len_r);
if (rc) {
fprintf(stderr, "unable to read overridden config file\n");
- exit(2);
+ exit(EXIT_FAILURE);
}
parse_config_data(override_config_file, config_v, *config_len_r,
&d_config);
@@ -4054,14 +4054,14 @@ static void save_domain_core_begin(uint32_t domid,
rc = libxl_retrieve_domain_configuration(ctx, domid, &d_config);
if (rc) {
fprintf(stderr, "unable to retrieve domain configuration\n");
- exit(2);
+ exit(EXIT_FAILURE);
}
}
config_c = libxl_domain_config_to_json(ctx, &d_config);
if (!config_c) {
fprintf(stderr, "unable to convert config file to JSON\n");
- exit(2);
+ exit(EXIT_FAILURE);
}
*config_data_r = (uint8_t *)config_c;
*config_len_r = strlen(config_c) + 1; /* including trailing '\0' */
@@ -4175,7 +4175,7 @@ static pid_t create_migration_child(const char *rune, int *send_fd,
close(recvpipe[0]); close(recvpipe[1]);
execlp("sh","sh","-c",rune,(char*)0);
perror("failed to exec sh");
- exit(-1);
+ exit(EXIT_FAILURE);
}
close(sendpipe[0]);
@@ -4198,14 +4198,14 @@ static int migrate_read_fixedmessage(int fd, const void *msg, int msgsz,
stream = rune ? "migration receiver stream" : "migration stream";
rc = libxl_read_exactly(ctx, fd, buf, msgsz, stream, what);
- if (rc) return ERROR_FAIL;
+ if (rc) return 1;
if (memcmp(buf, msg, msgsz)) {
fprintf(stderr, "%s contained unexpected data instead of %s\n",
stream, what);
if (rune)
fprintf(stderr, "(command run was: %s )\n", rune);
- return ERROR_FAIL;
+ return 1;
}
return 0;
}
@@ -4281,7 +4281,7 @@ static void migrate_do_preamble(int send_fd, int recv_fd, pid_t child,
if (send_fd < 0 || recv_fd < 0) {
fprintf(stderr, "migrate_do_preamble: invalid file descriptors\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
rc = migrate_read_fixedmessage(recv_fd, migrate_receiver_banner,
@@ -4290,7 +4290,7 @@ static void migrate_do_preamble(int send_fd, int recv_fd, pid_t child,
if (rc) {
close(send_fd);
migration_child_report(recv_fd);
- exit(-rc);
+ exit(EXIT_FAILURE);
}
save_domain_core_writeconfig(send_fd, "migration stream",
@@ -4315,7 +4315,7 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug,
if (!config_len) {
fprintf(stderr, "No config file stored for running domain and "
"none supplied - cannot migrate.\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
child = create_migration_child(rune, &send_fd, &recv_fd);
@@ -4402,26 +4402,26 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug,
if (!rc) fprintf(stderr, "migration sender: Resumed OK.\n");
fprintf(stderr, "Migration failed due to problems at target.\n");
- exit(-ERROR_FAIL);
+ exit(EXIT_FAILURE);
}
fprintf(stderr, "migration sender: Target reports successful startup.\n");
libxl_domain_destroy(ctx, domid, 0); /* bang! */
fprintf(stderr, "Migration successful.\n");
- exit(0);
+ exit(EXIT_SUCCESS);
failed_suspend:
close(send_fd);
migration_child_report(recv_fd);
fprintf(stderr, "Migration failed, failed to suspend at sender.\n");
- exit(-ERROR_FAIL);
+ exit(EXIT_FAILURE);
failed_resume:
close(send_fd);
migration_child_report(recv_fd);
fprintf(stderr, "Migration failed, resuming at sender.\n");
libxl_domain_resume(ctx, domid, 1, 0);
- exit(-ERROR_FAIL);
+ exit(EXIT_FAILURE);
failed_badly:
fprintf(stderr,
@@ -4434,7 +4434,7 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug,
close(send_fd);
migration_child_report(recv_fd);
- exit(-ERROR_BADFAIL);
+ exit(EXIT_FAILURE);
}
static void migrate_receive(int debug, int daemonize, int monitor,
@@ -4470,7 +4470,7 @@ static void migrate_receive(int debug, int daemonize, int monitor,
if (rc < 0) {
fprintf(stderr, "migration target: Domain creation failed"
" (code %d).\n", rc);
- exit(-rc);
+ exit(EXIT_FAILURE);
}
domid = rc;
@@ -4508,7 +4508,7 @@ static void migrate_receive(int debug, int daemonize, int monitor,
"Failed to unpause domain %s (id: %u):%d\n",
common_domname, domid, rc);
- exit(rc ? -ERROR_FAIL: 0);
+ exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
default:
/* do nothing */
break;
@@ -4521,7 +4521,7 @@ static void migrate_receive(int debug, int daemonize, int monitor,
migrate_receiver_ready,
sizeof(migrate_receiver_ready),
"migration ack stream", "ready message");
- if (rc) exit(-rc);
+ if (rc) exit(EXIT_FAILURE);
rc = migrate_read_fixedmessage(recv_fd, migrate_permission_to_go,
sizeof(migrate_permission_to_go),
@@ -4546,14 +4546,14 @@ static void migrate_receive(int debug, int daemonize, int monitor,
migrate_report, sizeof(migrate_report),
"migration ack stream",
"success/failure report");
- if (rc2) exit(-ERROR_BADFAIL);
+ if (rc2) exit(EXIT_FAILURE);
rc_buf = -rc;
assert(!!rc_buf == !!rc);
rc2 = libxl_write_exactly(ctx, send_fd, &rc_buf, 1,
"migration ack stream",
"success/failure code");
- if (rc2) exit(-ERROR_BADFAIL);
+ if (rc2) exit(EXIT_FAILURE);
if (rc) {
fprintf(stderr, "migration target: Failure, destroying our copy.\n");
@@ -4562,7 +4562,7 @@ static void migrate_receive(int debug, int daemonize, int monitor,
if (rc2) {
fprintf(stderr, "migration target: Failed to destroy our copy"
" (code %d).\n", rc2);
- exit(-ERROR_BADFAIL);
+ exit(EXIT_FAILURE);
}
fprintf(stderr, "migration target: Cleanup OK, granting sender"
@@ -4573,10 +4573,10 @@ static void migrate_receive(int debug, int daemonize, int monitor,
sizeof(migrate_permission_to_go),
"migration ack stream",
"permission to sender to have domain back");
- if (rc2) exit(-ERROR_BADFAIL);
+ if (rc2) exit(EXIT_FAILURE);
}
- exit(0);
+ exit(EXIT_SUCCESS);
}
int main_restore(int argc, char **argv)
@@ -4671,13 +4671,13 @@ int main_migrate_receive(int argc, char **argv)
if (argc-optind != 0) {
help("migrate-receive");
- return 2;
+ return EXIT_FAILURE;
}
migrate_receive(debug, daemonize, monitor,
STDOUT_FILENO, STDIN_FILENO,
checkpointed);
- return 0;
+ return EXIT_SUCCESS;
}
int main_save(int argc, char **argv)
@@ -4776,7 +4776,7 @@ int main_migrate(int argc, char **argv)
}
migrate_domain(domid, rune, debug, config_filename);
- return 0;
+ return EXIT_SUCCESS;
}
#endif
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/9 v2] xl: Improve return and exit codes of console, vnc and core dump related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
` (2 preceding siblings ...)
2016-03-08 19:02 ` [PATCH 3/9 v2] xl: Improve return and exit codes of migrate " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 5/9 v2] xl: Improve return and exit codes of pause, destroy and shutdown " Harmandeep Kaur
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
autoconnect_vncviewer(), main_console(), main_vncviewer(),
core_dump_domain() and main_dump_core() in the file
xl_cmdimpl are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add autoconnect_vncviewer().
---
tools/libxl/xl_cmdimpl.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 9ec3b2a..5cedfe8 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -219,7 +219,7 @@ static void autoconnect_vncviewer(uint32_t domid, int autopass)
sleep(1);
vncviewer(domid, autopass);
- _exit(1);
+ _exit(EXIT_FAILURE);
}
static int acquire_lock(void)
@@ -3430,7 +3430,7 @@ int main_console(int argc, char **argv)
type = LIBXL_CONSOLE_TYPE_SERIAL;
else {
fprintf(stderr, "console type supported are: pv, serial\n");
- return 2;
+ return EXIT_FAILURE;
}
break;
case 'n':
@@ -3444,7 +3444,7 @@ int main_console(int argc, char **argv)
else
libxl_console_exec(ctx, domid, num, type);
fprintf(stderr, "Unable to attach console\n");
- return 1;
+ return EXIT_FAILURE;
}
int main_vncviewer(int argc, char **argv)
@@ -3466,8 +3466,8 @@ int main_vncviewer(int argc, char **argv)
domid = find_domain(argv[optind]);
if (vncviewer(domid, autopass))
- return 1;
- return 0;
+ return EXIT_FAILURE;
+ return EXIT_SUCCESS;
}
static void pcilist(uint32_t domid)
@@ -4022,7 +4022,7 @@ static void core_dump_domain(uint32_t domid, const char *filename)
int rc;
rc=libxl_domain_core_dump(ctx, domid, filename, NULL);
- if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); }
+ if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(EXIT_FAILURE); }
}
#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME
@@ -4789,7 +4789,7 @@ int main_dump_core(int argc, char **argv)
}
core_dump_domain(find_domain(argv[optind]), argv[optind + 1]);
- return 0;
+ return EXIT_SUCCESS;
}
int main_pause(int argc, char **argv)
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/9 v2] xl: Improve return and exit codes of pause, destroy and shutdown related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
` (3 preceding siblings ...)
2016-03-08 19:02 ` [PATCH 4/9 v2] xl: Improve return and exit codes of console, vnc and core dump " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 6/9 v2] xl: Improve return and exit codes of list " Harmandeep Kaur
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
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 <write.harmandeep@gmail.com>
---
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)
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/9 v2] xl: Improve return and exit codes of list related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
` (4 preceding siblings ...)
2016-03-08 19:02 ` [PATCH 5/9 v2] xl: Improve return and exit codes of pause, destroy and shutdown " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 7/9 v2] xl: Improve return and exit codes of create, config_update and rename " Harmandeep Kaur
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
flush_stream(), list_domains(), list_vm(), main_list() and
main_vm_list() are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: No changes.
---
tools/libxl/xl_cmdimpl.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 02aec34..4011c81 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -433,7 +433,7 @@ static void flush_stream(FILE *fh)
if (ferror(fh) || fflush(fh)) {
perror(fh_name);
- exit(-1);
+ exit(EXIT_FAILURE);
}
}
@@ -3936,12 +3936,12 @@ static void list_domains(bool verbose, bool context, bool claim, bool numa,
if (numa) {
if (libxl_node_bitmap_alloc(ctx, &nodemap, 0)) {
fprintf(stderr, "libxl_node_bitmap_alloc_failed.\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
if (libxl_get_physinfo(ctx, &physinfo) != 0) {
fprintf(stderr, "libxl_physinfo failed.\n");
libxl_bitmap_dispose(&nodemap);
- exit(1);
+ exit(EXIT_FAILURE);
}
printf(" NODE Affinity");
@@ -4005,7 +4005,7 @@ static void list_vm(void)
if (!info) {
fprintf(stderr, "libxl_list_vm failed.\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
printf("UUID ID name\n");
for (i = 0; i < nb_vm; i++) {
@@ -4959,7 +4959,7 @@ int main_list(int argc, char **argv)
info = libxl_list_domain(ctx, &nb_domain);
if (!info) {
fprintf(stderr, "libxl_list_domain failed.\n");
- return 1;
+ return EXIT_FAILURE;
}
info_free = info;
} else if (optind == argc-1) {
@@ -4968,17 +4968,17 @@ int main_list(int argc, char **argv)
if (rc == ERROR_DOMAIN_NOTFOUND) {
fprintf(stderr, "Error: Domain \'%s\' does not exist.\n",
argv[optind]);
- return -rc;
+ return EXIT_FAILURE;
}
if (rc) {
fprintf(stderr, "libxl_domain_info failed (code %d).\n", rc);
- return -rc;
+ return EXIT_FAILURE;
}
info = &info_buf;
nb_domain = 1;
} else {
help("list");
- return 2;
+ return EXIT_FAILURE;
}
if (details)
@@ -4992,7 +4992,7 @@ int main_list(int argc, char **argv)
libxl_dominfo_dispose(&info_buf);
- return 0;
+ return EXIT_SUCCESS;
}
int main_vm_list(int argc, char **argv)
@@ -5004,7 +5004,7 @@ int main_vm_list(int argc, char **argv)
}
list_vm();
- return 0;
+ return EXIT_SUCCESS;
}
static void string_realloc_append(char **accumulate, const char *more)
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/9 v2] xl: Improve return and exit codes of create, config_update and rename related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
` (5 preceding siblings ...)
2016-03-08 19:02 ` [PATCH 6/9 v2] xl: Improve return and exit codes of list " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 8/9 v2] xl : Improve return and exit codes debugging, special keys and triggering " Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 9/9 v2] xl: Improve return and exit codes of domain id and name " Harmandeep Kaur
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
create_domain(), string_realloc_append(), main_create(),
main_config_update() and main_rename() are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add create_domain()
Remove main_sharing()
---
tools/libxl/xl_cmdimpl.c | 54 ++++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 4011c81..f0b5efc 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -2684,7 +2684,7 @@ static uint32_t create_domain(struct domain_create *dom_info)
int i;
int need_daemon = daemonize;
- int ret, rc;
+ int ret = 0, rc;
libxl_evgen_domain_death *deathw = NULL;
libxl_evgen_disk_eject **diskws = NULL; /* one per disk */
void *config_data = 0;
@@ -2713,11 +2713,11 @@ static uint32_t create_domain(struct domain_create *dom_info)
restore_fd = open(restore_file, O_RDONLY);
if (restore_fd == -1) {
fprintf(stderr, "Can't open restore file: %s\n", strerror(errno));
- return ERROR_INVAL;
+ return -1;
}
restore_fd_to_close = restore_fd;
rc = libxl_fd_set_cloexec(ctx, restore_fd, 1);
- if (rc) return rc;
+ if (rc) return -1;
}
CHK_ERRNOVAL(libxl_read_exactly(
@@ -2726,11 +2726,11 @@ static uint32_t create_domain(struct domain_create *dom_info)
if (memcmp(hdr.magic, savefileheader_magic, sizeof(hdr.magic))) {
fprintf(stderr, "File has wrong magic number -"
" corrupt or for a different tool?\n");
- return ERROR_INVAL;
+ return -1;
}
if (hdr.byteorder != SAVEFILE_BYTEORDER_VALUE) {
fprintf(stderr, "File has wrong byte order\n");
- return ERROR_INVAL;
+ return -1;
}
fprintf(stderr, "Loading new save file %s"
" (new xl fmt info"
@@ -2743,7 +2743,7 @@ static uint32_t create_domain(struct domain_create *dom_info)
fprintf(stderr, "Savefile has mandatory flag(s) 0x%"PRIx32" "
"which are not supported; need newer xl\n",
badflags);
- return ERROR_INVAL;
+ return -1;
}
if (hdr.optional_data_len) {
optdata_begin = xmalloc(hdr.optional_data_len);
@@ -2757,7 +2757,7 @@ static uint32_t create_domain(struct domain_create *dom_info)
#define WITH_OPTDATA(amt, body) \
if (OPTDATA_LEFT < (amt)) { \
fprintf(stderr, "Savefile truncated.\n"); \
- return ERROR_INVAL; \
+ return -1; \
} else { \
body; \
optdata_here += (amt); \
@@ -2790,12 +2790,12 @@ static uint32_t create_domain(struct domain_create *dom_info)
ret = libxl_read_file_contents(ctx, config_file,
&config_data, &config_len);
if (ret) { fprintf(stderr, "Failed to read config file: %s: %s\n",
- config_file, strerror(errno)); return ERROR_FAIL; }
+ config_file, strerror(errno)); return -1; }
}
if (!restoring && extra_config && strlen(extra_config)) {
if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) {
fprintf(stderr, "Failed to attach extra configuration\n");
- return ERROR_FAIL;
+ return -1;
}
/* allocate space for the extra config plus two EOLs plus \0 */
config_data = xrealloc(config_data, config_len
@@ -2809,7 +2809,7 @@ static uint32_t create_domain(struct domain_create *dom_info)
if (!config_data) {
fprintf(stderr, "Config file not specified and"
" none in save file\n");
- return ERROR_INVAL;
+ return -1;
}
config_source = "<saved>";
config_in_json = !!(hdr.mandatory_flags & XL_MANDATORY_FLAG_JSON);
@@ -2848,7 +2848,7 @@ static uint32_t create_domain(struct domain_create *dom_info)
if (!json) {
fprintf(stderr,
"Failed to convert domain configuration to JSON\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
fputs(json, cfg_print_fh);
free(json);
@@ -2872,7 +2872,7 @@ start:
ret = freemem(domid, &d_config.b_info);
if (ret < 0) {
fprintf(stderr, "failed to free memory for the domain\n");
- ret = ERROR_FAIL;
+ ret = -1;
goto error_out;
}
}
@@ -3096,7 +3096,7 @@ out:
* already happened in the parent.
*/
if ( daemonize && !need_daemon )
- exit(ret);
+ exit(EXIT_SUCCESS);
return ret;
}
@@ -5016,7 +5016,7 @@ static void string_realloc_append(char **accumulate, const char *more)
size_t morelen = strlen(more) + 1/*nul*/;
if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) {
fprintf(stderr,"Additional config data far too large\n");
- exit(-ERROR_FAIL);
+ exit(EXIT_FAILURE);
}
*accumulate = xrealloc(*accumulate, oldlen + morelen);
@@ -5091,7 +5091,7 @@ int main_create(int argc, char **argv)
} else {
help("create");
free(dom_info.extra_config);
- return 2;
+ return EXIT_FAILURE;
}
}
@@ -5110,11 +5110,11 @@ int main_create(int argc, char **argv)
rc = create_domain(&dom_info);
if (rc < 0) {
free(dom_info.extra_config);
- return -rc;
+ return EXIT_FAILURE;
}
free(dom_info.extra_config);
- return 0;
+ return EXIT_SUCCESS;
}
int main_config_update(int argc, char **argv)
@@ -5135,7 +5135,7 @@ int main_config_update(int argc, char **argv)
if (argc < 2) {
fprintf(stderr, "xl config-update requires a domain argument\n");
help("config-update");
- exit(1);
+ exit(EXIT_FAILURE);
}
fprintf(stderr, "WARNING: xl now has better capability to manage domain configuration, "
@@ -5167,7 +5167,7 @@ int main_config_update(int argc, char **argv)
} else {
help("create");
free(extra_config);
- return 2;
+ return EXIT_FAILURE;
}
}
if (filename) {
@@ -5176,25 +5176,25 @@ int main_config_update(int argc, char **argv)
&config_data, &config_len);
if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n",
filename, strerror(errno));
- free(extra_config); return ERROR_FAIL; }
+ free(extra_config); return EXIT_FAILURE; }
if (extra_config && strlen(extra_config)) {
if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) {
fprintf(stderr, "Failed to attach extra configuration\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
/* allocate space for the extra config plus two EOLs plus \0 */
config_data = realloc(config_data, config_len
+ strlen(extra_config) + 2 + 1);
if (!config_data) {
fprintf(stderr, "Failed to realloc config_data\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
config_len += sprintf(config_data + config_len, "\n%s\n",
extra_config);
}
} else {
fprintf(stderr, "Config file not specified\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
libxl_domain_config_init(&d_config);
@@ -5210,7 +5210,7 @@ int main_config_update(int argc, char **argv)
config_data, config_len);
if (rc) {
fprintf(stderr, "failed to update configuration\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
}
@@ -5218,7 +5218,7 @@ int main_config_update(int argc, char **argv)
free(config_data);
free(extra_config);
- return 0;
+ return EXIT_SUCCESS;
}
static void button_press(uint32_t domid, const char *b)
@@ -6389,10 +6389,10 @@ int main_rename(int argc, char **argv)
domid = find_domain(dom);
if (libxl_domain_rename(ctx, domid, common_domname, new_name)) {
fprintf(stderr, "Can't rename domain '%s'.\n", dom);
- return 1;
+ return EXIT_FAILURE;
}
- return 0;
+ return EXIT_SUCCESS;
}
int main_trigger(int argc, char **argv)
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/9 v2] xl : Improve return and exit codes debugging, special keys and triggering related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
` (6 preceding siblings ...)
2016-03-08 19:02 ` [PATCH 7/9 v2] xl: Improve return and exit codes of create, config_update and rename " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
2016-03-08 19:02 ` [PATCH 9/9 v2] xl: Improve return and exit codes of domain id and name " Harmandeep Kaur
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
button_press(), main_trigger(), main_sysrq(), main_debug_keys()
and main_dmesg() are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add main_sysrq(), main_debug_keys(), main_dmesg()
Remove xvasprintf(), main_remus()
---
tools/libxl/xl_cmdimpl.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index f0b5efc..4b2ae68 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5231,7 +5231,7 @@ static void button_press(uint32_t domid, const char *b)
trigger = LIBXL_TRIGGER_SLEEP;
} else {
fprintf(stderr, "%s is an invalid button identifier\n", b);
- exit(2);
+ exit(EXIT_FAILURE);
}
libxl_send_trigger(ctx, domid, trigger, 0);
@@ -6413,7 +6413,7 @@ int main_trigger(int argc, char **argv)
trigger_name = argv[optind++];
if (libxl_trigger_from_string(trigger_name, &trigger)) {
fprintf(stderr, "Invalid trigger \"%s\"\n", trigger_name);
- return -1;
+ return EXIT_FAILURE;
}
if (argv[optind]) {
@@ -6425,7 +6425,7 @@ int main_trigger(int argc, char **argv)
libxl_send_trigger(ctx, domid, trigger, vcpuid);
- return 0;
+ return EXIT_SUCCESS;
}
@@ -6446,12 +6446,12 @@ int main_sysrq(int argc, char **argv)
if (sysrq[1] != '\0') {
fprintf(stderr, "Invalid sysrq.\n\n");
help("sysrq");
- return 1;
+ return EXIT_FAILURE;
}
libxl_send_sysrq(ctx, domid, sysrq[0]);
- return 0;
+ return EXIT_SUCCESS;
}
int main_debug_keys(int argc, char **argv)
@@ -6467,10 +6467,10 @@ int main_debug_keys(int argc, char **argv)
if (libxl_send_debug_keys(ctx, keys)) {
fprintf(stderr, "cannot send debug keys: %s\n", keys);
- return 1;
+ return EXIT_FAILURE;
}
- return 0;
+ return EXIT_SUCCESS;
}
int main_dmesg(int argc, char **argv)
@@ -6496,7 +6496,7 @@ int main_dmesg(int argc, char **argv)
finish:
if (cr)
libxl_xen_console_read_finish(ctx, cr);
- return ret;
+ return ret ? EXIT_FAILURE : EXIT_SUCCESS;
}
int main_top(int argc, char **argv)
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 9/9 v2] xl: Improve return and exit codes of domain id and name related functions.
2016-03-08 19:02 [PATCH 0/9 v2] xl: convert exit codes related to domain subcommands to EXIT_[SUCCESS|FAILURE] Harmandeep Kaur
` (7 preceding siblings ...)
2016-03-08 19:02 ` [PATCH 8/9 v2] xl : Improve return and exit codes debugging, special keys and triggering " Harmandeep Kaur
@ 2016-03-08 19:02 ` Harmandeep Kaur
8 siblings, 0 replies; 10+ messages in thread
From: Harmandeep Kaur @ 2016-03-08 19:02 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, dario.faggioli,
ian.jackson, Harmandeep Kaur
find_domain(), main_domid() and main_domname() are fixed.
Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>
---
v2: Add find_domain().
---
tools/libxl/xl_cmdimpl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 4b2ae68..883589b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -172,7 +172,7 @@ static uint32_t find_domain(const char *p)
rc = libxl_domain_qualifier_to_domid(ctx, p, &domid);
if (rc) {
fprintf(stderr, "%s is an invalid domain identifier (rc=%d)\n", p, rc);
- exit(2);
+ exit(EXIT_FAILURE);
}
common_domname = libxl_domid_to_name(ctx, domid);
return domid;
@@ -6335,12 +6335,12 @@ int main_domid(int argc, char **argv)
if (libxl_name_to_domid(ctx, domname, &domid)) {
fprintf(stderr, "Can't get domid of domain name '%s', maybe this domain does not exist.\n", domname);
- return 1;
+ return EXIT_FAILURE;
}
printf("%d\n", domid);
- return 0;
+ return EXIT_SUCCESS;
}
int main_domname(int argc, char **argv)
@@ -6358,19 +6358,19 @@ int main_domname(int argc, char **argv)
if (domid == 0 && !strcmp(endptr, argv[optind])) {
/*no digits at all*/
fprintf(stderr, "Invalid domain id.\n\n");
- return 1;
+ return EXIT_FAILURE;
}
domname = libxl_domid_to_name(ctx, domid);
if (!domname) {
fprintf(stderr, "Can't get domain name of domain id '%d', maybe this domain does not exist.\n", domid);
- return 1;
+ return EXIT_FAILURE;
}
printf("%s\n", domname);
free(domname);
- return 0;
+ return EXIT_SUCCESS;
}
int main_rename(int argc, char **argv)
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread