From: Igor Druzhinin <igor.druzhinin@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Igor Druzhinin <igor.druzhinin@citrix.com>,
ian.jackson@eu.citrix.com, xadimgnik@gmail.com, wl@xen.org
Subject: [PATCH for-4.14 v3] tools/xen-ucode: return correct exit code on failed microcode update
Date: Wed, 17 Jun 2020 03:19:13 +0100 [thread overview]
Message-ID: <1592360353-31231-1-git-send-email-igor.druzhinin@citrix.com> (raw)
Otherwise it's difficult to know if operation failed inside the automation.
While at it, also switch to returning 1 and 2 instead of errno to avoid
incompatibilies between errno and special exit code numbers.
Signed-off-by: Igor Druzhinin <igor.druzhinin@citrix.com>
---
Changes in v3:
- conventionally return 1 and 2 instead of errno as exit code
---
tools/misc/xen-ucode.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c
index 0c257f4..ad32fac 100644
--- a/tools/misc/xen-ucode.c
+++ b/tools/misc/xen-ucode.c
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
fprintf(stderr,
"xen-ucode: Xen microcode updating tool\n"
"Usage: %s <microcode blob>\n", argv[0]);
- return 0;
+ exit(2);
}
filename = argv[1];
@@ -34,14 +34,14 @@ int main(int argc, char *argv[])
{
fprintf(stderr, "Could not open %s. (err: %s)\n",
filename, strerror(errno));
- return errno;
+ exit(1);
}
if ( fstat(fd, &st) != 0 )
{
fprintf(stderr, "Could not get the size of %s. (err: %s)\n",
filename, strerror(errno));
- return errno;
+ exit(1);
}
len = st.st_size;
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
if ( buf == MAP_FAILED )
{
fprintf(stderr, "mmap failed. (error: %s)\n", strerror(errno));
- return errno;
+ exit(1);
}
xch = xc_interface_open(NULL, NULL, 0);
@@ -57,20 +57,23 @@ int main(int argc, char *argv[])
{
fprintf(stderr, "Error opening xc interface. (err: %s)\n",
strerror(errno));
- return errno;
+ exit(1);
}
ret = xc_microcode_update(xch, buf, len);
if ( ret )
+ {
fprintf(stderr, "Failed to update microcode. (err: %s)\n",
strerror(errno));
+ exit(1);
+ }
xc_interface_close(xch);
if ( munmap(buf, len) )
{
printf("Could not unmap: %d(%s)\n", errno, strerror(errno));
- return errno;
+ exit(1);
}
close(fd);
--
2.7.4
next reply other threads:[~2020-06-17 2:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 2:19 Igor Druzhinin [this message]
2020-06-17 8:39 ` [PATCH for-4.14 v3] tools/xen-ucode: return correct exit code on failed microcode update Paul Durrant
2020-06-18 15:44 ` 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=1592360353-31231-1-git-send-email-igor.druzhinin@citrix.com \
--to=igor.druzhinin@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wl@xen.org \
--cc=xadimgnik@gmail.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).