diff options
| author | Peter Maydell | 2020-05-15 16:47:47 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-05-15 16:47:47 +0200 |
| commit | 66706192de113c82ecf849f6943878c453b5d2ba (patch) | |
| tree | be67fade47633541ec2c242bbf32602f4384cbbf /linux-user/flatload.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200515-pull-request' i... (diff) | |
| parent | MAINTAINERS: update the orphaned cpus-common.c file (diff) | |
| download | qemu-66706192de113c82ecf849f6943878c453b5d2ba.tar.gz qemu-66706192de113c82ecf849f6943878c453b5d2ba.tar.xz qemu-66706192de113c82ecf849f6943878c453b5d2ba.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-tcg-plugins-150520-2' into staging
Various testing, tcg and plugin updates
- fix bug in gdbstub tests that leave hanging QEMUs
- tweak s390x travis test
- re-factor guest_base handling
- support "notes" in disassembler output
- include guest address notes in out_asm
- cleanup plugin headers and and constify hwaddr
- updates MAINTAINERS for cpu-common.c
# gpg: Signature made Fri 15 May 2020 15:40:40 BST
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-tcg-plugins-150520-2:
MAINTAINERS: update the orphaned cpus-common.c file
qemu/qemu-plugin: Make qemu_plugin_hwaddr_is_io() hwaddr argument const
qemu/plugin: Move !CONFIG_PLUGIN stubs altogether
qemu/plugin: Trivial code movement
translate-all: include guest address in out_asm output
disas: add optional note support to cap_disas
disas: include an optional note for the start of disassembly
accel/tcg: don't disable exec_tb trace events
accel/tcg: Relax va restrictions on 64-bit guests
exec/cpu-all: Use bool for have_guest_base
linux-user: completely re-write init_guest_space
travis.yml: Improve the --disable-tcg test on s390x
tests/guest-debug: catch hanging guests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/flatload.c')
| -rw-r--r-- | linux-user/flatload.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 66901f39cc..8fb448f0bf 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -442,6 +442,12 @@ static int load_flat_file(struct linux_binprm * bprm, indx_len = (indx_len + 15) & ~(abi_ulong)15; /* + * Alloate the address space. + */ + probe_guest_base(bprm->filename, 0, + text_len + data_len + extra + indx_len); + + /* * there are a couple of cases here, the separate code/data * case, and then the fully copied to RAM case which lumps * it all together. |