| Message ID | 20200409211529.5269-3-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | more random fixes | expand |
On 4/9/20 11:15 PM, Alex Bennée wrote: > From: Richard Henderson <richard.henderson@linaro.org> > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/exec/cpu-all.h | 2 +- > bsd-user/main.c | 4 ++-- > linux-user/main.c | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h > index 49384bb66a5..b4fb5832c4a 100644 > --- a/include/exec/cpu-all.h > +++ b/include/exec/cpu-all.h > @@ -159,7 +159,7 @@ static inline void tswap64s(uint64_t *s) > * This allows the guest address space to be offset to a convenient location. > */ > extern unsigned long guest_base; > -extern int have_guest_base; > +extern bool have_guest_base; > extern unsigned long reserved_va; > > #if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS > diff --git a/bsd-user/main.c b/bsd-user/main.c > index 770c2b267ad..aef5531628a 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -42,7 +42,7 @@ > int singlestep; > unsigned long mmap_min_addr; > unsigned long guest_base; > -int have_guest_base; > +bool have_guest_base; > unsigned long reserved_va; > > static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; > @@ -828,7 +828,7 @@ int main(int argc, char **argv) > } > } else if (!strcmp(r, "B")) { > guest_base = strtol(argv[optind++], NULL, 0); > - have_guest_base = 1; > + have_guest_base = true; > } else if (!strcmp(r, "drop-ld-preload")) { > (void) envlist_unsetenv(envlist, "LD_PRELOAD"); > } else if (!strcmp(r, "bsd")) { > diff --git a/linux-user/main.c b/linux-user/main.c > index 1d20a83d4e8..90ad365b439 100644 > --- a/linux-user/main.c > +++ b/linux-user/main.c > @@ -59,7 +59,7 @@ static const char *cpu_type; > static const char *seed_optarg; > unsigned long mmap_min_addr; > unsigned long guest_base; > -int have_guest_base; > +bool have_guest_base; > > /* > * Used to implement backwards-compatibility for the `-strace`, and > @@ -334,7 +334,7 @@ static void handle_arg_cpu(const char *arg) > static void handle_arg_guest_base(const char *arg) > { > guest_base = strtol(arg, NULL, 0); > - have_guest_base = 1; > + have_guest_base = true; > } > > static void handle_arg_reserved_va(const char *arg) > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 49384bb66a5..b4fb5832c4a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -159,7 +159,7 @@ static inline void tswap64s(uint64_t *s) * This allows the guest address space to be offset to a convenient location. */ extern unsigned long guest_base; -extern int have_guest_base; +extern bool have_guest_base; extern unsigned long reserved_va; #if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS diff --git a/bsd-user/main.c b/bsd-user/main.c index 770c2b267ad..aef5531628a 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -42,7 +42,7 @@ int singlestep; unsigned long mmap_min_addr; unsigned long guest_base; -int have_guest_base; +bool have_guest_base; unsigned long reserved_va; static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; @@ -828,7 +828,7 @@ int main(int argc, char **argv) } } else if (!strcmp(r, "B")) { guest_base = strtol(argv[optind++], NULL, 0); - have_guest_base = 1; + have_guest_base = true; } else if (!strcmp(r, "drop-ld-preload")) { (void) envlist_unsetenv(envlist, "LD_PRELOAD"); } else if (!strcmp(r, "bsd")) { diff --git a/linux-user/main.c b/linux-user/main.c index 1d20a83d4e8..90ad365b439 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -59,7 +59,7 @@ static const char *cpu_type; static const char *seed_optarg; unsigned long mmap_min_addr; unsigned long guest_base; -int have_guest_base; +bool have_guest_base; /* * Used to implement backwards-compatibility for the `-strace`, and @@ -334,7 +334,7 @@ static void handle_arg_cpu(const char *arg) static void handle_arg_guest_base(const char *arg) { guest_base = strtol(arg, NULL, 0); - have_guest_base = 1; + have_guest_base = true; } static void handle_arg_reserved_va(const char *arg)