From patchwork Thu Mar 25 21:14:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Lock X-Patchwork-Id: 48603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 148E1B7CEE for ; Fri, 26 Mar 2010 09:27:38 +1100 (EST) Received: from localhost ([127.0.0.1]:34652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuvV8-0007E9-66 for incoming@patchwork.ozlabs.org; Thu, 25 Mar 2010 18:26:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuuoN-0006Lu-P6 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:55 -0400 Received: from [140.186.70.92] (port=42692 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuuoI-0006Hb-DE for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuuoF-0005xH-V8 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:50 -0400 Received: from gelbbaer.kn-bremen.de ([78.46.108.116]:41693 helo=smtp.kn-bremen.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuuoF-0005ww-OO for qemu-devel@nongnu.org; Thu, 25 Mar 2010 17:41:47 -0400 Received: by smtp.kn-bremen.de (Postfix, from userid 10) id 5A5E11E0016B; Thu, 25 Mar 2010 22:41:46 +0100 (CET) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.3/8.14.3) with ESMTP id o2PLELPS052722 for ; Thu, 25 Mar 2010 22:14:21 +0100 (CET) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.3/8.14.3/Submit) id o2PLEL92052721 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 22:14:21 +0100 (CET) (envelope-from nox) From: Juergen Lock Date: Thu, 25 Mar 2010 22:14:21 +0100 To: qemu-devel@nongnu.org Message-ID: <20100325211421.GA52572@triton8.kn-bremen.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] Avoid page_set_flags() assert in qemu-user host page protection code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juergen Lock --- a/exec.c +++ b/exec.c @@ -293,10 +293,13 @@ static void page_init(void) if (h2g_valid(endaddr)) { endaddr = h2g(endaddr); + page_set_flags(startaddr, endaddr, PAGE_RESERVED); } else { +#if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS endaddr = ~0ul; + page_set_flags(startaddr, endaddr, PAGE_RESERVED); +#endif } - page_set_flags(startaddr, endaddr, PAGE_RESERVED); } } while (!feof(f));