[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] linux-user: If loading fails, print error as
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PATCH 07/11] linux-user: If loading fails, print error as string, not number |
Date: |
Thu, 18 Oct 2012 14:31:03 +0300 |
From: Peter Maydell <address@hidden>
If the attempt to load the guest executable fails, print the
error message as a string, not a number. This requires us to
fix a couple of places in loader_exec() where we were returning
-1 instead of a valid negative errno.
The change allows us to drop the "Unknown binary format" message
because the strerror-enhanced message is now a more self-explanatory
"Error while loading $guest-binary: Exec format error".
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/linuxload.c | 8 ++++----
linux-user/main.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index b47025f..381ab89 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -140,8 +140,9 @@ int loader_exec(const char * filename, char ** argv, char
** envp,
bprm->p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int);
memset(bprm->page, 0, sizeof(bprm->page));
retval = open(filename, O_RDONLY);
- if (retval < 0)
- return retval;
+ if (retval < 0) {
+ return -errno;
+ }
bprm->fd = retval;
bprm->filename = (char *)filename;
bprm->argc = count(argv);
@@ -165,8 +166,7 @@ int loader_exec(const char * filename, char ** argv, char
** envp,
retval = load_flt_binary(bprm,regs,infop);
#endif
} else {
- fprintf(stderr, "Unknown binary format\n");
- return -1;
+ return -ENOEXEC;
}
}
diff --git a/linux-user/main.c b/linux-user/main.c
index 9f3476b..bcaadb6 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3569,7 +3569,7 @@ int main(int argc, char **argv, char **envp)
ret = loader_exec(filename, target_argv, target_environ, regs,
info, &bprm);
if (ret != 0) {
- printf("Error %d while loading %s\n", ret, filename);
+ printf("Error while loading %s: %s\n", filename, strerror(-ret));
_exit(1);
}
--
1.7.9.5
- [Qemu-devel] [PULL] [PATCH 00/11] Pending linux-user patches, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 04/11] linux-user: Implement gethostname, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 01/11] linux-user: fix statfs, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 09/11] tcg: Remove TCG_TARGET_HAS_GUEST_BASE define, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 02/11] linux-user: fix multi-threaded /proc/self/maps, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 05/11] alpha-linux-user: Fix sigaltstack structure definition, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 11/11] linux-user: register align p{read, write}64, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 07/11] linux-user: If loading fails, print error as string, not number,
riku . voipio <=
- [Qemu-devel] [PATCH 10/11] linux-user: ppc: mark as long long aligned, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 03/11] linux-user: Perform more checks on iovec lists, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 08/11] configure: Remove unnecessary host_guest_base code, riku . voipio, 2012/10/18
- [Qemu-devel] [PATCH 06/11] linux-user: Fix siginfo handling, riku . voipio, 2012/10/18
- Re: [Qemu-devel] [PULL] [PATCH 00/11] Pending linux-user patches, Aurelien Jarno, 2012/10/19