diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-27 05:17:50 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-09 21:20:28 +0200 |
| commit | 4917cf44326a1bda2fd7f27303aff7a25ad86518 (patch) | |
| tree | d9c153504b0806990d0c5646c886e16150835d1a /memory.c | |
| parent | 80b7cd735417b0883a026d79a513629a2817cdb4 (diff) | |
| download | qemu-4917cf44326a1bda2fd7f27303aff7a25ad86518.zip qemu-4917cf44326a1bda2fd7f27303aff7a25ad86518.tar.gz qemu-4917cf44326a1bda2fd7f27303aff7a25ad86518.tar.bz2 | |
cpu: Replace cpu_single_env with CPUState current_cpu
Move it to qom/cpu.h.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'memory.c')
| -rw-r--r-- | memory.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -838,9 +838,8 @@ static uint64_t unassigned_mem_read(void *opaque, hwaddr addr, #ifdef DEBUG_UNASSIGNED printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); #endif - if (cpu_single_env != NULL) { - cpu_unassigned_access(ENV_GET_CPU(cpu_single_env), - addr, false, false, 0, size); + if (current_cpu != NULL) { + cpu_unassigned_access(current_cpu, addr, false, false, 0, size); } return 0; } @@ -851,9 +850,8 @@ static void unassigned_mem_write(void *opaque, hwaddr addr, #ifdef DEBUG_UNASSIGNED printf("Unassigned mem write " TARGET_FMT_plx " = 0x%"PRIx64"\n", addr, val); #endif - if (cpu_single_env != NULL) { - cpu_unassigned_access(ENV_GET_CPU(cpu_single_env), - addr, true, false, 0, size); + if (current_cpu != NULL) { + cpu_unassigned_access(current_cpu, addr, true, false, 0, size); } } |