accel/hvf: Widen pc/saved_insn for hvf_sw_breakpoint

Widens the pc and saved_insn fields of hvf_sw_breakpoint from
target_ulong to vaddr. Other hvf_* functions accessing hvf_sw_breakpoint
are also widened to match.

Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230807155706.9580-3-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Anton Johansson 2023-08-07 17:56:59 +02:00 committed by Richard Henderson
parent b67be03e3a
commit fcfe761680
3 changed files with 6 additions and 6 deletions

View File

@ -474,7 +474,7 @@ static void hvf_start_vcpu_thread(CPUState *cpu)
cpu, QEMU_THREAD_JOINABLE); cpu, QEMU_THREAD_JOINABLE);
} }
static int hvf_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len) static int hvf_insert_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)
{ {
struct hvf_sw_breakpoint *bp; struct hvf_sw_breakpoint *bp;
int err; int err;
@ -512,7 +512,7 @@ static int hvf_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr le
return 0; return 0;
} }
static int hvf_remove_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len) static int hvf_remove_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)
{ {
struct hvf_sw_breakpoint *bp; struct hvf_sw_breakpoint *bp;
int err; int err;

View File

@ -51,7 +51,7 @@ void assert_hvf_ok(hv_return_t ret)
abort(); abort();
} }
struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu, target_ulong pc) struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu, vaddr pc)
{ {
struct hvf_sw_breakpoint *bp; struct hvf_sw_breakpoint *bp;

View File

@ -39,14 +39,14 @@ DECLARE_INSTANCE_CHECKER(HVFState, HVF_STATE,
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
struct hvf_sw_breakpoint { struct hvf_sw_breakpoint {
target_ulong pc; vaddr pc;
target_ulong saved_insn; vaddr saved_insn;
int use_count; int use_count;
QTAILQ_ENTRY(hvf_sw_breakpoint) entry; QTAILQ_ENTRY(hvf_sw_breakpoint) entry;
}; };
struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu, struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu,
target_ulong pc); vaddr pc);
int hvf_sw_breakpoints_active(CPUState *cpu); int hvf_sw_breakpoints_active(CPUState *cpu);
int hvf_arch_insert_sw_breakpoint(CPUState *cpu, struct hvf_sw_breakpoint *bp); int hvf_arch_insert_sw_breakpoint(CPUState *cpu, struct hvf_sw_breakpoint *bp);