From patchwork Fri Jun 17 16:33:46 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: 70367 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp396099qgy; Fri, 17 Jun 2016 10:35:22 -0700 (PDT) X-Received: by 10.200.40.181 with SMTP id i50mr3685253qti.89.1466184922872; Fri, 17 Jun 2016 10:35:22 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id s4si883441qge.8.2016.06.17.10.35.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 17 Jun 2016 10:35:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; 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 208.118.235.17 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]:59320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDxfu-0005A8-FM for patch@linaro.org; Fri, 17 Jun 2016 13:35:22 -0400 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) 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=XWw3dN2+gMaeeaGvTByZzBwttVh7Bl0mXnOefPNXzsk=; b=ClzEmIlui6ziz1iJYG6J2sdIu/W9QH5GNij9uwuAr4GQNKkC/qIMKcRQKrxZ8ltLBB 3U0QuHmL2gPkU88fKFxuPkfBGycLSoIZ1UPs7MfPVQEe0nllcZhUsc+w7at6sZPQOAlZ CIT5wa3wZts4stoy4XJmIg74t8GcOtr2GwJHQ= 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=XWw3dN2+gMaeeaGvTByZzBwttVh7Bl0mXnOefPNXzsk=; b=D8/PjdfNWYv4GiquZmSibUrxHdCIcqv5ftqFOBjZPPUj74UN+SKmeMA4C9fw1aK6KY Y9KZWk6LC9KCHe5TyehpOHOO1p4Jcvf1apA8QbdS6Ytcfks9+7Gvg/pDKeQ57hZM/Zwy TmwrEYHpakR1joQwOubkyE+pn+WhTKPL2ZuofRtTRedU2YttnuVMVSCAaGBSv8tJ1qQf 1iajctz3arUjGWGxsscGbOXaCfJttmNe/HlvPtnnwTiniI3v1Le4Gwvyt2ep2ngfTw1H JlIlEMvLvpBhr10Gty7QrjkyrpiPyBj4o9FqPKZ7hBmaOvm07vsIaVOkbvfU9gOzfco8 +hNw== X-Gm-Message-State: ALyK8tK3I/Ib/mNXtl7cEWIyNXFOGXW6a0rjttTOYnD2heGqe4jioE8tqAVeXzziurgk3vIt X-Received: by 10.194.82.36 with SMTP id f4mr3245161wjy.104.1466181242888; Fri, 17 Jun 2016 09:34:02 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v70sm146420wmf.18.2016.06.17.09.33.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 09:33:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 22A8B3E0BB5; Fri, 17 Jun 2016 17:33:59 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= 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 Date: Fri, 17 Jun 2016 17:33:46 +0100 Message-Id: <1466181227-14934-7-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [RFC 6/7] linux-user: don't clone watchpoints 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: peter.maydell@linaro.org, claudio.fontana@huawei.com, Riku Voipio , mark.burton@greensocs.com, jan.kiszka@siemens.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , rth@twiddle.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.7.4 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; }