[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 5/6] xl: Return error codes for pci* commands
Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove. Returning error codes makes it easier for shell scripts to tell if a command has failed or succeeded. Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx> --- CC: Ian Campbell <ian.campbell@xxxxxxxxxx> CC: Ian Jackson <ian.jackson@xxxxxxxxxx> CC: Wei Liu <wei.liu2@xxxxxxxxxx> --- tools/libxl/xl_cmdimpl.c | 56 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 72ece2e..5f21c37 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3495,10 +3495,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 rc = 0; libxl_device_pci_init(&pcidev); @@ -3509,13 +3510,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)) + rc = 1; + } else { + if(libxl_device_pci_remove(ctx, domid, &pcidev, 0)) + rc = 1; + } libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return rc; } int main_pcidetach(int argc, char **argv) @@ -3534,13 +3540,14 @@ int main_pcidetach(int argc, char **argv) domid = find_domain(argv[optind]); bdf = argv[optind + 1]; - pcidetach(domid, bdf, force); - return 0; + return pcidetach(domid, bdf, force); } -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 rc; libxl_device_pci_init(&pcidev); @@ -3551,10 +3558,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)) + rc = 1; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return rc; } int main_pciattach(int argc, char **argv) @@ -3573,8 +3584,7 @@ int main_pciattach(int argc, char **argv) if (optind + 1 < argc) vs = argv[optind + 2]; - pciattach(domid, bdf, vs); - return 0; + return pciattach(domid, bdf, vs); } static void pciassignable_list(void) @@ -3606,10 +3616,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 rc = 0; libxl_device_pci_init(&pcidev); @@ -3620,10 +3631,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)) + rc = 1; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return rc; } int main_pciassignable_add(int argc, char **argv) @@ -3637,14 +3652,14 @@ int main_pciassignable_add(int argc, char **argv) bdf = argv[optind]; - pciassignable_add(bdf, 1); - return 0; + return pciassignable_add(bdf, 1); } -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 rc = 0; libxl_device_pci_init(&pcidev); @@ -3655,10 +3670,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)) + rc = 1; libxl_device_pci_dispose(&pcidev); xlu_cfg_destroy(config); + + return rc; } int main_pciassignable_remove(int argc, char **argv) @@ -3675,8 +3694,7 @@ int main_pciassignable_remove(int argc, char **argv) bdf = argv[optind]; - pciassignable_remove(bdf, rebind); - return 0; + return pciassignable_remove(bdf, rebind); } static void pause_domain(uint32_t domid) -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |