Patchwork bsd-user: fix compile failure

login
register
mail settings
Submitter Peter Maydell
Date April 12, 2012, 10:22 a.m.
Message ID <1334226164-25658-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/152007/
State New
Headers show

Comments

Peter Maydell - April 12, 2012, 10:22 a.m.
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 <peter.maydell@linaro.org>
---
 bsd-user/main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Andreas Färber - April 12, 2012, 10:38 a.m.
Am 12.04.2012 12:22, schrieb 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

Did you forget to paste the commit hash here? Otherwise a "the" seems
missing.

> which added a use of RESERVED_VA to h2g_valid().
> 

Reported-by: Brad Smith <brad@comstyle.com>

from what I remember.

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  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;

Looks okay to me but don't have BSD setup to test.

Andreas

Patch

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;