Patchwork win32: fix broken build due to missing QEMU_MADV_HUGEPAGE

login
register
mail settings
Submitter Luiz Capitulino
Date Oct. 24, 2012, 4:12 p.m.
Message ID <20121024141215.737e0f2a@doriath.home>
Download mbox | patch
Permalink /patch/193844/
State New
Headers show

Comments

Luiz Capitulino - Oct. 24, 2012, 4:12 p.m.
Commit ad0b5321f1f797274603ebbe20108b0750baee94 forgot to add
QEMU_MADV_HUGEPAGE macros for when CONFIG_MADVISE is not defined.
This broke the build for Windows. Fix it.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 osdep.h | 2 ++
 1 file changed, 2 insertions(+)
Stefan Weil - Oct. 25, 2012, 8:24 p.m.
Am 24.10.2012 18:12, schrieb Luiz Capitulino:
> Commit ad0b5321f1f797274603ebbe20108b0750baee94 forgot to add
> QEMU_MADV_HUGEPAGE macros for when CONFIG_MADVISE is not defined.
> This broke the build for Windows. Fix it.
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
> ---
>   osdep.h | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/osdep.h b/osdep.h
> index c5fd3d9..585e2c1 100644
> --- a/osdep.h
> +++ b/osdep.h
> @@ -121,6 +121,7 @@ void qemu_vfree(void *ptr);
>   #define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
>   #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
>   #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
> +#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
>
>   #else /* no-op */
>
> @@ -129,6 +130,7 @@ void qemu_vfree(void *ptr);
>   #define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
>   #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
>   #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
> +#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
>
>   #endif
>    

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

This is a build fix for latest QEMU. Please apply it as soon as possible.

Regards
Stefan Weil
Anthony Liguori - Oct. 26, 2012, 3:34 p.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> Commit ad0b5321f1f797274603ebbe20108b0750baee94 forgot to add
> QEMU_MADV_HUGEPAGE macros for when CONFIG_MADVISE is not defined.
> This broke the build for Windows. Fix it.
>
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

Applied. Thanks.

Regards,

Anthony Liguori

> ---
>  osdep.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/osdep.h b/osdep.h
> index c5fd3d9..585e2c1 100644
> --- a/osdep.h
> +++ b/osdep.h
> @@ -121,6 +121,7 @@ void qemu_vfree(void *ptr);
>  #define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
>  #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
>  #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
> +#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
>  
>  #else /* no-op */
>  
> @@ -129,6 +130,7 @@ void qemu_vfree(void *ptr);
>  #define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
>  #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
>  #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
> +#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
>  
>  #endif
>  
> -- 
> 1.7.12.315.g682ce8b

Patch

diff --git a/osdep.h b/osdep.h
index c5fd3d9..585e2c1 100644
--- a/osdep.h
+++ b/osdep.h
@@ -121,6 +121,7 @@  void qemu_vfree(void *ptr);
 #define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
 #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
 #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
+#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
 
 #else /* no-op */
 
@@ -129,6 +130,7 @@  void qemu_vfree(void *ptr);
 #define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
 #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
 #define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
+#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
 
 #endif