summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-02-02 17:02:33 (GMT)
committerYury Usishchev <y.usishchev@samsung.com>2014-12-10 10:47:57 (GMT)
commite771036f20046354b296c5cd28eb594ae1698f0b (patch)
tree2fcf24f6a5c1f86906c55ec031af31e22b96a16e
parente2f4cb071c5df20dc8b608099fce037bb4d95ba5 (diff)
downloadqemu-e771036f20046354b296c5cd28eb594ae1698f0b.zip
qemu-e771036f20046354b296c5cd28eb594ae1698f0b.tar.gz
qemu-e771036f20046354b296c5cd28eb594ae1698f0b.tar.bz2
linux-user: binfmt: support host binaries
When we have a working host binary equivalent for the guest binary we're trying to run, let's just use that instead as it will be a lot faster. Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--linux-user/binfmt.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
index cd1f513..c755edc 100644
--- a/linux-user/binfmt.c
+++ b/linux-user/binfmt.c
@@ -5,6 +5,9 @@
#include <string.h>
#include <stdlib.h>
+#ifdef __x86_64__
+#define ARCH_NAME "x86_64"
+#endif
int main(int argc, char **argv, char **envp)
{
@@ -28,6 +31,29 @@ int main(int argc, char **argv, char **envp)
binfmt[0] = '\0';
/* Now argv[0] is the real qemu binary name */
+#ifdef ARCH_NAME
+ {
+ char *hostbin;
+ char *guestarch;
+ int r;
+
+ guestarch = strrchr(argv[0], '-') ;
+ if (!guestarch) {
+ goto skip;
+ }
+ guestarch++;
+ r = asprintf(&hostbin, "/emul/" ARCH_NAME "-for-%s/%s", guestarch, argv[1]);
+ if (!access(hostbin, X_OK) && (r > 0)) {
+ /*
+ * We found a host binary replacement for the non-host binary. Let's
+ * use that instead!
+ */
+ return execve(hostbin, &argv[2], envp);
+ }
+ }
+skip:
+#endif
+
new_argv = (char **)malloc((argc + 2) * sizeof(*new_argv));
if (argc > 3) {
memcpy(&new_argv[4], &argv[3], (argc - 3) * sizeof(*new_argv));