diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
| commit | 6107ff12922e5508a44b376b40a3041810cb00d2 (patch) | |
| tree | 56098d53043a8fcdd01dbf0dca565ceab09f95b3 /bsd-user | |
| parent | be92bbf73dfd7d8a4786dc5f6c71590f4fbc5a32 (diff) | |
| parent | 8aaf42ed0f203da63860b0a3ab3ff2bdfe9b4cb0 (diff) | |
| download | qemu-6107ff12922e5508a44b376b40a3041810cb00d2.zip qemu-6107ff12922e5508a44b376b40a3041810cb00d2.tar.gz qemu-6107ff12922e5508a44b376b40a3041810cb00d2.tar.bz2 | |
Merge remote branch 'origin/master' into pci
Diffstat (limited to 'bsd-user')
| -rw-r--r-- | bsd-user/bsdload.c | 2 | ||||
| -rw-r--r-- | bsd-user/qemu.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index 14a93bf..6d9bb6f 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -176,8 +176,6 @@ int loader_exec(const char * filename, char ** argv, char ** envp, retval = prepare_binprm(&bprm); - infop->host_argv = argv; - if(retval>=0) { if (bprm.buf[0] == 0x7f && bprm.buf[1] == 'E' diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 9763616..e343894 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -50,7 +50,6 @@ struct image_info { abi_ulong entry; abi_ulong code_offset; abi_ulong data_offset; - char **host_argv; int personality; }; |