diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 15:43:31 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:45 +0200 |
| commit | b7e516ce04fecf260e7c0893b0afb3ff24a40358 (patch) | |
| tree | 58ace85bf3626bc9738745d115591928638ac83f /target-s390x/helper.c | |
| parent | ff18b7625f5f36ac19b69ed5f0f946093a407174 (diff) | |
| download | qemu-b7e516ce04fecf260e7c0893b0afb3ff24a40358.zip qemu-b7e516ce04fecf260e7c0893b0afb3ff24a40358.tar.gz qemu-b7e516ce04fecf260e7c0893b0afb3ff24a40358.tar.bz2 | |
Kill off cpu_state_reset()
In commit 1bba0dc932e8826a7d030df3767daf0bc339f9a2 cpu_reset()
was renamed to cpu_state_reset(), to allow introducing a new cpu_reset()
that would operate on QOM objects.
All callers have been updated except for one in target-mips, so drop all
implementations except for the one in target-mips and move the
declaration there until MIPSCPU reset can be fully QOM'ified.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc> (for lm32)
Acked-by: Max Filippov <jcmvbkbc@gmail.com> (for xtensa)
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> (for mb + cris)
Acked-by: Alexander Graf <agraf@suse.de> (for ppc)
Acked-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-s390x/helper.c')
| -rw-r--r-- | target-s390x/helper.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 209a696..a34a35b 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -106,14 +106,7 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong address, int rw return 1; } -#endif /* CONFIG_USER_ONLY */ - -void cpu_state_reset(CPUS390XState *env) -{ - cpu_reset(ENV_GET_CPU(env)); -} - -#ifndef CONFIG_USER_ONLY +#else /* !CONFIG_USER_ONLY */ /* Ensure to exit the TB after this call! */ static void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilc) |