[Xen-changelog] [qemu-xen master] generic-loader: file: Only set a PC if a CPU is specified

[patchbot@xxxxxxx]

commit 6aa3a61657a60ad2c422c720bfaa31589a6e7334
Author:     Alistair Francis <alistair.francis@xxxxxxxxxx>
AuthorDate: Fri Nov 11 18:51:20 2016 -0800
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Nov 28 11:25:58 2016 +0000

    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: Alistair Francis <alistair.francis@xxxxxxxxxx>
    Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xxxxxxxxxx>
    Message-id: 
537bf4d08be7acf7a89b590cff69e19db7f0a6cd.1478908712.git.alistair.francis@xxxxxxxxxx
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
---
 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) {
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog