Returning error codes makes it easier for shell scripts to tell if a command has failed or succeeded.
Signed-off-by: George Dunlap <george.dun...@eu.citrix.com> Signed-off-by: Paulina Szubarczyk <paulinaszubarc...@gmail.com> --- Changed since v2: - Remove the change to exit code since the other pathes take care of that --- tools/libxl/xl_cmdimpl.c | 68 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 815b9de..6bef201 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3814,10 +3814,11 @@ int main_pcilist(int argc, char **argv) return 0; } -static void pcidetach(uint32_t domid, const char *bdf, int force) +static int pcidetach(uint32_t domid, const char *bdf, int force) { libxl_device_pci pcidev; XLU_Config *config; + int r = 0; libxl_device_pci_init(&pcidev); @@ -3828,13 +3829,18 @@ static void pcidetach(uint32_t domid, const char *bdf, int force) fprintf(stderr, "pci-detach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - if (force) - libxl_device_pci_destroy(ctx, domid, &pcidev, 0); - else - libxl_device_pci_remove(ctx, domid, &pcidev, 0); + if (force) { + if (libxl_device_pci_destroy(ctx, domid, &pcidev, 0)) + r = 1; + } else { + if (libxl_device_pci_remove(ctx, domid, &pcidev, 0)) + r = 1; + } libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pcidetach(int argc, char **argv) @@ -3853,13 +3859,17 @@ int main_pcidetach(int argc, char **argv) domid = find_domain(argv[optind]); bdf = argv[optind + 1]; - pcidetach(domid, bdf, force); - return 0; + if (pcidetach(domid, bdf, force)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } -static void pciattach(uint32_t domid, const char *bdf, const char *vs) + +static int pciattach(uint32_t domid, const char *bdf, const char *vs) { libxl_device_pci pcidev; XLU_Config *config; + int r = 0; libxl_device_pci_init(&pcidev); @@ -3870,10 +3880,14 @@ static void pciattach(uint32_t domid, const char *bdf, const char *vs) fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_add(ctx, domid, &pcidev, 0); + + if (libxl_device_pci_add(ctx, domid, &pcidev, 0)) + r = 1; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pciattach(int argc, char **argv) @@ -3892,8 +3906,10 @@ int main_pciattach(int argc, char **argv) if (optind + 1 < argc) vs = argv[optind + 2]; - pciattach(domid, bdf, vs); - return 0; + if (pciattach(domid, bdf, vs)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } static void pciassignable_list(void) @@ -3925,10 +3941,11 @@ int main_pciassignable_list(int argc, char **argv) return 0; } -static void pciassignable_add(const char *bdf, int rebind) +static int pciassignable_add(const char *bdf, int rebind) { libxl_device_pci pcidev; XLU_Config *config; + int r = 0; libxl_device_pci_init(&pcidev); @@ -3939,10 +3956,14 @@ static void pciassignable_add(const char *bdf, int rebind) fprintf(stderr, "pci-assignable-add: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_assignable_add(ctx, &pcidev, rebind); + + if (libxl_device_pci_assignable_add(ctx, &pcidev, rebind)) + r = 1; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pciassignable_add(int argc, char **argv) @@ -3956,14 +3977,17 @@ int main_pciassignable_add(int argc, char **argv) bdf = argv[optind]; - pciassignable_add(bdf, 1); - return 0; + if (pciassignable_add(bdf, 1)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } -static void pciassignable_remove(const char *bdf, int rebind) +static int pciassignable_remove(const char *bdf, int rebind) { libxl_device_pci pcidev; XLU_Config *config; + int r = 0; libxl_device_pci_init(&pcidev); @@ -3974,10 +3998,14 @@ static void pciassignable_remove(const char *bdf, int rebind) fprintf(stderr, "pci-assignable-remove: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_assignable_remove(ctx, &pcidev, rebind); + + if (libxl_device_pci_assignable_remove(ctx, &pcidev, rebind)) + r = 1; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return r; } int main_pciassignable_remove(int argc, char **argv) @@ -3994,8 +4022,10 @@ int main_pciassignable_remove(int argc, char **argv) bdf = argv[optind]; - pciassignable_remove(bdf, rebind); - return 0; + if (pciassignable_remove(bdf, rebind)) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } static void pause_domain(uint32_t domid) -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel