|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] RE: [PATCH for-4.14 v3] tools/xen-ucode: return correct exit code on failed microcode update
> -----Original Message-----
> From: Igor Druzhinin <igor.druzhinin@xxxxxxxxxx>
> Sent: 17 June 2020 03:19
> To: xen-devel@xxxxxxxxxxxxxxxxxxxx
> Cc: ian.jackson@xxxxxxxxxxxxx; wl@xxxxxxx; xadimgnik@xxxxxxxxx; Igor Druzhinin
> <igor.druzhinin@xxxxxxxxxx>
> Subject: [PATCH for-4.14 v3] tools/xen-ucode: return correct exit code on
> failed microcode update
>
> 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@xxxxxxxxxx>
Reviewed-by: Paul Durrant <paul@xxxxxxx>
Release-acked-by: Paul Durrant <paul@xxxxxxx>
> ---
> 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
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |