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/mips/fuloong2e.c | |
| parent | 92d09502676678c8ebb1ad830666b323d3c88f9d (diff) | |
| parent | e8a612b7e3cdbdface1e34a27300ca2f8521dee0 (diff) | |
| download | focaccia-qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.gz focaccia-qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.zip | |
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/mips/fuloong2e.c')
| -rw-r--r-- | hw/mips/fuloong2e.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index f28609976b..b000ed1d7f 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -107,7 +107,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index, static int64_t load_kernel(CPUMIPSState *env) { - int64_t kernel_entry, kernel_low, kernel_high, initrd_size; + int64_t kernel_entry, kernel_high, initrd_size; int index = 0; long kernel_size; ram_addr_t initrd_offset; @@ -116,9 +116,9 @@ static int64_t load_kernel(CPUMIPSState *env) kernel_size = load_elf(loaderparams.kernel_filename, NULL, cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&kernel_entry, - (uint64_t *)&kernel_low, (uint64_t *)&kernel_high, - NULL, 0, EM_MIPS, 1, 0); + (uint64_t *)&kernel_entry, NULL, + (uint64_t *)&kernel_high, NULL, + 0, EM_MIPS, 1, 0); if (kernel_size < 0) { error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, |