Commit 6aa3a616 authored by Alistair Francis's avatar Alistair Francis Committed by Peter Maydell
Browse files

generic-loader: file: Only set a PC if a CPU is specified 



This patch fixes the generic-loader file loading to only set the program
counter if a CPU is specified. This follows what is written in the
documentation and was always part of the original intention.

Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 537bf4d08be7acf7a89b590cff69e19db7f0a6cd.1478908712.git.alistair.francis@xilinx.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 00227fef

hw/core/generic-loader.c

+6 −1
Original line number Diff line number Diff line
@@ -93,7 +93,12 @@ static void generic_loader_realize(DeviceState *dev, Error **errp) 
                       "image");

            return;

        }

        /* The user specified a file, only set the PC if they also specified

         * a CPU to use.

         */

        if (s->cpu_num != CPU_NONE) {

            s->set_pc = true;

        }

    } else if (s->addr) {

        /* User is setting the PC */

        if (s->data || s->data_len || s->data_be) {