diff mbox

[PULL,01/50] kvm-all: don't use stale dbg_data->cpu

Message ID 1477316855-42218-2-git-send-email-pbonzini@redhat.com
State Accepted
Commit 3c0ed2a342e5acb97bdd2c7b64d33a904ad75940
Headers show

Commit Message

Paolo Bonzini Oct. 24, 2016, 1:46 p.m. UTC 
From: Alex Bennée <alex.bennee@linaro.org>


The changes to run_on_cpu and friends mean that all helpers are passed
the CPUState of vCPU they are running on. The conversion missed the
field in commit e0eeb4a21a3ca4b296220ce4449d8acef9de9049 which
introduced bugs.

Reported-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Tested-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20161010154625.14881-1-alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

---
 kvm-all.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
1.8.3.1
diff mbox

Patch

diff --git a/kvm-all.c b/kvm-all.c
index efb5fe3..3dcce16 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -2215,15 +2215,14 @@  int kvm_sw_breakpoints_active(CPUState *cpu)
 
 struct kvm_set_guest_debug_data {
     struct kvm_guest_debug dbg;
-    CPUState *cpu;
     int err;
 };
 
-static void kvm_invoke_set_guest_debug(CPUState *unused_cpu, void *data)
+static void kvm_invoke_set_guest_debug(CPUState *cpu, void *data)
 {
     struct kvm_set_guest_debug_data *dbg_data = data;
 
-    dbg_data->err = kvm_vcpu_ioctl(dbg_data->cpu, KVM_SET_GUEST_DEBUG,
+    dbg_data->err = kvm_vcpu_ioctl(cpu, KVM_SET_GUEST_DEBUG,
                                    &dbg_data->dbg);
 }