diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-01 09:06:23 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-01 09:06:23 -0600 |
| commit | e205842bd91fbd15655ff40a4282b1ffcbc301b1 (patch) | |
| tree | b4f3f0b8d149afa34c280a89c5f9ad2722530983 /target-s390x/cpu.c | |
| parent | fabb60424d68b7c3af1be447a1f48c5b9ffe5123 (diff) | |
| parent | 49e158785fa86f04e2d4027dd19719d8b79a4421 (diff) | |
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
# By Andreas Färber
# Via Alexander Graf
* agraf/s390-for-upstream:
target-s390x: Pass S390CPU to s390_{add, del}_running_cpu()
target-s390x: Clean up cpu_inject_*() signatures
target-s390x: Fix debug output
target-s390x: Fix debug output (continued)
Diffstat (limited to 'target-s390x/cpu.c')
| -rw-r--r-- | target-s390x/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index a0c4479f39..d765e7b984 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -70,7 +70,7 @@ static void s390_cpu_reset(CPUState *s) log_cpu_state(env, 0); } - s390_del_running_cpu(env); + s390_del_running_cpu(cpu); scc->parent_reset(s); |