mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-23 19:34:41 +00:00
kvm-all: Use 'tmpcpu' instead of 'cpu' in sub-looping to avoid 'cpu' be NULL
If kvm_arch_remove_sw_breakpoint() in CPU_FOREACH() always be fail, it will let 'cpu' NULL. And the next kvm_arch_remove_sw_breakpoint() in QTAILQ_FOREACH_SAFE() will get NULL parameter for 'cpu'. And kvm_arch_remove_sw_breakpoint() can assumes 'cpu' must never be NULL, so need define additional temporary variable for 'cpu' to avoid the case. Cc: qemu-stable@nongnu.org Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6886867e98
commit
dc54e25253
|
@ -2077,12 +2077,13 @@ void kvm_remove_all_breakpoints(CPUState *cpu)
|
||||||
{
|
{
|
||||||
struct kvm_sw_breakpoint *bp, *next;
|
struct kvm_sw_breakpoint *bp, *next;
|
||||||
KVMState *s = cpu->kvm_state;
|
KVMState *s = cpu->kvm_state;
|
||||||
|
CPUState *tmpcpu;
|
||||||
|
|
||||||
QTAILQ_FOREACH_SAFE(bp, &s->kvm_sw_breakpoints, entry, next) {
|
QTAILQ_FOREACH_SAFE(bp, &s->kvm_sw_breakpoints, entry, next) {
|
||||||
if (kvm_arch_remove_sw_breakpoint(cpu, bp) != 0) {
|
if (kvm_arch_remove_sw_breakpoint(cpu, bp) != 0) {
|
||||||
/* Try harder to find a CPU that currently sees the breakpoint. */
|
/* Try harder to find a CPU that currently sees the breakpoint. */
|
||||||
CPU_FOREACH(cpu) {
|
CPU_FOREACH(tmpcpu) {
|
||||||
if (kvm_arch_remove_sw_breakpoint(cpu, bp) == 0) {
|
if (kvm_arch_remove_sw_breakpoint(tmpcpu, bp) == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue