diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-28 16:49:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-28 16:49:10 +0100 |
| commit | 74504514b154ebebdff577d88e4bf5c13074e9ed (patch) | |
| tree | d94d264f606b98303f9467c1472f447a6b3ae53e /hw/ppc/spapr.c | |
| parent | 92d09502676678c8ebb1ad830666b323d3c88f9d (diff) | |
| parent | e8a612b7e3cdbdface1e34a27300ca2f8521dee0 (diff) | |
| download | qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.zip qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.gz qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.bz2 | |
Merge remote-tracking branch 'remotes/alistair/tags/pull-register-20200927' into staging
Two small patches. One with a fix for the register API instance_size
and one for removing unused address variables from load_elf.
# gpg: Signature made Sun 27 Sep 2020 14:45:06 BST
# gpg: using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
# gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full]
# Primary key fingerprint: F6C4 AC46 D493 4868 D3B8 CE8F 21E1 0D29 DF97 7054
* remotes/alistair/tags/pull-register-20200927:
core/register: Specify instance_size in the TypeInfo
load_elf: Remove unused address variables from callers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ppc/spapr.c')
| -rw-r--r-- | hw/ppc/spapr.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9bce189..cbcd93b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2919,18 +2919,15 @@ static void spapr_machine_init(MachineState *machine) } if (kernel_filename) { - uint64_t lowaddr = 0; - spapr->kernel_size = load_elf(kernel_filename, NULL, translate_kernel_address, spapr, - NULL, &lowaddr, NULL, NULL, 1, + NULL, NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); if (spapr->kernel_size == ELF_LOAD_WRONG_ENDIAN) { spapr->kernel_size = load_elf(kernel_filename, NULL, - translate_kernel_address, spapr, NULL, - &lowaddr, NULL, NULL, 0, - PPC_ELF_MACHINE, - 0, 0); + translate_kernel_address, spapr, + NULL, NULL, NULL, NULL, 0, + PPC_ELF_MACHINE, 0, 0); spapr->kernel_le = spapr->kernel_size > 0; } if (spapr->kernel_size < 0) { |