[PATCH] osdep: fix HAVE_BROKEN_SIZE_MAX case

[PATCH] osdep: fix HAVE_BROKEN_SIZE_MAX case

[Paolo Bonzini]

While config-host.mak entries are expanded to "1" for compatibility with
create-config.sh, tests done directly in meson.build expand to the empty
string and cannot be placed to the right of the && operator.  Adjust
osdep.h after commit e46bd55d9c ("configure: convert HAVE_BROKEN_SIZE_MAX
to meson", 2021-07-06) changed the way HAVE_BROKEN_SIZE_MAX is defined.

Reported-by: Frederic Bezies <fredbezies@gmail.com>
Fixes: e46bd55d9c ("configure: convert HAVE_BROKEN_SIZE_MAX to meson", 2021-07-06)
Resolves: #463
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/qemu/osdep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index c91a78b5e6..60718fc342 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -256,7 +256,7 @@ extern "C" {
 /* Mac OSX has a <stdint.h> bug that incorrectly defines SIZE_MAX with
  * the wrong type. Our replacement isn't usable in preprocessor
  * expressions, but it is sufficient for our needs. */
-#if defined(HAVE_BROKEN_SIZE_MAX) && HAVE_BROKEN_SIZE_MAX
+#ifdef HAVE_BROKEN_SIZE_MAX
 #undef SIZE_MAX
 #define SIZE_MAX ((size_t)-1)
 #endif
-- 
2.31.1

Re: [PATCH] osdep: fix HAVE_BROKEN_SIZE_MAX case

[Daniel P. Berrangé]

On Wed, Jul 07, 2021 at 12:56:00PM +0200, Paolo Bonzini wrote:
> While config-host.mak entries are expanded to "1" for compatibility with
> create-config.sh, tests done directly in meson.build expand to the empty
> string and cannot be placed to the right of the && operator.  Adjust
> osdep.h after commit e46bd55d9c ("configure: convert HAVE_BROKEN_SIZE_MAX
> to meson", 2021-07-06) changed the way HAVE_BROKEN_SIZE_MAX is defined.
> 
> Reported-by: Frederic Bezies <fredbezies@gmail.com>
> Fixes: e46bd55d9c ("configure: convert HAVE_BROKEN_SIZE_MAX to meson", 2021-07-06)
> Resolves: #463

FWIW, although gitlab allows these short references, it is generally
not desirable to use it.

When browsing commits in a fork, the hyperlink for '#463' will attempt
to be resolved against the fork's issue tracker, not the main repo.
It won't exist in the fork and thus won't get linked.

Thus it preferrable to include at least the project path too:

 Resolves: qemu-project/qemu#463

or simply the URL to the issue:

 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/463

Personally I like the latter, since you can then click the issue
URL when browsing commits in your shell terminal.

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  include/qemu/osdep.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

> 
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index c91a78b5e6..60718fc342 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -256,7 +256,7 @@ extern "C" {
>  /* Mac OSX has a <stdint.h> bug that incorrectly defines SIZE_MAX with
>   * the wrong type. Our replacement isn't usable in preprocessor
>   * expressions, but it is sufficient for our needs. */
> -#if defined(HAVE_BROKEN_SIZE_MAX) && HAVE_BROKEN_SIZE_MAX
> +#ifdef HAVE_BROKEN_SIZE_MAX
>  #undef SIZE_MAX
>  #define SIZE_MAX ((size_t)-1)
>  #endif
> -- 
> 2.31.1
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|