On 25.01.2017 21:45, Thomas Huth wrote:
> When running QEMU with "-M none -device loader,file=kernel.elf", it
> currently crashes with a segmentation fault, because the "none"-machine
> does not have any CPU by default and the generic loader code tries
> to dereference s->cpu. Fix it by adding an appropriate check for a
> NULL pointer.
>
> Reported-by: Laurent Vivier <laur...@vivier.eu>
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
> hw/core/generic-loader.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
> index 58f1f02..4601267 100644
> --- a/hw/core/generic-loader.c
> +++ b/hw/core/generic-loader.c
> @@ -137,20 +137,21 @@ static void generic_loader_realize(DeviceState *dev,
> Error **errp)
> #endif
>
> if (s->file) {
> + AddressSpace *as = s->cpu ? s->cpu->as : NULL;
> +
> if (!s->force_raw) {
> size = load_elf_as(s->file, NULL, NULL, &entry, NULL, NULL,
> - big_endian, 0, 0, 0, s->cpu->as);
> + big_endian, 0, 0, 0, as);
>
> if (size < 0) {
> size = load_uimage_as(s->file, &entry, NULL, NULL, NULL,
> NULL,
> - s->cpu->as);
> + as);
> }
> }
>
> if (size < 0 || s->force_raw) {
> /* Default to the maximum size being the machine's ram size */
> - size = load_image_targphys_as(s->file, s->addr, ram_size,
> - s->cpu->as);
> + size = load_image_targphys_as(s->file, s->addr, ram_size, as);
> } else {
> s->addr = entry;
> }
Ping?
Thomas
