From patchwork Fri Apr 13 09:39:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 152269 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 8E7C2B7015 for ; Fri, 13 Apr 2012 19:40:00 +1000 (EST) Received: from localhost ([::1]:52399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIcz0-0004mV-Bs for incoming@patchwork.ozlabs.org; Fri, 13 Apr 2012 05:39:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIcye-0004dD-FN for qemu-devel@nongnu.org; Fri, 13 Apr 2012 05:39:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIcyY-0001OF-BO for qemu-devel@nongnu.org; Fri, 13 Apr 2012 05:39:36 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:54698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIcyY-0001NP-2u for qemu-devel@nongnu.org; Fri, 13 Apr 2012 05:39:30 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Apr 2012 10:39:26 +0100 Received: from d06nrmr1806.portsmouth.uk.ibm.com (9.149.39.193) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 13 Apr 2012 10:39:24 +0100 Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3D9dNtp2871480 for ; Fri, 13 Apr 2012 10:39:23 +0100 Received: from d06av10.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3D9dCBO007468 for ; Fri, 13 Apr 2012 05:39:13 -0400 Received: from localhost (dyn-9-174-219-44.manchester-maybrook.uk.ibm.com [9.174.219.44]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q3D9dC78007458; Fri, 13 Apr 2012 05:39:12 -0400 From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 13 Apr 2012 10:39:15 +0100 Message-Id: <1334309956-31827-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1334309956-31827-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1334309956-31827-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12041309-0542-0000-0000-00000187E6C5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.113 Cc: Peter Maydell , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 5/6] bsd-user: fix compile failure 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 From: Peter Maydell 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 Signed-off-by: Stefan Hajnoczi --- bsd-user/main.c | 1 + 1 file changed, 1 insertion(+) 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;