summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-12-17 08:02:44 +0100
committerAndreas Färber <afaerber@suse.de>2013-02-16 14:51:00 +0100
commitfcd7d0034b7eddba505a548f456f452bf5a7d56c (patch)
treefef2f0c973e60467b4debfac984cd4bd6f8061c3 /hw
parent0315c31cda054775585b31f8cb3c9228cc6fc28b (diff)
downloadqemu-fcd7d0034b7eddba505a548f456f452bf5a7d56c.tar.gz
cpu: Move exit_request field to CPUState
Since it was located before breakpoints field, it needs to be reset. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw')
-rw-r--r--hw/spapr_hcall.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 2889742788..af1db6ea08 100644
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -513,13 +513,14 @@ static target_ulong h_cede(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args)
{
CPUPPCState *env = &cpu->env;
+ CPUState *cs = CPU(cpu);
env->msr |= (1ULL << MSR_EE);
hreg_compute_hflags(env);
- if (!cpu_has_work(CPU(cpu))) {
+ if (!cpu_has_work(cs)) {
env->halted = 1;
env->exception_index = EXCP_HLT;
- env->exit_request = 1;
+ cs->exit_request = 1;
}
return H_SUCCESS;
}