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 4/5] xl: Return an error on failed cd-insert
Date: Fri, 18 Dec 2015 12:23:44 +0000 [thread overview]
Message-ID: <1450441425-10755-5-git-send-email-george.dunlap@eu.citrix.com> (raw)
In-Reply-To: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com>
This makes xl more useful in scripts.
The strange thing about this is that the internal cd_insert function
*already* returned something appropriate, and cd-eject was using it,
but cd-insert wasn't.
Also:
* Rework cd_insert to return EXIT_FAILURE and EXIT_SUCCESS rather than
magic constants
* Use 'r' for non-libxl return code, as specified in CODING_STYLE
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
---
v4:
- Use EXIT_{SUCCESS,FAILURE} rather than magic constants in cd_insert
- Use 'r' rather than 'rc' for non-libxl return code
- Fixed typo in changelog
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 | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 1a8b4a1..0c3756b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3336,7 +3336,7 @@ static int cd_insert(uint32_t domid, const char *virtdev, char *phys)
char *buf = NULL;
XLU_Config *config = 0;
struct stat b;
- int rc = 0;
+ int r;
xasprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s",
virtdev, phys ? phys : "");
@@ -3352,18 +3352,22 @@ static int cd_insert(uint32_t domid, const char *virtdev, char *phys)
&& stat(disk.pdev_path, &b)) {
fprintf(stderr, "Cannot stat file: %s\n",
disk.pdev_path);
- rc = 1;
+ r = EXIT_FAILURE;
+ goto out;
+ }
+
+ if (libxl_cdrom_insert(ctx, domid, &disk, NULL)) {
+ r = EXIT_FAILURE;
goto out;
}
- if (libxl_cdrom_insert(ctx, domid, &disk, NULL))
- rc=1;
+ r = EXIT_SUCCESS;
out:
libxl_device_disk_dispose(&disk);
free(buf);
- return rc;
+ return r;
}
int main_cd_eject(int argc, char **argv)
@@ -3397,8 +3401,7 @@ int main_cd_insert(int argc, char **argv)
virtdev = argv[optind + 1];
file = argv[optind + 2];
- cd_insert(domid, virtdev, file);
- return 0;
+ return cd_insert(domid, virtdev, file);
}
int main_console(int argc, char **argv)
--
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 ` George Dunlap [this message]
2015-12-21 10:52 ` [PATCH v4 4/5] xl: Return an error on failed cd-insert Dario Faggioli
2016-01-04 17:38 ` Ian Jackson
2015-12-18 12:23 ` [PATCH v4 5/5] xl: Return error codes for pci* commands George Dunlap
2015-12-21 10:51 ` 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-5-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).