From: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
To: xen-devel@lists.xenproject.org, roger.pau@citrix.com,
George.Dunlap@eu.citrix.com
Cc: ian.jackson@eu.citrix.com, dario.faggioli@citrix.com,
wei.liu2@citrix.com, ian.campbell@citrix.com,
Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
Subject: [PATCH v2 07/10] xl_cmdimpl - Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove.
Date: Wed, 6 Apr 2016 13:46:00 +0200 [thread overview]
Message-ID: <1459943163-18697-8-git-send-email-paulinaszubarczyk@gmail.com> (raw)
In-Reply-To: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com>
From: George Dunlap <George.Dunlap@eu.citrix.com>
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 "r = 0" seemed
a bit pointless.
Signed-off-by: George Dunlap <George.Dunlap@eu.citrix.com>
Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
---
Changed since v1:
* Changed exit() calls to 'return 1;'
---
tools/libxl/xl_cmdimpl.c | 80 ++++++++++++++++++++++++++++++++++--------------
1 file changed, 57 insertions(+), 23 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index fd23f23..0bc7ad9 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3817,10 +3817,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);
@@ -3829,15 +3830,20 @@ static void pcidetach(uint32_t domid, const char *bdf, int force)
if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
fprintf(stderr, "pci-detach: malformed BDF specification \"%s\"\n", bdf);
- exit(2);
+ return 1;
+ }
+ 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;
}
- if (force)
- libxl_device_pci_destroy(ctx, domid, &pcidev, 0);
- else
- libxl_device_pci_remove(ctx, domid, &pcidev, 0);
libxl_device_pci_dispose(&pcidev);
xlu_cfg_destroy(config);
+
+ return r;
}
int main_pcidetach(int argc, char **argv)
@@ -3856,13 +3862,18 @@ 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);
@@ -3871,12 +3882,16 @@ static void pciattach(uint32_t domid, const char *bdf, const char *vs)
if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf);
- exit(2);
+ return 1;
}
- 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 1;
}
int main_pciattach(int argc, char **argv)
@@ -3895,8 +3910,11 @@ 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)
@@ -3928,10 +3946,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);
@@ -3940,12 +3959,16 @@ static void pciassignable_add(const char *bdf, int rebind)
if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
fprintf(stderr, "pci-assignable-add: malformed BDF specification \"%s\"\n", bdf);
- exit(2);
+ return 1;
}
- 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)
@@ -3959,14 +3982,18 @@ 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);
@@ -3975,12 +4002,16 @@ static void pciassignable_remove(const char *bdf, int rebind)
if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
fprintf(stderr, "pci-assignable-remove: malformed BDF specification \"%s\"\n", bdf);
- exit(2);
+ return 1;
}
- 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)
@@ -3997,8 +4028,11 @@ 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
next prev parent reply other threads:[~2016-04-06 11:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 11:45 [PATCH v2 00/10] xl: improve coding style and return more failure on failure for more xl commands Paulina Szubarczyk
2016-04-06 11:45 ` [PATCH v2 01/10] libxl_pci: improve return codes " Paulina Szubarczyk
2016-04-08 8:00 ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 02/10] libxl-pci: removing the extra 'out_closedir' cleaning path Paulina Szubarczyk
2016-04-08 8:12 ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 03/10] libxl: fix return value of libxl__device_pci_destroy_all Paulina Szubarczyk
2016-04-08 8:19 ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 04/10] xl: improve return code for freemem function Paulina Szubarczyk
2016-04-06 11:45 ` [PATCH v2 05/10] xl_cmdimpl: improve return codes for memset commands Paulina Szubarczyk
2016-04-08 8:26 ` Dario Faggioli
2016-04-08 9:04 ` Paulina Szubarczyk
2016-04-08 9:41 ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 06/10] xl_cmdimpl: improve return codes for cd-insert commands Paulina Szubarczyk
2016-04-08 8:29 ` Dario Faggioli
2016-04-06 11:46 ` Paulina Szubarczyk [this message]
2016-04-08 8:36 ` [PATCH v2 07/10] xl_cmdimpl - Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove Dario Faggioli
2016-04-06 11:46 ` [PATCH v2 08/10] libxl: improve main_tmem_* return codes Paulina Szubarczyk
2016-04-08 9:00 ` Dario Faggioli
2016-04-06 11:46 ` [PATCH v2 09/10] libxl: Fix libxl_set_memory_target return value Paulina Szubarczyk
2016-04-06 12:54 ` George Dunlap
2016-04-06 13:21 ` Paulina Szubarczyk
2016-04-06 13:53 ` George Dunlap
2016-04-06 11:46 ` [PATCH v2 10/10] libxl: libxl_tmem functions improving coding style Paulina Szubarczyk
2016-04-08 8:54 ` 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=1459943163-18697-8-git-send-email-paulinaszubarczyk@gmail.com \
--to=paulinaszubarczyk@gmail.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=dario.faggioli@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=roger.pau@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).