From patchwork Mon Oct 10 15:46:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 77445 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1257989qge; Mon, 10 Oct 2016 09:16:23 -0700 (PDT) X-Received: by 10.55.182.4 with SMTP id g4mr30460786qkf.120.1476116183729; Mon, 10 Oct 2016 09:16:23 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o1si16434137qkf.119.2016.10.10.09.16.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Oct 2016 09:16:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btdFW-0003cb-Kr for patch@linaro.org; Mon, 10 Oct 2016 12:16:22 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OV1imPe94Kh66MsBPdti8sCPeAkwXMEaus/5dKpx5WY=; b=CTN8PHqZhyqYhUVrNv05gcc57RI8rwOHfMfq3SfK8vWNDfNFZN/LqdAqSjMM0HOQ3C r6L6vEamYtDNabaK3wbyiXSMWJ5Bh0u+f/AkK7jIs6GlfzSss74fl9AjGhyrdPtV+hhO Bt/RLbI6wqxHiRaXDMrCBVcJbuOlHZxP6KT+o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OV1imPe94Kh66MsBPdti8sCPeAkwXMEaus/5dKpx5WY=; b=IrzKJ9bOU40tS2O0XskRvSgk4nmgkSgGU0uBAA5x7AkNJLdMIwsmAY0lyzT+RLlPgf Xzip3EFHmSBAKxrKQ2tAHdtBlwGbSFq8viH3BMTGBgZm/6bH1NQixu4n0DNtcH9Sy2M5 jBwVwJxr5wXu0qDt47l9wVEn/AvGVPDO2+olrL3cuCo0cT3tf2CyvEsOeXsgkFPU4MOE Gf+X87wlmr7c5LUypKPqOPSkrLNCVFjGygJ5Sdv2XR82kbChWMfvcuxQBqUC841ZRT4V xAJ5cc1yyZnQpbHVs+WXtmxIiMrF8GAGgmGTj8DGWWPXo9AaNfKNX7PdOqkHLrV9Hgl1 2ZGg== X-Gm-Message-State: AA6/9Rml3CW5idFGk0WucNAi+RLHt/lbJYhCqKqVBlSyonro2x/uAPNX0r7T5XrunNYPgc2Q X-Received: by 10.194.24.199 with SMTP id w7mr31806263wjf.197.1476114399194; Mon, 10 Oct 2016 08:46:39 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y2sm41051024wji.42.2016.10.10.08.46.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Oct 2016 08:46:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0D74E3E03E2; Mon, 10 Oct 2016 16:46:38 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: pbonzini@redhat.com, borntraeger@de.ibm.com, imbrenda@linux.vnet.ibm.com Date: Mon, 10 Oct 2016 16:46:25 +0100 Message-Id: <20161010154625.14881-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <133a4c1d-d029-0bc2-d538-4e5c8e3dac1b@redhat.com> References: <133a4c1d-d029-0bc2-d538-4e5c8e3dac1b@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::235 Subject: [Qemu-devel] [PATCH] kvm-all: don't use stale dbg_data->cpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, "open list:Overall" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.9.3 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); }