From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btcmp-0006CR-Pw for qemu-devel@nongnu.org; Mon, 10 Oct 2016 11:46:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btcmm-0000U5-FC for qemu-devel@nongnu.org; Mon, 10 Oct 2016 11:46:43 -0400 Received: from mail-qt0-x235.google.com ([2607:f8b0:400d:c0d::235]:34985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btcmm-0000Tt-9x for qemu-devel@nongnu.org; Mon, 10 Oct 2016 11:46:40 -0400 Received: by mail-qt0-x235.google.com with SMTP id f6so60167747qtd.2 for ; Mon, 10 Oct 2016 08:46:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Mon, 10 Oct 2016 16:46:25 +0100 Message-Id: <20161010154625.14881-1-alex.bennee@linaro.org> In-Reply-To: <133a4c1d-d029-0bc2-d538-4e5c8e3dac1b@redhat.com> References: <133a4c1d-d029-0bc2-d538-4e5c8e3dac1b@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] kvm-all: don't use stale dbg_data->cpu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, borntraeger@de.ibm.com, imbrenda@linux.vnet.ibm.com Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , "open list:Overall" 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 Signed-off-by: Alex Bennée --- kvm-all.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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); } -- 2.9.3