| Message ID | 537bf4d08be7acf7a89b590cff69e19db7f0a6cd.1478908712.git.alistair.francis@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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.iglesias@xilinx.com> > > Signed-off-by: Alistair Francis <alistair.francis@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 >
On Fri, Nov 11, 2016 at 8:06 PM, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote: > 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.iglesias@xilinx.com> Peter can this go through your queue? I think it should make it into 2.8 as it matches the documentation and this will be the first release with the device loader. Thanks, Alistair > > >> >> Signed-off-by: Alistair Francis <alistair.francis@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 >>
On 16 November 2016 at 22:02, Alistair Francis <alistair.francis@xilinx.com> wrote: > On Fri, Nov 11, 2016 at 8:06 PM, Edgar E. Iglesias > <edgar.iglesias@gmail.com> wrote: >> 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.iglesias@xilinx.com> > > Peter can this go through your queue? > > I think it should make it into 2.8 as it matches the documentation and > this will be the first release with the device loader. Yes, I think this counts as a bugfix -- applied to target-arm.next. -- PMM
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) {
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: Alistair Francis <alistair.francis@xilinx.com> --- hw/core/generic-loader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)