From patchwork Fri Dec 14 14:41:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 153868 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2161227ljp; Fri, 14 Dec 2018 06:51:37 -0800 (PST) X-Google-Smtp-Source: AFSGD/XcWQJp7DZyt5R7Ce/rcMimf82HIxNek2letiiCxQ+vZRbnxJoi9D7mS6EtncdBAfkz7PLF X-Received: by 2002:a37:96c2:: with SMTP id y185mr2677918qkd.239.1544799097323; Fri, 14 Dec 2018 06:51:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544799097; cv=none; d=google.com; s=arc-20160816; b=BD4U75jL7EEqKrBDo9D8VXPnWcpAt4im1Armw/CUYUZekj2MQvGj1rrWn/59h++hbb 1tQwlQWMWU+sMqO3Fm0Qd06SEV3TEUUWKp4WVJx4OCRVZ8uRu40a8+KECUBhlsJ6Yihc q3XWpUKG8Xt8hu1HfhWreO5jSe+lf68uoE77egHfFPDtED96BW/phjzCuE9WWbD0Opml k7CBskLB+O9xl8+EAKRtNebHJaqv3HbhIJX8uvOgJNn0ZluM52G/zTN7l8HnIcVqvFNu ZiiBfBBi8Zw0DJdsG0vWigHGitzRdw7kDnquti5O48p/7UMbC/Mq2rR+/STs/icccikK Ddwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=I43XNazY9HryD/pAJPyLhN5QfEXlLPmQ7rLM2tmpOwI=; b=T+ftqlKw/MWK9ILhkh0Vr0kvgBqE7bg+rynCxgUtYOV+wlAqOyXExkZbW0S9wxUK9w RmNlPqk7AFpjprhy7ySyf7DfUExBXMjJ3thGnpiWAFAnzRGkToOKVG/2POkBCfiuSfcn JvyymoCaNECANJIo51dhbPEsl12HGCFZIKyxmeDQnzGGGATcDbUP/J25eKENYuxIhBiY WrQm+V1WxIfsWxIALENE8yEavExLNvQlcHraPHjLG2Xm8ZnPx0eZGHeBGsJe+WYsFLzw gpU2vk4so6MOgRCeOSqyTPifyBn/Gmbo7Iwl6ObLyCO+WWNWiKLaZgnIsOMZrsrYGi6U 4+mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ODUZzrB/"; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 99si3036662qta.389.2018.12.14.06.51.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:51:37 -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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ODUZzrB/"; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXooS-0007jv-Kd for patch@linaro.org; Fri, 14 Dec 2018 09:51:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXofZ-0008ND-N0 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXofY-0004IS-Nf for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:25 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:38704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXofY-0004HW-HE for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:24 -0500 Received: by mail-wr1-x429.google.com with SMTP id v13so5670094wrw.5 for ; Fri, 14 Dec 2018 06:42:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=I43XNazY9HryD/pAJPyLhN5QfEXlLPmQ7rLM2tmpOwI=; b=ODUZzrB/ETVbjAJVI805PA/kBAMgf4TZcS3s8UDu9knswDeiQZJhv6uPCsENiEIxBr Bd523fTGtbWh3zTEurTizLjGZNJoy47XSIqxmef4cJueoS9sE46IZQV8TlXws9zh7jM1 32sAxTJc3DYTkITXgvpam9ZZAGvfr/4cSplrQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I43XNazY9HryD/pAJPyLhN5QfEXlLPmQ7rLM2tmpOwI=; b=P0z57Y6bZE6eGoNPd02LMueQB58rxUrv6vPYPVIqSsncbvEI1Ib5PaPUpSTyoKrE4V EMckciKYQ8QkV12PUsOeG2PHAHGvlAcLeBX2riNEO2r1f66+iK2HaZeRNWSYKsvAMsir 1Sg2FXYBCUfo82cBZ4ncS151Ir+d88nOItt6Z5Y7ULeM0xYujPua+UwqTiQhloBfCIeb pQ3S1qd+7vlZZ5aIbJc8+pub+U120ZnNQFdMa20Yajy/lVLyjZ48gjRlXUd2LlYbdnNa s7co7piBfCv8kyp7Zdj7K+BTkaA9dB3ghsLHBrzyAK4xXOwz8Xs0POX7wOPReqzmIpjS PVkw== X-Gm-Message-State: AA+aEWYcnHXatqktXVDzbeyb9+yYSf9J2Adxbmtm6TUEk3fv++1B7kDB 9rzQJXalCZ4TRbSQP9XgvuNjORESYAY= X-Received: by 2002:adf:fa90:: with SMTP id h16mr3045066wrr.326.1544798543064; Fri, 14 Dec 2018 06:42:23 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m6sm3263204wrv.24.2018.12.14.06.42.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:42:22 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 14:41:57 +0000 Message-Id: <20181214144214.1260-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214144214.1260-1-peter.maydell@linaro.org> References: <20181214144214.1260-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 05/22] monitor: Use address_space_read() to read memory 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently monitor.c reads physical memory using cpu_physical_memory_read(). This effectively hard-codes assuming that all CPUs have the same view of physical memory. Switch to address_space_read() instead, which lets us use the AddressSpace for the CPU we're reading memory for (falling back to address_space_memory if there is no CPU, as happens with the "none" board). As a bonus, this allows us to detect failures to read memory. Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daudé Message-id: 20181122172653.3413-3-peter.maydell@linaro.org --- monitor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.19.2 diff --git a/monitor.c b/monitor.c index 6e81b09294e..4c8d8c2a5a0 100644 --- a/monitor.c +++ b/monitor.c @@ -1605,7 +1605,13 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, if (l > line_size) l = line_size; if (is_physical) { - cpu_physical_memory_read(addr, buf, l); + AddressSpace *as = cs ? cs->as : &address_space_memory; + MemTxResult r = address_space_read(as, addr, + MEMTXATTRS_UNSPECIFIED, buf, l); + if (r != MEMTX_OK) { + monitor_printf(mon, " Cannot access memory\n"); + break; + } } else { if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) { monitor_printf(mon, " Cannot access memory\n");