[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/25] target-s390x: Fix CPUState rework fallout
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 03/25] target-s390x: Fix CPUState rework fallout |
Date: |
Sat, 27 Jul 2013 00:05:28 +0200 |
From: Christian Borntraeger <address@hidden>
Commit f17ec444c3d39f76bcd8b71c2c05d5754bfe333e
exec: Change cpu_memory_rw_debug() argument to CPUState
missed to update s390x KVM code, breaking the build.
Let's fix it up.
Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-s390x/kvm.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 60e94f8..85f0112 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -345,12 +345,10 @@ void *kvm_arch_ram_alloc(ram_addr_t size)
int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
{
- S390CPU *cpu = S390_CPU(cs);
- CPUS390XState *env = &cpu->env;
static const uint8_t diag_501[] = {0x83, 0x24, 0x05, 0x01};
- if (cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&bp->saved_insn, 4, 0) ||
- cpu_memory_rw_debug(env, bp->pc, (uint8_t *)diag_501, 4, 1)) {
+ if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4, 0) ||
+ cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)diag_501, 4, 1)) {
return -EINVAL;
}
return 0;
@@ -358,16 +356,14 @@ int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct
kvm_sw_breakpoint *bp)
int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
{
- S390CPU *cpu = S390_CPU(cs);
- CPUS390XState *env = &cpu->env;
uint8_t t[4];
static const uint8_t diag_501[] = {0x83, 0x24, 0x05, 0x01};
- if (cpu_memory_rw_debug(env, bp->pc, t, 4, 0)) {
+ if (cpu_memory_rw_debug(cs, bp->pc, t, 4, 0)) {
return -EINVAL;
} else if (memcmp(t, diag_501, 4)) {
return -EINVAL;
- } else if (cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&bp->saved_insn, 1,
1)) {
+ } else if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 1,
1)) {
return -EINVAL;
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/25] QOM CPUState patch queue 2013-07-26, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 01/25] linux-user: Avoid redundant ENV_GET_CPU(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 03/25] target-s390x: Fix CPUState rework fallout,
Andreas Färber <=
- [Qemu-devel] [PULL 02/25] kvm: Change prototype of kvm_update_guest_debug(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 04/25] target-xtensa: Introduce XtensaCPU subclasses, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 06/25] gdbstub: Drop dead code in cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 09/25] target-ppc: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 05/25] gdbstub: Fix cpu_gdb_{read, write}_register() Coding Style, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 12/25] target-m68k: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 08/25] target-i386: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 11/25] target-arm: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 07/25] cpu: Introduce CPUState::gdb_num_regs and CPUClass::gdb_num_core_regs, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 14/25] target-openrisc: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26