From patchwork Tue Jan 20 15:45:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 43392 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F3786218DB for ; Tue, 20 Jan 2015 15:49:16 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id hs14sf20743839lab.1 for ; Tue, 20 Jan 2015 07:49:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding :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=+oLpqtGZrWEfMAwQvpG1p1WzuNR0yuHtHpUbLNSlfdo=; b=Z1r2zqw+5hqqd0c/9i9tzWhipOxqY1ABqvxAbgiTHCzxTmSnojZBb14OvSGsjKYg+5 atstOAANvMWfpAOuRlBYvRAVkf/VpAsTjajDs/+HvPOqcTH4rbMDwBuOMsC/P7iyYrU6 saA8hQv6xEAzR3JT3ovj7u7nMLYlUL6eEVcFGiXxyv7rHobJda57+5DiIO2b8D/Z8D3e WUZY/plyoyxVT2UYKwUldmSMQ55wCNQEKGTw5Hpo7yWJ0pkGzK55s0VPSvP21ThEarA6 1JrS67hNvJKvFOI8nlzP0rsvIX8TcejejDqhPWdVRSOErP1d33JWACbOUxECPhxa4KrX e9SQ== X-Gm-Message-State: ALoCoQn7OJZKwgPzmcgsPFtJnu2ju0FmuyNz75RMvwDyuGniqubtCnxqpnfCl7roPbcbF3na/4HZ X-Received: by 10.112.37.72 with SMTP id w8mr1656631lbj.6.1421768955985; Tue, 20 Jan 2015 07:49:15 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.131 with SMTP id t3ls702199lag.44.gmail; Tue, 20 Jan 2015 07:49:15 -0800 (PST) X-Received: by 10.112.14.134 with SMTP id p6mr39967284lbc.36.1421768955781; Tue, 20 Jan 2015 07:49:15 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id lf5si15575238lbc.46.2015.01.20.07.49.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 07:49:15 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id p9so10942796lbv.8 for ; Tue, 20 Jan 2015 07:49:15 -0800 (PST) X-Received: by 10.112.14.6 with SMTP id l6mr39529272lbc.91.1421768955598; Tue, 20 Jan 2015 07:49:15 -0800 (PST) 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.9.200 with SMTP id c8csp1461681lbb; Tue, 20 Jan 2015 07:49:14 -0800 (PST) X-Received: by 10.224.120.65 with SMTP id c1mr59756595qar.87.1421768954309; Tue, 20 Jan 2015 07:49:14 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j4si664249qcz.22.2015.01.20.07.49.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 20 Jan 2015 07:49:14 -0800 (PST) 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]:44124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDb3J-0001LU-Ar for patch@linaro.org; Tue, 20 Jan 2015 10:49:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDb0C-0004kW-D6 for qemu-devel@nongnu.org; Tue, 20 Jan 2015 10:46:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDb0B-0007WB-B2 for qemu-devel@nongnu.org; Tue, 20 Jan 2015 10:46:00 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDb0B-0007MQ-54 for qemu-devel@nongnu.org; Tue, 20 Jan 2015 10:45:59 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YDazz-0004Uq-Hb for qemu-devel@nongnu.org; Tue, 20 Jan 2015 15:45:47 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 20 Jan 2015 15:45:33 +0000 Message-Id: <1421768747-17240-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1421768747-17240-1-git-send-email-peter.maydell@linaro.org> References: <1421768747-17240-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 04/18] monitor.c: Use ld*_p() instead of ld*_raw() 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.177 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 The monitor code for doing a memory_dump() was using ld*_raw() to do target-CPU accesses out of a local buf[] array. The correct functions for this purpose are ld*_p(), which take a host pointer, rather than ld*_raw(), which take an integer representing a guest address and are somewhat meaningless in softmmu configurations. Nobody noticed because for softmmu the _raw functions are the same as ldl_p but with some extra casts thrown in. Switch to using the correct functions instead. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Paolo Bonzini Reviewed-by: Alex Bennée Message-id: 1421334118-3287-3-git-send-email-peter.maydell@linaro.org --- monitor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index 1808e41..7e4f605 100644 --- a/monitor.c +++ b/monitor.c @@ -1292,16 +1292,16 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, switch(wsize) { default: case 1: - v = ldub_raw(buf + i); + v = ldub_p(buf + i); break; case 2: - v = lduw_raw(buf + i); + v = lduw_p(buf + i); break; case 4: - v = (uint32_t)ldl_raw(buf + i); + v = (uint32_t)ldl_p(buf + i); break; case 8: - v = ldq_raw(buf + i); + v = ldq_p(buf + i); break; } monitor_printf(mon, " ");