From patchwork Thu Apr 12 10:22:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 7759 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 CC42723E1D for ; Thu, 12 Apr 2012 10:22:54 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 96C16A18440 for ; Thu, 12 Apr 2012 10:22:54 +0000 (UTC) Received: by yhpp61 with SMTP id p61so1177919yhp.11 for ; Thu, 12 Apr 2012 03:22:54 -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=qxeoUn4xJBy0lD+rW/FQ7JrTXrfsLB6KyqwEFMyVPWI=; b=o6OCq5BPWwsKgj5dDLQWJbEWe6Xg3EUlPK3LSBeeYVOvUwTtqL+shkIoytREKLarQQ yumjNE2gTop8arnaSE5iKWq1llIO/8j951MJAgbivdCZpYCAzlhALMrPSB8SSz27aXwu K7ejg0xZ/8Ph8EjOvW5ww8Zuw3jqI0X0c+00SUizImi8TzwUL9xww3qGHEaPWd/OgmDe B/sUZ/XUeSusGnKgOlOkxhCIMxWiFAhHQ1qSjbY5AiqD8J+jlE07qj+IjT8/QOupPaSB EKENbw3cevpu9YbGUo7nImA2UPc5YtsjiLC3WF5ZkfZSt2uzoPlcx2418nRNypZeVJea lS0A== Received: by 10.50.202.38 with SMTP id kf6mr1775444igc.30.1334226173774; Thu, 12 Apr 2012 03:22:53 -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 c5csp255571ibj; Thu, 12 Apr 2012 03:22:52 -0700 (PDT) Received: by 10.216.135.206 with SMTP id u56mr1188824wei.29.1334226171927; Thu, 12 Apr 2012 03:22:51 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id er8si21769123wib.6.2012.04.12.03.22.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Apr 2012 03:22:51 -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 1SIHAq-0006gJ-Rh; Thu, 12 Apr 2012 11:22:44 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Brad Smith , qemu-trivial@nongnu.org Subject: [PATCH] bsd-user: fix compile failure Date: Thu, 12 Apr 2012 11:22:44 +0100 Message-Id: <1334226164-25658-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkktD0APv3lb1lixx+RqBTHsYDmYZtRvqZ+glxU+EWF3s+ejv78CWTuLeedHi21664Y6CBP 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 which added a use of RESERVED_VA to h2g_valid(). Signed-off-by: Peter Maydell Reported-by: Brad Smith --- 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;