From patchwork Fri Sep 12 13:23:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 37310 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC61020F2E for ; Fri, 12 Sep 2014 13:29:38 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id x12sf490571wgg.2 for ; Fri, 12 Sep 2014 06:29:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=HRXXPmJc/q8xNZXwH+zwsPOz3+AwnSw5xNaxQIPlcUI=; b=gF2ilpiYsFZQMfCkhV0LPPErnqtYfit8m4Bn9K0MpnJfvbu+cmJrA6crIhkiwf910i RTUhr9epzYXa+sor1RpS47mYeUYQCQcbyoL45hrkqgRDdHeRWdx8mbL1mTC7wobZb8w9 SVjU1a+BnGd+fg+2HaFullwujMcY8x0dByAf5jxyxLYbX3QIMJ5Zjl6lGiDLj70OPNQS nGp+WxFmgdzR2lMoi2RC/L3RuUG4RbLfE0u8G5kG8duACTHECeNcFHCRPIJZ+oU9O+Cq qxQnxLanD0gNLEetxthFrwYWF+oLMaWw51ypRF//Z/W2FEzYCf3XZ9ZsAhlT8g1atsoQ Cxqw== X-Gm-Message-State: ALoCoQmTAyUR7BL80uoJxtm2uSSG2AGSAtDVPX89HgR3OX70MQwIL7D2Umz2Ge4zPjP8fF5cBNEW X-Received: by 10.180.74.137 with SMTP id t9mr653604wiv.1.1410528575716; Fri, 12 Sep 2014 06:29:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.195 with SMTP id g3ls180594lam.59.gmail; Fri, 12 Sep 2014 06:29:35 -0700 (PDT) X-Received: by 10.152.21.42 with SMTP id s10mr9044439lae.61.1410528575564; Fri, 12 Sep 2014 06:29:35 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id w5si6580996lae.42.2014.09.12.06.29.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Sep 2014 06:29:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id p9so880848lbv.38 for ; Fri, 12 Sep 2014 06:29:35 -0700 (PDT) X-Received: by 10.112.76.6 with SMTP id g6mr8651234lbw.22.1410528575460; Fri, 12 Sep 2014 06:29:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.141.42 with SMTP id rl10csp731575lbb; Fri, 12 Sep 2014 06:29:34 -0700 (PDT) X-Received: by 10.224.162.196 with SMTP id w4mr11664369qax.60.1410528574181; Fri, 12 Sep 2014 06:29:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o106si5607075qgd.76.2014.09.12.06.29.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 06:29:34 -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; Received: from localhost ([::1]:44947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQur-0007BT-7f for patch@linaro.org; Fri, 12 Sep 2014 09:29:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQpa-0006q5-Oa for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:24:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSQpS-0003zX-DN for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:24:06 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQpS-0003xI-6c for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:23:58 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XSQpO-0003XZ-Ry for qemu-devel@nongnu.org; Fri, 12 Sep 2014 14:23:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 12 Sep 2014 14:23:39 +0100 Message-Id: <1410528234-13545-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1410528234-13545-1-git-send-email-peter.maydell@linaro.org> References: <1410528234-13545-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Subject: [Qemu-devel] [PULL 08/23] exec.c: Provide full set of dummy wp remove functions in user-mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 We already provide dummy versions of the cpu_watchpoint_insert and cpu_watchpoint_remove_all functions when CONFIG_USER_ONLY is defined. Complete the set by providing cpu_watchpoint_remove and cpu_watchpoint_remove_by_ref as well. This allows target-* code using these functions to avoid some ifdeffery. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- exec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/exec.c b/exec.c index f3e7fb6..181ade0 100644 --- a/exec.c +++ b/exec.c @@ -572,6 +572,16 @@ void cpu_watchpoint_remove_all(CPUState *cpu, int mask) { } +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, + int flags) +{ + return -ENOSYS; +} + +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint) +{ +} + int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, int flags, CPUWatchpoint **watchpoint) {