diff options
| author | Peter Maydell | 2020-09-28 17:49:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-09-28 17:49:10 +0200 |
| commit | 74504514b154ebebdff577d88e4bf5c13074e9ed (patch) | |
| tree | d94d264f606b98303f9467c1472f447a6b3ae53e /hw/alpha/dp264.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pul... (diff) | |
| parent | core/register: Specify instance_size in the TypeInfo (diff) | |
| download | qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.gz qemu-74504514b154ebebdff577d88e4bf5c13074e9ed.tar.xz 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/alpha/dp264.c')
| -rw-r--r-- | hw/alpha/dp264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index f7751b18f6..4d24518d1d 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -62,8 +62,8 @@ static void clipper_init(MachineState *machine) qemu_irq rtc_irq; long size, i; char *palcode_filename; - uint64_t palcode_entry, palcode_low, palcode_high; - uint64_t kernel_entry, kernel_low, kernel_high; + uint64_t palcode_entry; + uint64_t kernel_entry, kernel_low; unsigned int smp_cpus = machine->smp.cpus; /* Create up to 4 cpus. */ @@ -113,7 +113,7 @@ static void clipper_init(MachineState *machine) exit(1); } size = load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_phys, - NULL, &palcode_entry, &palcode_low, &palcode_high, NULL, + NULL, &palcode_entry, NULL, NULL, NULL, 0, EM_ALPHA, 0, 0); if (size < 0) { error_report("could not load palcode '%s'", palcode_filename); @@ -132,7 +132,7 @@ static void clipper_init(MachineState *machine) uint64_t param_offset; size = load_elf(kernel_filename, NULL, cpu_alpha_superpage_to_phys, - NULL, &kernel_entry, &kernel_low, &kernel_high, NULL, + NULL, &kernel_entry, &kernel_low, NULL, NULL, 0, EM_ALPHA, 0, 0); if (size < 0) { error_report("could not load kernel '%s'", kernel_filename); |