From: George Dunlap <george.dunlap@eu.citrix.com>
To: xen-devel@lists.xen.org
Cc: George Dunlap <george.dunlap@eu.citrix.com>,
Ian Jackson <ian.jackson@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH v4 5/5] xl: Return error codes for pci* commands
Date: Fri, 18 Dec 2015 12:23:45 +0000 [thread overview]
Message-ID: <1450441425-10755-6-git-send-email-george.dunlap@eu.citrix.com> (raw)
In-Reply-To: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com>
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.
NB this violates the CODING_STYLE preference for not initializing the
return-value variable at declaration; but in these cases, having a
"goto out" that jumped over nothing but an "rc = EXIT_SUCCESS" seemed
a bit pointless.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
---
v4:
- Use EXIT_{SUCCESS,FAILURE} rather than magic constants.
- Use 'r' rather than 'rc' for non-libxl error codes
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
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 0c3756b..e0c962e 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3491,10 +3491,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 = EXIT_SUCCESS;
libxl_device_pci_init(&pcidev);
@@ -3505,13 +3506,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 = EXIT_FAILURE;
+ } else {
+ if(libxl_device_pci_remove(ctx, domid, &pcidev, 0))
+ r = EXIT_FAILURE;
+ }
libxl_device_pci_dispose(&pcidev);
xlu_cfg_destroy(config);
+
+ return r;
}
int main_pcidetach(int argc, char **argv)
@@ -3530,13 +3536,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 r = EXIT_SUCCESS;
libxl_device_pci_init(&pcidev);
@@ -3547,10 +3554,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 = EXIT_FAILURE;
libxl_device_pci_dispose(&pcidev);
xlu_cfg_destroy(config);
+
+ return r;
}
int main_pciattach(int argc, char **argv)
@@ -3569,8 +3580,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)
@@ -3602,10 +3612,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 = EXIT_SUCCESS;
libxl_device_pci_init(&pcidev);
@@ -3616,10 +3627,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 = EXIT_FAILURE;
libxl_device_pci_dispose(&pcidev);
xlu_cfg_destroy(config);
+
+ return r;
}
int main_pciassignable_add(int argc, char **argv)
@@ -3633,14 +3648,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 r = EXIT_SUCCESS;
libxl_device_pci_init(&pcidev);
@@ -3651,10 +3666,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 = EXIT_FAILURE;
libxl_device_pci_dispose(&pcidev);
xlu_cfg_destroy(config);
+
+ return r;
}
int main_pciassignable_remove(int argc, char **argv)
@@ -3671,8 +3690,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
next prev parent reply other threads:[~2015-12-18 12:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 12:23 [PATCH v4 0/5] Return failure on failure for more xl commands George Dunlap
2015-12-18 12:23 ` [PATCH v4 1/5] libxl: Remove pointless hypercall from libxl_set_memory_target George Dunlap
2016-01-04 17:28 ` Ian Jackson
2016-03-24 16:54 ` George Dunlap
2015-12-18 12:23 ` [PATCH v4 2/5] libxl: Fix libxl_set_memory_target return value George Dunlap
2016-01-04 17:37 ` Ian Jackson
2016-01-05 14:54 ` Ian Campbell
2016-01-05 15:21 ` Ian Jackson
2015-12-18 12:23 ` [PATCH v4 3/5] xl: Make set_memory_target return an error code on failure George Dunlap
2015-12-21 10:52 ` Dario Faggioli
2016-01-04 17:37 ` Ian Jackson
2015-12-18 12:23 ` [PATCH v4 4/5] xl: Return an error on failed cd-insert George Dunlap
2015-12-21 10:52 ` Dario Faggioli
2016-01-04 17:38 ` Ian Jackson
2015-12-18 12:23 ` George Dunlap [this message]
2015-12-21 10:51 ` [PATCH v4 5/5] xl: Return error codes for pci* commands Dario Faggioli
2016-01-04 17:40 ` Ian Jackson
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=1450441425-10755-6-git-send-email-george.dunlap@eu.citrix.com \
--to=george.dunlap@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).