Patchwork [v2] bsd-user: fix compile failure

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

Comments

Peter Maydell - April 12, 2012, 11:43 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 39879bb
which added a use of RESERVED_VA to h2g_valid().

Reported-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
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(-)
Stefan Weil - April 12, 2012, 4:35 p.m.
Am 12.04.2012 13:43, 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 39879bb
> which added a use of RESERVED_VA to h2g_valid().
>
> Reported-by: Brad Smith<brad@comstyle.com>
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
> ---
> 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;

Reviewed-by: Stefan Weil <sw@weilnetz.de>

I'll send a patch which changes the data type to uintptr_t later
with my w64 patches.
Stefan Hajnoczi - April 13, 2012, 8:57 a.m.
On Thu, Apr 12, 2012 at 12:43:41PM +0100, Peter Maydell wrote:
> 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 <brad@comstyle.com>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> 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(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

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;