From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwia-0006FT-Ku for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:34:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDwiZ-0002us-NZ for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:34:04 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:35364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwiZ-0002ul-Gn for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:34:03 -0400 Received: by mail-wm0-x235.google.com with SMTP id v199so4790707wmv.0 for ; Fri, 17 Jun 2016 09:34:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 17 Jun 2016 17:33:46 +0100 Message-Id: <1466181227-14934-7-git-send-email-alex.bennee@linaro.org> In-Reply-To: <1466181227-14934-1-git-send-email-alex.bennee@linaro.org> References: <1466181227-14934-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC 6/7] linux-user: don't clone watchpoints List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, cota@braap.org, bobby.prani@gmail.com Cc: mark.burton@greensocs.com, pbonzini@redhat.com, jan.kiszka@siemens.com, rth@twiddle.net, peter.maydell@linaro.org, claudio.fontana@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Riku Voipio The watchpoint code is stubbed out for CONFIG_USER_ONLY so there is no point attempting to copy the data here. Lets remove the code before the RCU protection goes in. Signed-off-by: Alex Bennée --- linux-user/main.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 2901626..9a5d017 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3812,14 +3812,6 @@ CPUArchState *cpu_copy(CPUArchState *env) Note: Once we support ptrace with hw-debug register access, make sure BP_CPU break/watchpoints are handled correctly on clone. */ cpu_breakpoints_clone(cpu, new_cpu); - if (unlikely(cpu->watchpoints) && unlikely(cpu->watchpoints->len)) { - CPUWatchpoint *wp; - int i; - for (i = 0; i < cpu->watchpoints->len; i++) { - wp = &g_array_index(cpu->watchpoints, CPUWatchpoint, i); - cpu_watchpoint_insert(new_cpu, wp->vaddr, wp->len, wp->flags); - } - } return new_env; } -- 2.7.4