From patchwork Wed Oct 31 09:49:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 195804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D36E2C00C1 for ; Wed, 31 Oct 2012 20:49:20 +1100 (EST) Received: from localhost ([::1]:49976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTUvG-00081Z-Ha for incoming@patchwork.ozlabs.org; Wed, 31 Oct 2012 05:49:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTUv9-000812-OB for qemu-devel@nongnu.org; Wed, 31 Oct 2012 05:49:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTUv4-0005ud-Ur for qemu-devel@nongnu.org; Wed, 31 Oct 2012 05:49:11 -0400 Received: from david.siemens.de ([192.35.17.14]:16352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTUv4-0005uB-L9 for qemu-devel@nongnu.org; Wed, 31 Oct 2012 05:49:06 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id q9V9n2JA028821; Wed, 31 Oct 2012 10:49:03 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q9V9n2Z4018162; Wed, 31 Oct 2012 10:49:02 +0100 Message-ID: <5090F40E.3030409@siemens.com> Date: Wed, 31 Oct 2012 10:49:02 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Subject: [Qemu-devel] [PATCH] memory: Don't dump disabled regions 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This makes "info mtree" output readable again. Signed-off-by: Jan Kiszka --- memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/memory.c b/memory.c index 243cb23..d5150f8 100644 --- a/memory.c +++ b/memory.c @@ -1590,7 +1590,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f, const MemoryRegion *submr; unsigned int i; - if (!mr) { + if (!mr || !mr->enabled) { return; }