On Fri, Nov 11, 2016 at 06:51:20PM -0800, Alistair Francis wrote:
> 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.
Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
>
> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
> ---
>
> hw/core/generic-loader.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
> index 79ab6df..208f549 100644
> --- a/hw/core/generic-loader.c
> +++ b/hw/core/generic-loader.c
> @@ -93,7 +93,12 @@ static void generic_loader_realize(DeviceState *dev, Error
> **errp)
> "image");
> return;
> }
> - s->set_pc = true;
> + /* 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) {
> --
> 2.7.4
>
