From patchwork Wed Apr 11 20:55:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 151880 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 87AF6B7076 for ; Thu, 12 Apr 2012 06:55:46 +1000 (EST) Received: from localhost ([::1]:47647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI4Zs-00077n-EF for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 16:55:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI4Zg-0006xo-Bd for qemu-devel@nongnu.org; Wed, 11 Apr 2012 16:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI4Ze-0000lp-95 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 16:55:31 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:33981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI4Ze-0000jq-2t for qemu-devel@nongnu.org; Wed, 11 Apr 2012 16:55:30 -0400 Received: by iafj26 with SMTP id j26so1987491iaf.4 for ; Wed, 11 Apr 2012 13:55:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=kWnBRvJETfctwM+mRgr8yquzGLyzDM9rvs9ScnK2B0A=; b=XLEAu7OEkqdL3v1dgw2YXsETBCmA5Px41KrSCuJBGKA3bXGEs9IPnthbUFSs462fiD SctvUezcVti4CA/qv2O7cBLlaZrXssRoxBs78wBDdvSqYGlE26DAxWgPjO3zMeNkaJw2 Vp4i/A/8AxNDSbwexvG4U8jrUy25Otwx8kN5cRS6zbXZIWvFs5O1mie8AYo6Y5rohSAG 6gWmZoPpXn0+0XT19D+DpnouYKcDSJrHtJ75lpTyyDuKXjG3N08TdEVEBNgAQhFPgmGQ EiP0Dd/qZHswi6AAWhP6ZotI27OZ3jHnyKwgqlSjuldWAHnB2ppc+OkaSaVZZrOFy6y9 tFaA== MIME-Version: 1.0 Received: by 10.50.42.132 with SMTP id o4mr7072651igl.41.1334177727897; Wed, 11 Apr 2012 13:55:27 -0700 (PDT) Received: by 10.50.100.198 with HTTP; Wed, 11 Apr 2012 13:55:27 -0700 (PDT) In-Reply-To: <4F85DA3F.5040103@comstyle.com> References: <4F85DA3F.5040103@comstyle.com> Date: Wed, 11 Apr 2012 21:55:27 +0100 Message-ID: From: Peter Maydell To: Brad Smith X-Gm-Message-State: ALoCoQkN9E7NnndNl4qCDcQm8GXvHVtFcIal50YRDglo6aZz0Tq+CJTc6iDEd1dMYewzF+sBTsxR X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.173 Cc: Riku Voipio , Alexander Graf , qemu-devel Subject: Re: [Qemu-devel] Build broken -- linux-user: take RESERVED_VA into account for g2h_valid() 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 On 11 April 2012 20:23, Brad Smith wrote: > The following commit broke the build.. > > linux-user: take RESERVED_VA into account for g2h_valid() Whoops. bsd-user is a bit unloved, I'm afraid. Can you try the following one-line fix? If it works then I'll submit it to the mailing list as a proper patch. ===endit=== I think we've broken darwin-user as well, but that is even less loved and there was a discussion on IRC a while back about simply removing it. -- PMM ===begin=== diff --git a/bsd-user/main.c b/bsd-user/main.c index 48cb715..0689e38 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -41,6 +41,7 @@ int singlestep; unsigned long mmap_min_addr; unsigned long guest_base; int have_guest_base; +unsigned long reserved_va; #endif static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX;