From patchwork Thu Apr 12 11:43:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 7761 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E0C7F23E12 for ; Thu, 12 Apr 2012 11:43:46 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9E0D7A185DB for ; Thu, 12 Apr 2012 11:43:46 +0000 (UTC) Received: by iage36 with SMTP id e36so3671579iag.11 for ; Thu, 12 Apr 2012 04:43:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=oT6yVhKQJS89pMqJ9XYlJi4dcmKtB/431mOpNwgf99M=; b=XjJ2N6MdU6qB/SQQOOJxk4rHqkd5nhrkuB22swTofmej2v5KrMdeBnWZM7tgU/nybL nlHa9UJjDGeg1GHScI5s9oDxBFXhKObLS4ZPksOscHEMthkbj3VRV+MhDfPt3SI9R2Us WV7Esruh1RT6kd5FMcKCoO1NPJ+k4N6HRVhEQGZ65fP8n2jCjQfDyB9rAiPM/MPHJxXF GFcTSXIpwlRFKP3ifgxZexQdKUMzwhhY0JdVYI8txypmQnxZpPbmmQLykrCsZ8p7pnw0 KUnwk0y5tSyI6EZJtb6Nk3+8VCBhlGeDQgLqxmP333jC50c2Xh0e7zj0jcPkl4iJkNTR gatQ== Received: by 10.50.187.226 with SMTP id fv2mr5722969igc.40.1334231026087; Thu, 12 Apr 2012 04:43:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.70.69 with SMTP id c5csp258979ibj; Thu, 12 Apr 2012 04:43:45 -0700 (PDT) Received: by 10.180.20.175 with SMTP id o15mr15076634wie.6.1334231024829; Thu, 12 Apr 2012 04:43:44 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id o58si5825942weq.46.2012.04.12.04.43.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Apr 2012 04:43:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SIIRB-0006jz-Df; Thu, 12 Apr 2012 12:43:41 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Brad Smith , qemu-trivial@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH v2] bsd-user: fix compile failure Date: Thu, 12 Apr 2012 12:43:41 +0100 Message-Id: <1334231021-25886-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQmIzWP4JxqlDa+tdttlLbgsgSdaDfpU7hIZFmtaidoX5EQeYTJ/41Cq+so75F+qaO2eZZst bsd-user doesn't actually support reserving a memory area for the guest address space, but we need to at least define the reserved_va global so that cpu-all.h's RESERVED_VA macro will work correctly. This fixes a compilation error introduced in commit 39879bb which added a use of RESERVED_VA to h2g_valid(). Reported-by: Brad Smith Signed-off-by: Peter Maydell Reviewed-by: Stefan Weil --- v1->v2 changes: added commit hash accidentally omitted from message added reported-by line. no code change. bsd-user/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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;