Merge remote-tracking branch 'rth/tags/pull-axp-20161117' into staging

Update alpha palcode for smp # gpg: Signature made Thu 17 Nov 2016 02:57:29 PM GMT # gpg: using RSA key 0xAD1270CC4DD0279B # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>" # gpg: aka "Richard Henderson <rth@redhat.com>" # gpg: aka "Richard Henderson <rth@twiddle.net>" # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B * rth/tags/pull-axp-20161117: target-alpha: Log cpuid with -d int target-alpha: Update palcode for smp Message-id: 1479394965-11254-1-git-send-email-rth@twiddle.net Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
qemu · Nov 18, 2016 · e7830f8 · e7830f8
2 parents 363effe + 022f52e
commit e7830f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pc-bios/palcode-clipper b/pc-bios/palcode-clipper
diff --git a/roms/qemu-palcode b/roms/qemu-palcode
diff --git a/target-alpha/helper.c b/target-alpha/helper.c
@@ -307,8 +307,10 @@ void alpha_cpu_do_interrupt(CPUState *cs)
             name = "call_pal";
             break;
         }
-        qemu_log("INT %6d: %s(%#x) pc=%016" PRIx64 " sp=%016" PRIx64 "\n",
-                 ++count, name, env->error_code, env->pc, env->ir[IR_SP]);
+        qemu_log("INT %6d: %s(%#x) cpu=%d pc=%016"
+                 PRIx64 " sp=%016" PRIx64 "\n",
+                 ++count, name, env->error_code, cs->cpu_index,
+                 env->pc, env->ir[IR_SP]);
     }
 
     cs->exception_index = -1;