diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-28 06:19:42 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-10 12:15:07 -0500 |
| commit | 58a70f169e33446a1a666145faaa1602b8a2ad3d (patch) | |
| tree | b5ae7cc220c5de35457fe6ec4ee85dc58bb16943 /hw | |
| parent | 6e504a989dece8136d58f9f7c42f6e22b1ce49ae (diff) | |
| download | qemu-58a70f169e33446a1a666145faaa1602b8a2ad3d.zip qemu-58a70f169e33446a1a666145faaa1602b8a2ad3d.tar.gz qemu-58a70f169e33446a1a666145faaa1602b8a2ad3d.tar.bz2 | |
cris: do not use ram_size global
Use the machine properties instead.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/cris/axis_dev88.c | 1 | ||||
| -rw-r--r-- | hw/cris/boot.c | 2 | ||||
| -rw-r--r-- | hw/cris/boot.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index dab7423..b0cb6d8 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -333,6 +333,7 @@ void axisdev88_init(MachineState *machine) if (kernel_filename) { li.image_filename = kernel_filename; li.cmdline = kernel_cmdline; + li.ram_size = machine->ram_size; cris_load_image(cpu, &li); } else if (!qtest_enabled()) { fprintf(stderr, "Kernel image must be specified\n"); diff --git a/hw/cris/boot.c b/hw/cris/boot.c index aa8d275..9fa09cf 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -81,7 +81,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) if (image_size < 0) { /* Takes a kimage from the axis devboard SDK. */ image_size = load_image_targphys(li->image_filename, 0x40004000, - ram_size); + li->ram_size); li->entry = 0x40004000; } diff --git a/hw/cris/boot.h b/hw/cris/boot.h index 218854e..9f1e0e3 100644 --- a/hw/cris/boot.h +++ b/hw/cris/boot.h @@ -6,6 +6,7 @@ struct cris_load_info const char *image_filename; const char *cmdline; int image_size; + ram_addr_t ram_size; hwaddr entry; }; |