diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-18 14:49:02 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-18 14:49:02 +0000 |
| commit | e7830f8961bbe59307e98ba00186d7a7a8152b0c (patch) | |
| tree | 58ec6c8c294135ba6af1107a173e39fb1be1db22 | |
| parent | 363effe28b188460f8a0b075b841fdca1b2043d4 (diff) | |
| parent | 022f52e040807363213c8752ce61a7d0f57e3078 (diff) | |
| download | qemu-e7830f8961bbe59307e98ba00186d7a7a8152b0c.tar.gz | |
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>
| -rwxr-xr-x | pc-bios/palcode-clipper | bin | 133550 -> 152680 bytes | |||
| m--------- | roms/qemu-palcode | 0 | ||||
| -rw-r--r-- | target-alpha/helper.c | 6 |
3 files changed, 4 insertions, 2 deletions
diff --git a/pc-bios/palcode-clipper b/pc-bios/palcode-clipper Binary files differindex 9956340cd1..1df377a0fd 100755 --- a/pc-bios/palcode-clipper +++ b/pc-bios/palcode-clipper diff --git a/roms/qemu-palcode b/roms/qemu-palcode -Subproject c87a92639b28ac42bc8f6c67443543b405dc479 +Subproject f3c7e44c70254975df2a00af39701eafbac4d47 diff --git a/target-alpha/helper.c b/target-alpha/helper.c index 2ef6cbe2a4..a5c308859b 100644 --- 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; |