Introduce qemu_madvise()
PATCH 1/1 Introduce qemu_madvise()
From: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c. The underlying issue is that madvise() is not a POSIX function, therefore Solaris' _POSIX_C_SOURCE suppresses the prototype.
Haiku doesn't implement madvise() at all. OpenBSD however doesn't implement posix_madvise().
Check for posix_madvise() in configure and supply qemu_madvise() as wrapper. Use qemu_madvise() in arch_init.c's ram_load().
http://www.opengroup.org/onlinepubs/9699919799/functions/posix_madvise.html
Remaining madvise() users:exec.c: limited to __linux__ and/or MADV_MERGEABLE (no POSIX equivalent) kvm-all.c: limited to MADV_DONTFORK (no POSIX equivalent),
otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to __linux__
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 11 +++++++++++ osdep.c | 26 ++++++++++++++++++++++++++ osdep.h | 4 ++++ vl.c | 3 --- 5 files changed, 42 insertions(+), 4 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +11 -0
@@ -2069,6 +2069,17 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have posix_madvise + +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); return 0; } +EOF +if compile_prog "" "" ; then + QEMU_CFLAGS="-DCONFIG_POSIX_MADVISE ${QEMU_CFLAGS}" +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
osdep.c +26 -0
@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -139,6 +140,31 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =POSIX_MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort (); + } +return posix_madvise (addr, len, advice); +#else +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort (); + } +return madvise (addr, len, advice); +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +4 -0
@@ -90,6 +90,10 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_DONTNEED 1 + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Quoted 40 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c. The underlying issue is thatmadvise()is not a POSIX function, therefore Solaris'_POSIX_C_SOURCEsuppresses the prototype.Haiku doesn't implement
madvise()at all. OpenBSD however doesn't implementposix_madvise().Check for
posix_madvise()in configure and supplyqemu_madvise()as wrapper. Useqemu_madvise()in arch_init.c'sram_load().http://www.opengroup.org/onlinepubs/9699919799/functions/posix_madvise.html
Remaining
madvise()users:exec.c: limited to__linux__and/orMADV_MERGEABLE(no POSIX equivalent)kvm-all.c: limited toMADV_DONTFORK(no POSIX equivalent),
otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to__linux__v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>---
arch_init.c | 2 +- configure | 11 +++++++++++ osdep.c | 26 ++++++++++++++++++++++++++ osdep.h | 4 ++++ vl.c | 3 --- 5 files changed, 42 insertions(+), 4 deletions(-)arch_init.c +0
-0
arch_init.c int ram_load(QEMUFile *f, void *opaque, int version_id) · line 399
Quoted 5 lines
arch_init.c +1
-1@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED );
Is this the only occurence in the whole code base? This patch should convert all users, right?
Quoted 40 lines
arch_init.c +0
-0}#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {configure +0
-0@@ -2069,6 +2069,17 @@ if compile_prog "" "" ; thenfi
##########################################
configure +11
-0+# check if we have posix_madvise + +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); return 0; } +EOF +if compile_prog "" "" ; then + QEMU_CFLAGS="-DCONFIG_POSIX_MADVISE ${QEMU_CFLAGS}" +fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullosdep.c +1
-0@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h" @@ -139,6 +140,31 @@ void qemu_vfree(void *ptr)#endif
osdep.c void qemu_vfree(void *ptr) · line 151
Quoted 10 lines
osdep.c +9
-0+int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =POSIX_MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice);
Advise :) It should probably also be 'madvise' here. Plus, I'd recommend %x as that makes the bits slightly more obvious.
osdep.c void qemu_vfree(void *ptr) · line 164
Quoted 13 lines
osdep.c +13
-0+ abort(); + } +return posix_madvise (addr, len, advice); +#else +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort (); + } +return madvise (addr, len, advice);
So what do you do on haiku where there's no madvise?
Quoted 11 lines
osdep.c +3
-0+#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];osdep.h +0
-0
osdep.h void *qemu_memalign(size_t alignment, size_t size); · line 93
Quoted 4 lines
osdep.h +1
-0@@ -90,6 +90,10 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_DONTNEED 1
(1 << 0)
There are probably more to follow. I'm also not sure if it wouldn't make sense to just directly map qemu_madvise and real madvise bits. Something like
#ifdef MADV_DONTNEED
#define QEMU_MADV_DONTNEED (1 << 0)
#else
#define QEMU_MADV_DONTNEED 0
#endif
Unless of course a flag is mandatory - but I don't think any of the madvise bits are.
Quoted 11 lines
osdep.h +3
-0+ +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32vl.c +0
-0
vl.c line 85
Quoted 6 lines
vl.c +0
-3@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );
Does Solaris have posix_madvise? Otherwise it would still require this header hack, no?
Alex
Am 11.09.2010 um 23:37 schrieb Alexander Graf:
Quoted 8 lines · Andreas Färber
Quoted 6 lines
Remaining
madvise()users:exec.c: limited to__linux__and/orMADV_MERGEABLE(no POSIX equivalent)kvm-all.c: limited toMADV_DONTFORK(no POSIX equivalent),
otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to__linux__
Quoted 14 lines
arch_init.c int ram_load(QEMUFile *f, void *opaque, int · line 401
Quoted 12 lines
arch_init.c +1
-1@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED );Is this the only occurence in the whole code base? This patch should convert all users, right?
It's the only relevant occurrence, cf. description above.
We could in theory create QEMU_MADV_MERGEABLE and QEMU_MADV_DONTFORK and convert the callers, too, but what's the point when only madvise supports it?
Using the current #ifdef mechanism we can detect/handle it at compile-time; inside qemu_madvise it would be deferred to runtime. Or do you have a suggestion how to handle that scenario other than returning an error?
Quoted 8 lines
Quoted 8 lines
osdep.c +0
-0@@ -139,6 +140,31 @@ void qemu_vfree(void *ptr)#endif
Quoted 11 lines
osdep.c void qemu_vfree(void *ptr) · line 151
Quoted 9 lines
osdep.c +9
-0+int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =POSIX_MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice);Advise :)
I'd advise against that advice. ;) (*hint hint*)
Quoted 1 line
It should probably also be 'madvise' here. Plus, I'd recommend %x as that makes the bits slightly more obvious.
You mean, "qemu_madvise: Advice %x ..."? Or "Advice %x for posix_madvise ..."?
Quoted 14 lines
osdep.c void qemu_vfree(void *ptr) · line 164
Quoted 13 lines
osdep.c +13
-0+ abort(); + } +return posix_madvise (addr, len, advice); +#else +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort (); + } +return madvise (addr, len, advice);
Quoted 1 line
So what do you do on haiku where there's no madvise?
It should detect posix_madvise and not run into this code path, just like OpenSolaris. I was hoping for Michael Lotz to resurface though and haven't retried myself yet.
Platforms that have neither posix_madvise nor madvise are equally broken before and after.
Quoted 22 lines
Quoted 12 lines
osdep.c +3
-0+#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];osdep.h +0
-0osdep.h void *qemu_memalign(size_t alignment, size_t · line 94
Quoted 5 lines
osdep.h +1
-0@@ -90,6 +90,10 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_DONTNEED 1(1 << 0)
There are probably more to follow. I'm also not sure if it wouldn't make sense to just directly map
qemu_madviseand real madvise bits. Something like
Quoted 7 lines
#ifdef
MADV_DONTNEED
#defineQEMU_MADV_DONTNEED(1 << 0)
#else
#defineQEMU_MADV_DONTNEED0
#endifUnless of course a flag is mandatory - but I don't think any of the madvise bits are.
I don't follow. Something like the following?
#ifdef CONFIG_POSIX_MADVISE
#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED
#define qemu_madvise posix_madvise
#else
#ifdef MADV_DONTNEED
#define QEMU_MADV_DONTNEED MADV_DONTNEED
#endif
#define qemu_madvise madvise
#endif
Quoted 5 lines
Quoted 5 lines
osdep.h +3
-0+ +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);
Quoted 14 lines
vl.c line 85
Quoted 12 lines
#ifdef
_WIN32vl.c +0
-3@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );Does Solaris have
posix_madvise? Otherwise it would still require this header hack, no?
I tested on OpenSolaris 2009.06. Haven't tested on Solaris 10 yet, don't have access to older ones. We could wrap it in #ifndef CONFIG_POSIX_MADVISE to be fool-safe.
Thanks for the review,
Andreas
Quoted 23 lines · Andreas Färber
Am 11.09.2010 um 23:37 schrieb Alexander Graf:
Quoted 8 lines · Andreas Färber
Quoted 6 lines
Remaining
madvise()users:exec.c: limited to__linux__and/orMADV_MERGEABLE(no POSIX equivalent)kvm-all.c: limited toMADV_DONTFORK(no POSIX equivalent),
otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to__linux__Quoted 12 lines
arch_init.c int ram_load(QEMUFile *f, void *opaque, int version_id) · line 399
Quoted 10 lines
arch_init.c +1
-1@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED );Is this the only occurence in the whole code base? This patch should convert all users, right?
Quoted 4 lines
It's the only relevant occurrence, cf. description above.
We could in theory create
QEMU_MADV_MERGEABLEandQEMU_MADV_DONTFORKand convert the callers, too, but what's the point when only madvise supports it?
Using the current #ifdef mechanism we can detect/handle it at compile-time; insideqemu_madviseit would be deferred to runtime. Or do you have a suggestion how to handle that scenario other than returning an error?
Hrm. I'm not sure. Do we have to fail madvise at all?
Quoted 21 lines
Quoted 9 lines
Quoted 9 lines
osdep.c +0
-0@@ -139,6 +140,31 @@ void qemu_vfree(void *ptr)#endif Quoted 11 lines
osdep.c void qemu_vfree(void *ptr) · line 151
Quoted 9 lines
osdep.c +9
-0+int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =POSIX_MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice);Advise :)
Quoted 5 lines
I'd advise against that advice. ;) (*hint hint*)
Quoted 1 line
It should probably also be 'madvise' here. Plus, I'd recommend %x as that makes the bits slightly more obvious.
You mean, "
qemu_madvise: Advice %x ..."? Or "Advice %x forposix_madvise..."?
I'd remove the "Advice" part: "qemu_madvise: Flag %x unknown".
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
osdep.c +13
-0+ abort(); + } +return posix_madvise (addr, len, advice); +#else +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort (); + } +return madvise (addr, len, advice);
Quoted 4 lines
Quoted 1 line
So what do you do on haiku where there's no madvise?
It should detect
posix_madviseand not run into this code path, just like OpenSolaris. I was hoping for Michael Lotz to resurface though and haven't retried myself yet.
Oh, so OpenSolaris and Haiku have posix_madvise? Nice.
Quoted 2 lines
Platforms that have neither
posix_madvisenor madvise are equally broken before and after.
Sure :).
Quoted 32 lines
Quoted 22 lines
Quoted 13 lines
osdep.c +3
-0+#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];osdep.h +0
-0osdep.h void *qemu_memalign(size_t alignment, size_t size); · line 93
Quoted 4 lines
osdep.h +1
-0@@ -90,6 +90,10 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_DONTNEED 1(1 << 0)
There are probably more to follow. I'm also not sure if it wouldn't make sense to just directly map
qemu_madviseand real madvise bits. Something likeQuoted 7 lines
#ifdef
MADV_DONTNEED
#defineQEMU_MADV_DONTNEED(1 << 0)
#else
#defineQEMU_MADV_DONTNEED0
#endifUnless of course a flag is mandatory - but I don't think any of the madvise bits are.
I don't follow. Something like the following?
Quoted 9 lines
#ifdef
CONFIG_POSIX_MADVISE
#defineQEMU_MADV_DONTNEEDPOSIX_MADV_DONTNEED
#defineqemu_madviseposix_madvise
#else
#ifdefMADV_DONTNEED
#defineQEMU_MADV_DONTNEEDMADV_DONTNEED
#endif
#defineqemu_madvisemadvise
#endif
This could work, though in general preprocessor magic is ... too magic. I was thinking:
#ifdef CONFIG_POSIX_MADVISE
#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED
#else
#define QEMU_MADV_DONTNEED MADV_DONTNEED
#endif
and keep the qemu_madvise implementation in C. But then there's no need to convert between QEMU_MADV and real MADV bits.
Quoted 21 lines
Quoted 6 lines
Quoted 6 lines
osdep.h +3
-0+ +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);Quoted 14 lines
vl.c line 85
Quoted 12 lines
osdep.h +0
-0#ifdef _WIN32vl.c +0
-3@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );Does Solaris have
posix_madvise? Otherwise it would still require this header hack, no?
Quoted 2 lines
I tested on OpenSolaris 2009.06. Haven't tested on Solaris 10 yet, don't have access to older ones. We could wrap it in #ifndef
CONFIG_POSIX_MADVISEto be fool-safe.
*shrug* I was just afraid this was there for a reason. But maybe the author of those lines simply didn't know about posix_madvise.
Quoted 1 line
Thanks for the review,
You're welcome :)
Alex
Quoted 13 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c. The underlying issue is thatmadvise()is not a POSIX function, therefore Solaris'_POSIX_C_SOURCEsuppresses the prototype.Haiku doesn't implement
madvise()at all. OpenBSD however doesn't implementposix_madvise().Check for
posix_madvise()in configure and supplyqemu_madvise()as wrapper. Useqemu_madvise()in arch_init.c'sram_load().
Quoted 7 lines
http://www.opengroup.org/onlinepubs/9699919799/functions/posix_madvise.html
Remaining
madvise()users:exec.c: limited to__linux__and/orMADV_MERGEABLE(no POSIX equivalent)kvm-all.c: limited toMADV_DONTFORK(no POSIX equivalent), otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to__linux__
For consistency, I'd convert all users. If an OS doesn't support a flag, we can return something like -ENOTSUP which may be checked by the caller if it cares.
Quoted 36 lines
v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>---
arch_init.c | 2 +-
configure | 11 +++++++++++
osdep.c | 26 ++++++++++++++++++++++++++
osdep.h | 4 ++++
vl.c | 3 ---5 files changed, 42 insertions(+), 4 deletions(-)arch_init.c +0
-0@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) #ifndef _WIN32if (ch == 0 &&
(!kvm_enabled() ||kvm_has_sync_mmu())) {
- madvise(host,TARGET_PAGE_SIZE,MADV_DONTNEED);
+ qemu_madvise(host,TARGET_PAGE_SIZE,QEMU_MADV_DONTNEED); }
#endif
} else if (flags &RAM_SAVE_FLAG_PAGE) {configure +0
-0@@ -2069,6 +2069,17 @@ if compile_prog "" "" ; thenfi
##########################################
configure if compile_prog "" "" ; then · line 2079
Quoted 8 lines
configure +8
-0+# check if we have posix_madvise + +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); return 0; } +EOF +if compile_prog "" "" ; then + QEMU_CFLAGS="-DCONFIG_POSIX_MADVISE ${QEMU_CFLAGS}"
Please take a look around configure:2444 how to add new config flags. I'd also add a similar check for madvise() if posix_madvise() check fails.
Quoted 22 lines
configure +3
-0+fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullosdep.c +1
-0@@ -28,6 +28,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"@@ -139,6 +140,31 @@ void qemu_vfree(void *ptr) #endif
osdep.c void qemu_vfree(void *ptr) · line 152
Quoted 10 lines
osdep.c +10
-0+int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE + switch (advice) { + case QEMU_MADV_DONTNEED: + advice = POSIX_MADV_DONTNEED; + break; + default: + fprintf(stderr, "Advice %d unhandled.\n", advice); + abort();
This should be an assert, it's an internal error. It's also common to both cases.
osdep.c void qemu_vfree(void *ptr) · line 155
Quoted 3 lines
osdep.c +3
-0+ } + return posix_madvise(addr, len, advice); +#else
#elif defined(CONFIG_MADVISE)
osdep.c void qemu_vfree(void *ptr) · line 159
Quoted 4 lines
osdep.c +4
-0+ switch (advice) { + case QEMU_MADV_DONTNEED: + advice = MADV_DONTNEED; + break;
case QEMU_MADV_DONTFORK:
#ifndef MADV_DONTFORK
return -ENOTSUP;
#else
advice = MADV_DONTFORK;
break;
#endif
Same goes for MADV_MERGEABLE.
osdep.c void qemu_vfree(void *ptr) · line 164
Quoted 5 lines
osdep.c +5
-0+ default: + fprintf(stderr, "Advice %d unhandled.\n", advice); + abort(); + } + return madvise(addr, len, advice);
#else
return -ENOTSUP;
Am 12.09.2010 um 09:20 schrieb Blue Swirl:
Quoted 12 lines
On Sat, Sep 11, 2010 at 5:05 PM, Andreas Färber <[email protected]
Quoted 10 lines
wrote:
Useqemu_madvise()in arch_init.c'sram_load().http://www.opengroup.org/onlinepubs/9699919799/functions/posix_madvise.html
Remaining
madvise()users:exec.c: limited to__linux__and/orMADV_MERGEABLE(no POSIX equivalent)kvm-all.c: limited toMADV_DONTFORK(no POSIX equivalent),
otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to__linux__
Quoted 3 lines
For consistency, I'd convert all users. If an OS doesn't support a flag, we can return something like
-ENOTSUPwhich may be checked by the caller if it cares.
Will do.
Quoted 7 lines
Quoted 7 lines
configure +0
-0@@ -2069,6 +2069,17 @@ if compile_prog "" "" ; then fi
Quoted 12 lines
configure if compile_prog "" "" ; then · line 2079
Quoted 10 lines
configure +8
-0########################################## +# check if we have posix_madvise + +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); return 0; } +EOF +if compile_prog "" "" ; then + QEMU_CFLAGS="-DCONFIG_POSIX_MADVISE ${QEMU_CFLAGS}"Please take a look around configure:2444 how to add new config flags.
I did. It's just not obvious that they find their way from the Makefile to a C header, unlike autoconf.
Quoted 2 lines
I'd also add a similar check for
madvise()ifposix_madvise()check fails.
Fine with me.
Quoted 49 lines
Quoted 16 lines
osdep.c +1
-0@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h" @@ -139,6 +140,31 @@ void qemu_vfree(void *ptr)#endif osdep.c void qemu_vfree(void *ptr) · line 152
Quoted 10 lines
osdep.c +10
-0+int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE +switch (advice) { +case QEMU_MADV_DONTNEED : + advice =POSIX_MADV_DONTNEED ; +break ; +default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort ();This should be an assert, it's an internal error. It's also common to both cases.
osdep.c void qemu_vfree(void *ptr) · line 155
Quoted 3 lines
osdep.c +3
-0+ } +return posix_madvise (addr, len, advice); +#else #elif
defined(CONFIG_MADVISE)osdep.c void qemu_vfree(void *ptr) · line 159
Quoted 4 lines
osdep.c +4
-0+switch (advice) { +case QEMU_MADV_DONTNEED : + advice =MADV_DONTNEED ; +break ;case
QEMU_MADV_DONTFORK:
#ifndefMADV_DONTFORK
return-ENOTSUP;
#else
advice =MADV_DONTFORK;
break;
#endif
Quoted 1 line
Same goes for
MADV_MERGEABLE.
So you disagree with or didn't yet read Alex' suggestion of eliminating this mapping code in qemu_madvise() altogether? Doing that in a sensible way would allow code to do:
#ifdef QEMU_MADV_MERGEABLE
...
as before at compile-time. The only qemu_madvise() error condition would then be the #else below.
Quoted 8 lines
osdep.c void qemu_vfree(void *ptr) · line 164
Quoted 5 lines
osdep.c +5
-0+default : +fprintf (stderr,"Advice %d unhandled.\n" , advice); +abort (); + } +return madvise (addr, len, advice);#else
return-ENOTSUP;
Thanks,
Andreas
Quoted 105 lines · Andreas Färber
Am 12.09.2010 um 09:20 schrieb Blue Swirl:
Quoted 14 lines
Quoted 11 lines · Andreas Färber
Use
qemu_madvise()in arch_init.c'sram_load().http://www.opengroup.org/onlinepubs/9699919799/functions/posix_madvise.html
Remaining
madvise()users:exec.c: limited to__linux__and/orMADV_MERGEABLE(no POSIX equivalent)kvm-all.c: limited toMADV_DONTFORK(no POSIX equivalent), otherwise runtime error if !kvm_has_sync_mmu()hw/virtio-balloon.c: limited to__linux__Quoted 3 lines
For consistency, I'd convert all users. If an OS doesn't support a flag, we can return something like
-ENOTSUPwhich may be checked by the caller if it cares.Will do.
Quoted 7 lines
Quoted 7 lines
configure +0
-0@@ -2069,6 +2069,17 @@ if compile_prog "" "" ; thenfi
Quoted 12 lines
configure if compile_prog "" "" ; then · line 2079
Quoted 10 lines
##########################################
configure +5
-0+# check if we have posix_madvise + +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); return 0;}
configure +3
-0+EOF +if compile_prog "" "" ; then + QEMU_CFLAGS="-DCONFIG_POSIX_MADVISE ${QEMU_CFLAGS}"Please take a look around configure:2444 how to add new config flags.
I did. It's just not obvious that they find their way from the
Makefileto a C header, unlike autoconf.Quoted 2 lines
I'd also add a similar check for
madvise()ifposix_madvise()check fails.Fine with me.
Quoted 49 lines
Quoted 16 lines
osdep.c +1
-0@@ -28,6 +28,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"@@ -139,6 +140,31 @@ void qemu_vfree(void *ptr) #endifosdep.c void qemu_vfree(void *ptr) · line 152
Quoted 10 lines
osdep.c +10
-0+int qemu_madvise (void *addr,size_t len,int advice) +{ +#ifdef CONFIG_POSIX_MADVISE + switch (advice) { + case QEMU_MADV_DONTNEED: + advice = POSIX_MADV_DONTNEED; + break; + default: + fprintf(stderr, "Advice %d unhandled.\n", advice); + abort();This should be an assert, it's an internal error. It's also common to both cases.
osdep.c void qemu_vfree(void *ptr) · line 155
Quoted 3 lines
osdep.c +3
-0+ } + return posix_madvise(addr, len, advice); +#else #elif
defined(CONFIG_MADVISE)osdep.c void qemu_vfree(void *ptr) · line 159
Quoted 4 lines
osdep.c +4
-0+ switch (advice) { + case QEMU_MADV_DONTNEED: + advice = MADV_DONTNEED; + break;case
QEMU_MADV_DONTFORK:
#ifndefMADV_DONTFORK
return-ENOTSUP;
#else
advice =MADV_DONTFORK;
break;
#endifQuoted 1 line
Same goes for
MADV_MERGEABLE.So you disagree with or didn't yet read Alex' suggestion of eliminating this mapping code in
qemu_madvise()altogether?
Doing that in a sensible way would allow code to do:
Quoted 5 lines
#ifdef
QEMU_MADV_MERGEABLE
...as before at compile-time. The only
qemu_madvise()error condition would then be the #else below.
That's one way too, if nobody cares about madvise() return values for MADV_MERGEABLE. In any case I'd like to eliminate the #ifdefs in other places than osdep.[ch].
PATCH v3 1/1 Introduce qemu_madvise()
In reply to Andreas FärberFrom: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c.
Haiku doesn't implement madvise() in favor of posix_madvise(). OpenBSD and Solaris 10 don't implement posix_madvise() but madvise().
Check for madvise() and posix_madvise() in configure and supply qemu_madvise() as wrapper. Prefer madvise() over posix_madvise() due to flag availability. Convert all callers to use qemu_madvise() and QEMU_MADV_*. No functional change except for arch_init.c:ram_load() now potentially falling back to posix_madvise() or no-op in lack of both.
v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check for madvise(), too.
Add defines to Makefile, not QEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris' madvise() prototype around. Pointed out by Alexander Graf.
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++++---- hw/virtio-balloon.c | 4 ++-- kvm-all.c | 6 +++--- osdep.c | 15 +++++++++++++++ osdep.h | 25 +++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 83 insertions(+), 13 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +33 -0
@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
@@ -2226,6 +2251,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"
@@ -2466,6 +2493,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then
exec.c +4 -4
@@ -2841,8 +2841,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size); -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); +#ifdef QEMU_MADV_MERGEABLE +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE );#endif }#else
@@ -2858,8 +2858,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,#else new_block->host =qemu_vmalloc (size);#endif -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); +#ifdef QEMU_MADV_MERGEABLE +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE );#endif } }
hw/virtio-balloon.c +2 -2
@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) {#if defined(__linux__)if (!kvm_enabled () ||kvm_has_sync_mmu ()) -madvise (addr,TARGET_PAGE_SIZE , - deflate ?MADV_WILLNEED :MADV_DONTNEED ); +qemu_madvise (addr,TARGET_PAGE_SIZE , + deflate ?QEMU_MADV_WILLNEED :QEMU_MADV_DONTNEED );#endif }
kvm-all.c +3 -3
@@ -1031,11 +1031,11 @@ int kvm_has_xcrs(void)void kvm_setup_guest_memory (void *start,size_t size) {if (!kvm_has_sync_mmu ()) { -#ifdef MADV_DONTFORK -int ret =madvise (start, size,MADV_DONTFORK ); +#ifdef QEMU_MADV_DONTFORK +int ret =qemu_madvise (start, size,QEMU_MADV_DONTFORK );if (ret) { -perror ("madvice" ); +perror ("qemu_madvise" );exit (1 ); }#else
osdep.c +15 -0
@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -35,6 +36,9 @@#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int );#endif #ifdef CONFIG_EVENTFD
@@ -139,6 +143,17 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +#if defined(CONFIG_MADVISE ) +return madvise (addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) +return posix_madvise (addr, len, advice); +#else +return -ENOTSUP ; +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +25 -0
@@ -90,6 +90,31 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED (1 << 0) +#define QEMU_MADV_DONTNEED (2 << 0) + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Quoted 115 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*. No functional change except for arch_init.c:ram_load() now potentially falling back toposix_madvise()or no-op in lack of both.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>---
arch_init.c | 2 +-
configure | 33 +++++++++++++++++++++++++++++++++exec.c| 8 ++++----hw/virtio-balloon.c| 4 ++--
kvm-all.c | 6 +++---
osdep.c | 15 +++++++++++++++
osdep.h | 25 +++++++++++++++++++++++++vl.c| 3 ---8 files changed, 83 insertions(+), 13 deletions(-)arch_init.c +0
-0@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) #ifndef _WIN32if (ch == 0 &&
(!kvm_enabled() ||kvm_has_sync_mmu())) {
- madvise(host,TARGET_PAGE_SIZE,MADV_DONTNEED);
+ qemu_madvise(host,TARGET_PAGE_SIZE,QEMU_MADV_DONTNEED); }
#endif
} else if (flags &RAM_SAVE_FLAG_PAGE) {configure +0
-0@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; thenfi
##########################################
configure +25
-0+# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullconfigure +0
-0@@ -2226,6 +2251,8 @@ echo "KVM support $kvm"echo "fdt support $fdt"
echo "preadv support $preadv"
echo "fdatasync $fdatasync"configure +2
-0+echo "madvise $madvise" +echo "posix_madvise $posix_madvise"echo "uuid support $uuid"
echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend"configure +0
-0@@ -2466,6 +2493,12 @@ fiif test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak
ficonfigure +6
-0+if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi# XXX: suppress that
if [ "$bsd" = "yes" ] ; thenexec.c +0
-0
exec.c ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, · line 2844
Quoted 6 lines
exec.c +1
-2@@ -2841,8 +2841,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host = file_ram_alloc(new_block, size, mem_path); if (!new_block->host) { new_block->host = qemu_vmalloc(size); -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); +#ifdef QEMU_MADV_MERGEABLE
I'd like to avoid these #ifdefs. How about always #defining QEMU_MADV_MERGEABLE? QEMU_MADV_* values could be synthetic and not rely on MADV_*.
Quoted 39 lines
exec.c +3
-2+ qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); #endif } #else@@ -2858,8 +2858,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, #else new_block->host = qemu_vmalloc(size); #endif -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); +#ifdef QEMU_MADV_MERGEABLE + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); #endif } }hw/virtio-balloon.c +2
-2@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) { #if defined(__linux__) if (!kvm_enabled() || kvm_has_sync_mmu()) - madvise(addr, TARGET_PAGE_SIZE, - deflate ? MADV_WILLNEED : MADV_DONTNEED); + qemu_madvise(addr, TARGET_PAGE_SIZE, + deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED); #endif }kvm-all.c +0
-1@@ -1031,11 +1031,11 @@ int kvm_has_xcrs(void) void kvm_setup_guest_memory(void *start, size_t size) { if (!kvm_has_sync_mmu()) { -#ifdef MADV_DONTFORK
kvm-all.c int kvm_has_xcrs(void) · line 1041
Quoted 10 lines
kvm-all.c +3
-2- int ret = madvise(start, size, MADV_DONTFORK); +#ifdef QEMU_MADV_DONTFORK + int ret = qemu_madvise(start, size, QEMU_MADV_DONTFORK); if (ret) { - perror("madvice"); + perror("qemu_madvise"); exit(1); } #else
Here the approach could be that if the return value is -ENOTSUP, we don't print the error message. Then the #ifdefs could be dropped.
Quoted 120 lines · Blue Swirl
Quoted 118 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*. No functional change except for arch_init.c:ram_load() now potentially falling back toposix_madvise()or no-op in lack of both.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++++---- hw/virtio-balloon.c | 4 ++-- kvm-all.c | 6 +++--- osdep.c | 15 +++++++++++++++ osdep.h | 25 +++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 83 insertions(+), 13 deletions(-)arch_init.c +1
-1@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {configure +33
-0@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null@@ -2226,6 +2251,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"@@ -2466,6 +2493,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; thenexec.c +0
-0@@ -2841,8 +2841,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size);
Quoted 9 lines
exec.c ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
Quoted 4 lines
exec.c +1
-2-#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); +#ifdef QEMU_MADV_MERGEABLE I'd like to avoid these #ifdefs. How about always #defining
QEMU_MADV_MERGEABLE? QEMU_MADV_* values could be synthetic and not rely on MADV_*.
Hrm. Something like
#ifdef MADV_MEREABLE
#define QEMU_MADV_MERGEABLE MADV_MERGEABLE
#else
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
#endif
would work, right? Only need to find an unused bit in madv ...
Alex
RFC v4 1/1 Introduce qemu_madvise()
In reply to Blue SwirlFrom: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c.
Haiku doesn't implement madvise() in favor of posix_madvise(). OpenBSD and Solaris 10 don't implement posix_madvise() but madvise().
Check for madvise() and posix_madvise() in configure and supply qemu_madvise() as wrapper. Prefer madvise() over posix_madvise() due to flag availability. Convert all callers to use qemu_madvise() and QEMU_MADV_*.
Note that on Solaris the warning is fixed by moving the madvise() prototype, not by qemu_madvise() itself. It will help with future porting though.
v3 -> v4:
* Eliminate #ifdefs at qemu_advise() call sites. Requested by Blue Swirl. This will currently break the check in kvm-all.c by calling madvise() with a supported flag, which will not fail. Ideas/patches welcome.
v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check for madvise(), too.
Add defines to Makefile, not QEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris' madvise() prototype around. Pointed out by Alexander Graf.
* Display configure check results.
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++------ hw/virtio-balloon.c | 4 ++-- kvm-all.c | 15 +++++++-------- osdep.c | 15 +++++++++++++++ osdep.h | 33 +++++++++++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 93 insertions(+), 20 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +33 -0
@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
@@ -2226,6 +2251,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"
@@ -2466,6 +2493,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then
exec.c +2 -6
@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size); -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); }#else fprintf (stderr,"-mem-path option unsupported\n" );
@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,#else new_block->host =qemu_vmalloc (size);#endif -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); } }
hw/virtio-balloon.c +2 -2
@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) {#if defined(__linux__)if (!kvm_enabled () ||kvm_has_sync_mmu ()) -madvise (addr,TARGET_PAGE_SIZE , - deflate ?MADV_WILLNEED :MADV_DONTNEED ); +qemu_madvise (addr,TARGET_PAGE_SIZE , + deflate ?QEMU_MADV_WILLNEED :QEMU_MADV_DONTNEED );#endif }
kvm-all.c +7 -8
@@ -1031,18 +1031,17 @@ int kvm_has_xcrs(void)void kvm_setup_guest_memory (void *start,size_t size) {if (!kvm_has_sync_mmu ()) { -#ifdef MADV_DONTFORK -int ret =madvise (start, size,MADV_DONTFORK ); +int ret =qemu_madvise (start, size,QEMU_MADV_DONTFORK ); +if (ret == -ENOTSUP ) { +fprintf (stderr, +"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); +exit (1 ); + }if (ret) { -perror ("madvice" ); +perror ("qemu_madvise" );exit (1 ); } -#else -fprintf (stderr, -"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); -exit (1 ); -#endif } }
osdep.c +15 -0
@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -35,6 +36,9 @@#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int );#endif #ifdef CONFIG_EVENTFD
@@ -139,6 +143,17 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +#if defined(CONFIG_MADVISE ) +return madvise (addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) +return posix_madvise (addr, len, advice); +#else +return -ENOTSUP ; +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +33 -0
@@ -90,6 +90,39 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK MADV_NORMAL +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE MADV_NORMAL +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK POSIX_MADV_NORMAL +#define QEMU_MADV_MERGEABLE POSIX_MADV_NORMAL + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED 0 +#define QEMU_MADV_DONTNEED 0 +#define QEMU_MADV_DONTFORK 0 +#define QEMU_MADV_MERGEABLE 0 + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Quoted 12 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.
Quoted 7 lines
Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It will help with future porting though.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.
Your original switch with synthetic (1<<0, 1<<1 etc) values for QEMU_MADV_* for all hosts (never reusing MADV_* defines).
Am 14.09.2010 um 18:31 schrieb Blue Swirl <[email protected]>:
Quoted 16 lines · Andreas Färber
Quoted 15 lines
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It will help with future porting though.
Quoted 7 lines
Quoted 4 lines
v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.Your original switch with synthetic (1<<0, 1<<1 etc) values for QEMU_MADV_* for all hosts (never reusing MADV_* defines).
Ugh. Back to square one? How about
#define QEMU_MADV_INVALID -1
Then you can define unknown balues against that. Should never occur otherwise.
Alex
Quoted 24 lines · Alexander Graf
Am 14.09.2010 um 18:31 schrieb Blue Swirl <[email protected]>:
Quoted 21 lines · Andreas Färber
Quoted 19 lines
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It will help with future porting though.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.
Quoted 8 lines
Quoted 2 lines
Your original switch with synthetic (1<<0, 1<<1 etc) values for QEMU_MADV_* for all hosts (never reusing MADV_* defines).
Ugh. Back to square one? How about
#define
QEMU_MADV_INVALID-1Then you can define unknown balues against that. Should never occur otherwise.
Yeah, then the generic code could check for QEMU_MADV_INVALID. That's simpler than the switch.
PATCH v5 1/1 Introduce qemu_madvise()
From: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c.
Haiku doesn't implement madvise() in favor of posix_madvise(). OpenBSD and Solaris 10 don't implement posix_madvise() but madvise().
Check for madvise() and posix_madvise() in configure and supply qemu_madvise() as wrapper. Prefer madvise() over posix_madvise() due to flag availability. Convert all callers to use qemu_madvise() and QEMU_MADV_*.
Note that on Solaris the warning is fixed by moving the madvise() prototype, not by qemu_madvise() itself. It will help with future porting though, and it simplifies most call sites.
v4 -> v5:
* Introduce QEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.
v3 -> v4:
* Eliminate #ifdefs at qemu_advise() call sites. Requested by Blue Swirl. This will currently break the check in kvm-all.c by calling madvise() with a supported flag, which will not fail. Ideas/patches welcome.
v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check for madvise(), too.
Add defines to Makefile, not QEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris' madvise() prototype around. Pointed out by Alexander Graf.
* Display configure check results.
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++------ hw/virtio-balloon.c | 4 ++-- kvm-all.c | 15 +++++++-------- osdep.c | 18 ++++++++++++++++++ osdep.h | 35 +++++++++++++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 98 insertions(+), 20 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +33 -0
@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
@@ -2226,6 +2251,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"
@@ -2466,6 +2493,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then
exec.c +2 -6
@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size); -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); }#else fprintf (stderr,"-mem-path option unsupported\n" );
@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,#else new_block->host =qemu_vmalloc (size);#endif -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); } }
hw/virtio-balloon.c +2 -2
@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) {#if defined(__linux__)if (!kvm_enabled () ||kvm_has_sync_mmu ()) -madvise (addr,TARGET_PAGE_SIZE , - deflate ?MADV_WILLNEED :MADV_DONTNEED ); +qemu_madvise (addr,TARGET_PAGE_SIZE , + deflate ?QEMU_MADV_WILLNEED :QEMU_MADV_DONTNEED );#endif }
kvm-all.c +7 -8
@@ -1031,18 +1031,17 @@ int kvm_has_xcrs(void)void kvm_setup_guest_memory (void *start,size_t size) {if (!kvm_has_sync_mmu ()) { -#ifdef MADV_DONTFORK -int ret =madvise (start, size,MADV_DONTFORK ); +int ret =qemu_madvise (start, size,QEMU_MADV_DONTFORK ); +if (ret == -ENOTSUP ) { +fprintf (stderr, +"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); +exit (1 ); + }if (ret) { -perror ("madvice" ); +perror ("qemu_madvise" );exit (1 ); } -#else -fprintf (stderr, -"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); -exit (1 ); -#endif } }
osdep.c +18 -0
@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -35,6 +36,9 @@#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int );#endif #ifdef CONFIG_EVENTFD
@@ -139,6 +143,20 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +if (advice ==QEMU_MADV_INVALID ) { +return -ENOTSUP ; + } +#if defined(CONFIG_MADVISE ) +return madvise (addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) +return posix_madvise (addr, len, advice); +#else +return -ENOTSUP ; +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +35 -0
@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK POSIX_MADV_NORMAL +#define QEMU_MADV_MERGEABLE POSIX_MADV_NORMAL + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Quoted 257 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It will help with future porting though, and it simplifies most call sites.v4 -> v5:
* IntroduceQEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.
* Display configure check results.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>---
arch_init.c | 2 +-
configure | 33 +++++++++++++++++++++++++++++++++exec.c| 8 ++------hw/virtio-balloon.c| 4 ++--
kvm-all.c | 15 +++++++--------
osdep.c | 18 ++++++++++++++++++osdep.h| 35 +++++++++++++++++++++++++++++++++++vl.c| 3 ---8 files changed, 98 insertions(+), 20 deletions(-)arch_init.c +0
-0@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) #ifndef _WIN32if (ch == 0 &&
(!kvm_enabled() ||kvm_has_sync_mmu())) {
- madvise(host,TARGET_PAGE_SIZE,MADV_DONTNEED);
+ qemu_madvise(host,TARGET_PAGE_SIZE,QEMU_MADV_DONTNEED); }
#endif
} else if (flags &RAM_SAVE_FLAG_PAGE) {configure +0
-0@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; thenfi
##########################################
configure +25
-0+# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullconfigure +0
-0@@ -2226,6 +2251,8 @@ echo "KVM support $kvm"echo "fdt support $fdt"
echo "preadv support $preadv"
echo "fdatasync $fdatasync"configure +2
-0+echo "madvise $madvise" +echo "posix_madvise $posix_madvise"echo "uuid support $uuid"
echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend"configure +0
-0@@ -2466,6 +2493,12 @@ fiif test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak
ficonfigure +6
-0+if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi# XXX: suppress that
if [ "$bsd" = "yes" ] ; thenexec.c +2
-6@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host = file_ram_alloc(new_block, size, mem_path); if (!new_block->host) { new_block->host = qemu_vmalloc(size); -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } #else fprintf(stderr, "-mem-path option unsupported\n");@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, #else new_block->host = qemu_vmalloc(size); #endif -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } }hw/virtio-balloon.c +2
-2@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) { #if defined(__linux__) if (!kvm_enabled() || kvm_has_sync_mmu()) - madvise(addr, TARGET_PAGE_SIZE, - deflate ? MADV_WILLNEED : MADV_DONTNEED); + qemu_madvise(addr, TARGET_PAGE_SIZE, + deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED); #endif }kvm-all.c +7
-8@@ -1031,18 +1031,17 @@ int kvm_has_xcrs(void) void kvm_setup_guest_memory(void *start, size_t size) { if (!kvm_has_sync_mmu()) { -#ifdef MADV_DONTFORK - int ret = madvise(start, size, MADV_DONTFORK); + int ret = qemu_madvise(start, size, QEMU_MADV_DONTFORK); + if (ret == -ENOTSUP) { + fprintf(stderr, + "Need MADV_DONTFORK in absence of synchronous KVM MMU\n"); + exit(1); + } if (ret) { - perror("madvice"); + perror("qemu_madvise"); exit(1); } -#else - fprintf(stderr, - "Need MADV_DONTFORK in absence of synchronous KVM MMU\n"); - exit(1); -#endif } }osdep.c +18
-0@@ -28,6 +28,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"@@ -35,6 +36,9 @@ #ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int ); #endif #ifdef CONFIG_EVENTFD@@ -139,6 +143,20 @@ void qemu_vfree(void *ptr) #endif +int qemu_madvise (void *addr,size_t len,int advice) +{ + if (advice == QEMU_MADV_INVALID) { + return -ENOTSUP; + } +#if defined(CONFIG_MADVISE ) + return madvise(addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) + return posix_madvise(addr, len, advice); +#else + return -ENOTSUP; +#endif +} + int qemu_create_pidfile(const char *filename) { char buffer[128];osdep.h +13
-0@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size); void *qemu_vmalloc(size_t size); void qemu_vfree(void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE
osdep.h void *qemu_memalign(size_t alignment, size_t size); · line 115
Quoted 10 lines
osdep.h +10
-0+#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK POSIX_MADV_NORMAL +#define QEMU_MADV_MERGEABLE POSIX_MADV_NORMAL
Shouldn't these two (or at least QEMU_MADV_DONTFORK) be defined to QEMU_MADV_INVALID, so KVM check will fail as it should?
Otherwise I'm happy with the patch.
Am 14.09.2010 um 22:36 schrieb Blue Swirl:
Quoted 29 lines
On Tue, Sep 14, 2010 at 8:28 PM, Andreas Färber <[email protected]
Quoted 28 lines
wrote:
osdep.h +18
-0@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE )
Quoted 8 lines
osdep.h void *qemu_memalign(size_t alignment, size_t size); · line 115
Quoted 5 lines
osdep.h +5
-0+ +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK POSIX_MADV_NORMAL +#define QEMU_MADV_MERGEABLE POSIX_MADV_NORMALShouldn't these two (or at least
QEMU_MADV_DONTFORK) be defined toQEMU_MADV_INVALID, so KVM check will fail as it should?
Oops, missed these two. Will fix tomorrow.
Thanks,
Andreas
PATCH v6 1/1 Introduce qemu_madvise()
From: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c.
Haiku doesn't implement madvise() in favor of posix_madvise(). OpenBSD and Solaris 10 don't implement posix_madvise() but madvise().
Check for madvise() and posix_madvise() in configure and supply qemu_madvise() as wrapper. Prefer madvise() over posix_madvise() due to flag availability. Convert all callers to use qemu_madvise() and QEMU_MADV_*.
Note that on Solaris the warning is fixed by moving the madvise() prototype, not by qemu_madvise() itself. It will help with future porting though, and it simplifies most call sites.
v5 -> v6:
* Replace two leftover instances of POSIX_MADV_NORMAL with QEMU_MADV_INVALID. Spotted by Blue Swirl.
v4 -> v5:
* Introduce QEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.
v3 -> v4:
* Eliminate #ifdefs at qemu_advise() call sites. Requested by Blue Swirl. This will currently break the check in kvm-all.c by calling madvise() with a supported flag, which will not fail. Ideas/patches welcome.
v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check for madvise(), too.
Add defines to Makefile, not QEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris' madvise() prototype around. Pointed out by Alexander Graf.
* Display configure check results.
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++------ hw/virtio-balloon.c | 4 ++-- kvm-all.c | 15 +++++++-------- osdep.c | 18 ++++++++++++++++++ osdep.h | 35 +++++++++++++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 98 insertions(+), 20 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +33 -0
@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
@@ -2226,6 +2251,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"
@@ -2466,6 +2493,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then
exec.c +2 -6
@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size); -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); }#else fprintf (stderr,"-mem-path option unsupported\n" );
@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,#else new_block->host =qemu_vmalloc (size);#endif -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); } }
hw/virtio-balloon.c +2 -2
@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) {#if defined(__linux__)if (!kvm_enabled () ||kvm_has_sync_mmu ()) -madvise (addr,TARGET_PAGE_SIZE , - deflate ?MADV_WILLNEED :MADV_DONTNEED ); +qemu_madvise (addr,TARGET_PAGE_SIZE , + deflate ?QEMU_MADV_WILLNEED :QEMU_MADV_DONTNEED );#endif }
kvm-all.c +7 -8
@@ -1031,18 +1031,17 @@ int kvm_has_xcrs(void)void kvm_setup_guest_memory (void *start,size_t size) {if (!kvm_has_sync_mmu ()) { -#ifdef MADV_DONTFORK -int ret =madvise (start, size,MADV_DONTFORK ); +int ret =qemu_madvise (start, size,QEMU_MADV_DONTFORK ); +if (ret == -ENOTSUP ) { +fprintf (stderr, +"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); +exit (1 ); + }if (ret) { -perror ("madvice" ); +perror ("qemu_madvise" );exit (1 ); } -#else -fprintf (stderr, -"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); -exit (1 ); -#endif } }
osdep.c +18 -0
@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -35,6 +36,9 @@#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int );#endif #ifdef CONFIG_EVENTFD
@@ -139,6 +143,20 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +if (advice ==QEMU_MADV_INVALID ) { +return -ENOTSUP ; + } +#if defined(CONFIG_MADVISE ) +return madvise (addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) +return posix_madvise (addr, len, advice); +#else +return -ENOTSUP ; +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +35 -0
@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Quoted 173 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It will help with future porting though, and it simplifies most call sites.v5 -> v6:
* Replace two leftover instances ofPOSIX_MADV_NORMALwithQEMU_MADV_INVALID. Spotted by Blue Swirl.v4 -> v5:
* IntroduceQEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.
* Display configure check results.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>Cc Andrea Arcangeli <[email protected]>---
arch_init.c | 2 +-
configure | 33 +++++++++++++++++++++++++++++++++exec.c| 8 ++------hw/virtio-balloon.c| 4 ++--
kvm-all.c | 15 +++++++--------
osdep.c | 18 ++++++++++++++++++osdep.h| 35 +++++++++++++++++++++++++++++++++++vl.c| 3 ---8 files changed, 98 insertions(+), 20 deletions(-)arch_init.c +0
-0@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) #ifndef _WIN32if (ch == 0 &&
(!kvm_enabled() ||kvm_has_sync_mmu())) {
- madvise(host,TARGET_PAGE_SIZE,MADV_DONTNEED);
+ qemu_madvise(host,TARGET_PAGE_SIZE,QEMU_MADV_DONTNEED); }
#endif
} else if (flags &RAM_SAVE_FLAG_PAGE) {configure +0
-0@@ -2069,6 +2069,31 @@ if compile_prog "" "" ; thenfi
##########################################
configure +25
-0+# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullconfigure +0
-0@@ -2226,6 +2251,8 @@ echo "KVM support $kvm"echo "fdt support $fdt"
echo "preadv support $preadv"
echo "fdatasync $fdatasync"configure +2
-0+echo "madvise $madvise" +echo "posix_madvise $posix_madvise"echo "uuid support $uuid"
echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend"configure +0
-0@@ -2466,6 +2493,12 @@ fiif test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak
ficonfigure +6
-0+if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi# XXX: suppress that
if [ "$bsd" = "yes" ] ; thenexec.c +2
-6@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host = file_ram_alloc(new_block, size, mem_path); if (!new_block->host) { new_block->host = qemu_vmalloc(size); -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } #else fprintf(stderr, "-mem-path option unsupported\n");@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, #else new_block->host = qemu_vmalloc(size); #endif -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } }hw/virtio-balloon.c +2
-2@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) { #if defined(__linux__) if (!kvm_enabled() || kvm_has_sync_mmu()) - madvise(addr, TARGET_PAGE_SIZE, - deflate ? MADV_WILLNEED : MADV_DONTNEED); + qemu_madvise(addr, TARGET_PAGE_SIZE, + deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED); #endif }kvm-all.c +0
-0
kvm-all.c int kvm_has_xcrs(void) · line 1036
Quoted 8 lines
kvm-all.c +2
-2@@ -1031,18 +1031,17 @@ int kvm_has_xcrs(void) void kvm_setup_guest_memory(void *start, size_t size) { if (!kvm_has_sync_mmu()) { -#ifdef MADV_DONTFORK - int ret = madvise(start, size, MADV_DONTFORK); + int ret = qemu_madvise(start, size, QEMU_MADV_DONTFORK); + if (ret == -ENOTSUP) {
Sorry, I should have noticed this earlier, but madvise() actually returns 0 or -1 with error code in errno. Should we try to match that?
Am 15.09.2010 um 21:00 schrieb Blue Swirl:
Quoted 2 lines
madvise()actually
returns 0 or -1 with error code in errno. Should we try to match that?
posix_madvise() doesn't seem to... "otherwise, an error number shall be returned to indicate the error"
It documents EINVAL for invalid advice, and so does madvise. Are we using ENOTSUP knowingly?
Maybe return -1 and set errno to the posix_madvise() return code? (but is it errno = -retval or errno = retval then?)
Andreas
Quoted 7 lines · Andreas Färber
Am 15.09.2010 um 21:00 schrieb Blue Swirl:
Quoted 2 lines
madvise()actually
returns 0 or -1 with error code in errno. Should we try to match that?
posix_madvise()doesn't seem to... "otherwise, an error number shall be returned to indicate the error"
If we match posix_madvise(), then the wrapper function probably should become qemu_posix_madvise() and we should prefer posix_madvise() over madvise().
Quoted 2 lines
It documents EINVAL for invalid advice, and so does madvise. Are we using ENOTSUP knowingly?
Let's use EINVAL.
Quoted 2 lines
Maybe return -1 and set errno to the
posix_madvise()return code? (but is it errno = -retval or errno = retval then?)
An advantage of posix_madvise() semantics is that no mucking with errno is needed. Though existing code should be checked if they rely on madvise() semantics instead.
Am 15.09.2010 um 21:50 schrieb Blue Swirl:
Quoted 8 lines
On Wed, Sep 15, 2010 at 7:35 PM, Andreas Färber <[email protected]
Quoted 3 lines
wrote:
Maybe return -1 and set errno to theposix_madvise()return code? (but is it errno = -retval or errno = retval then?)An advantage of
posix_madvise()semantics is that no mucking with errno is needed. Though existing code should be checked if they rely onmadvise()semantics instead.
perror() after the MADV_DONTFORK failure does, right?
Andreas
PATCH v7 1/1 Introduce qemu_madvise()
In reply to Blue SwirlFrom: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c.
Haiku doesn't implement madvise() in favor of posix_madvise(). OpenBSD and Solaris 10 don't implement posix_madvise() but madvise().
Check for madvise() and posix_madvise() in configure and supply qemu_madvise() as wrapper. Prefer madvise() over posix_madvise() due to flag availability. Convert all callers to use qemu_madvise() and QEMU_MADV_*.
Note that on Solaris the warning is fixed by moving the madvise() prototype, not by qemu_madvise() itself. It helps with porting though, and it simplifies most call sites.
v6 -> v7:
* Adopt madvise() rather than posix_madvise() semantics for returning errors.
* Use EINVAL in place of ENOTSUP.
v5 -> v6:
* Replace two leftover instances of POSIX_MADV_NORMAL with QEMU_MADV_INVALID. Spotted by Blue Swirl.
v4 -> v5:
* Introduce QEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.
v3 -> v4:
* Eliminate #ifdefs at qemu_advise() call sites. Requested by Blue Swirl. This will currently break the check in kvm-all.c by calling madvise() with a supported flag, which will not fail. Ideas/patches welcome.
v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check for madvise(), too.
Add defines to Makefile, not QEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris' madvise() prototype around. Pointed out by Alexander Graf.
* Display configure check results.
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++------ hw/virtio-balloon.c | 4 ++-- kvm-all.c | 12 ++++-------- osdep.c | 20 ++++++++++++++++++++ osdep.h | 35 +++++++++++++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 97 insertions(+), 20 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +33 -0
@@ -2072,6 +2072,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
@@ -2238,6 +2263,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"
@@ -2478,6 +2505,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then
exec.c +2 -6
@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size); -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); }#else fprintf (stderr,"-mem-path option unsupported\n" );
@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,#else new_block->host =qemu_vmalloc (size);#endif -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); } }
hw/virtio-balloon.c +2 -2
@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) {#if defined(__linux__)if (!kvm_enabled () ||kvm_has_sync_mmu ()) -madvise (addr,TARGET_PAGE_SIZE , - deflate ?MADV_WILLNEED :MADV_DONTNEED ); +qemu_madvise (addr,TARGET_PAGE_SIZE , + deflate ?QEMU_MADV_WILLNEED :QEMU_MADV_DONTNEED );#endif }
kvm-all.c +4 -8
@@ -1031,18 +1031,14 @@ int kvm_has_xcrs(void)void kvm_setup_guest_memory (void *start,size_t size) {if (!kvm_has_sync_mmu ()) { -#ifdef MADV_DONTFORK -int ret =madvise (start, size,MADV_DONTFORK ); +int ret =qemu_madvise (start, size,QEMU_MADV_DONTFORK );if (ret) { -perror ("madvice" ); +perror ("qemu_madvise" ); +fprintf (stderr, +"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" );exit (1 ); } -#else -fprintf (stderr, -"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); -exit (1 ); -#endif } }
osdep.c +20 -0
@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -35,6 +36,9 @@#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int );#endif #ifdef CONFIG_EVENTFD
@@ -139,6 +143,22 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +if (advice ==QEMU_MADV_INVALID ) { + errno =EINVAL ; +return -1 ; + } +#if defined(CONFIG_MADVISE ) +return madvise (addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) +return posix_madvise (addr, len, advice); +#else + errno =EINVAL ; +return -1 ; +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +35 -0
@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Quoted 204 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It helps with porting though, and it simplifies most call sites.v6 -> v7:
* Adoptmadvise()rather thanposix_madvise()semantics for returning errors.
* Use EINVAL in place of ENOTSUP.v5 -> v6:
* Replace two leftover instances ofPOSIX_MADV_NORMALwithQEMU_MADV_INVALID. Spotted by Blue Swirl.v4 -> v5:
* IntroduceQEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.
* Display configure check results.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>Cc Andrea Arcangeli <[email protected]>---
arch_init.c | 2 +-
configure | 33 +++++++++++++++++++++++++++++++++exec.c| 8 ++------hw/virtio-balloon.c| 4 ++--
kvm-all.c | 12 ++++--------
osdep.c | 20 ++++++++++++++++++++osdep.h| 35 +++++++++++++++++++++++++++++++++++vl.c| 3 ---8 files changed, 97 insertions(+), 20 deletions(-)arch_init.c +0
-0@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) #ifndef _WIN32if (ch == 0 &&
(!kvm_enabled() ||kvm_has_sync_mmu())) {
- madvise(host,TARGET_PAGE_SIZE,MADV_DONTNEED);
+ qemu_madvise(host,TARGET_PAGE_SIZE,QEMU_MADV_DONTNEED); }
#endif
} else if (flags &RAM_SAVE_FLAG_PAGE) {configure +0
-0@@ -2072,6 +2072,31 @@ if compile_prog "" "" ; thenfi
##########################################
configure +25
-0+# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullconfigure +0
-0@@ -2238,6 +2263,8 @@ echo "KVM support $kvm"echo "fdt support $fdt"
echo "preadv support $preadv"
echo "fdatasync $fdatasync"configure +2
-0+echo "madvise $madvise" +echo "posix_madvise $posix_madvise"echo "uuid support $uuid"
echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend"configure +0
-0@@ -2478,6 +2505,12 @@ fiif test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak
ficonfigure +6
-0+if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi# XXX: suppress that
if [ "$bsd" = "yes" ] ; thenexec.c +2
-6@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host = file_ram_alloc(new_block, size, mem_path); if (!new_block->host) { new_block->host = qemu_vmalloc(size); -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } #else fprintf(stderr, "-mem-path option unsupported\n");@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, #else new_block->host = qemu_vmalloc(size); #endif -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } }hw/virtio-balloon.c +2
-2@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) { #if defined(__linux__) if (!kvm_enabled() || kvm_has_sync_mmu()) - madvise(addr, TARGET_PAGE_SIZE, - deflate ? MADV_WILLNEED : MADV_DONTNEED); + qemu_madvise(addr, TARGET_PAGE_SIZE, + deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED); #endif }kvm-all.c +4
-8@@ -1031,18 +1031,14 @@ int kvm_has_xcrs(void) void kvm_setup_guest_memory(void *start, size_t size) { if (!kvm_has_sync_mmu()) { -#ifdef MADV_DONTFORK - int ret = madvise(start, size, MADV_DONTFORK); + int ret = qemu_madvise(start, size, QEMU_MADV_DONTFORK); if (ret) { - perror("madvice"); + perror("qemu_madvise"); + fprintf(stderr, + "Need MADV_DONTFORK in absence of synchronous KVM MMU\n"); exit(1); } -#else - fprintf(stderr, - "Need MADV_DONTFORK in absence of synchronous KVM MMU\n"); - exit(1); -#endif } }osdep.c +0
-0
osdep.c line 31
Quoted 4 lines
osdep.c +1
-0@@ -28,6 +28,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h>
With the patch applied, I get a warning here with mingw from Debian stable:
CC osdep.o
/src/qemu/osdep.c:31:22: error: sys/mman.h: No such file or directory
For some reason, it doesn't happen with newer mingw from Debian testing.
Am 20.09.2010 um 22:33 schrieb Blue Swirl:
Quoted 77 lines
On Sun, Sep 19, 2010 at 10:11 AM, Andreas Färber <[email protected]
Quoted 67 lines
wrote:
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It helps with porting though, and it simplifies most call sites.v6 -> v7:
* Adoptmadvise()rather thanposix_madvise()semantics for returning errors.
* Use EINVAL in place of ENOTSUP.v5 -> v6:
* Replace two leftover instances ofPOSIX_MADV_NORMALwithQEMU_MADV_INVALID. Spotted by Blue Swirl.v4 -> v5:
* IntroduceQEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with
a supported flag, which will not fail. Ideas/patches welcome.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.
* Display configure check results.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>Cc Andrea Arcangeli <[email protected]>--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++------ hw/virtio-balloon.c | 4 ++-- kvm-all.c | 12 ++++-------- osdep.c | 20 ++++++++++++++++++++ osdep.h | 35 +++++++++++++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 97 insertions(+), 20 deletions(-)osdep.c +0
-0osdep.c line 31
Quoted 4 lines
osdep.c +1
-0@@ -28,6 +28,7 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> With the patch applied, I get a warning here with mingw from Debian stable:
CC osdep.o
/src/qemu/osdep.c:31:22: error:sys/mman.h: No such file or directory
Quoted 1 line
For some reason, it doesn't happen with newer mingw from Debian testing.
Any suggestions what to do about that? Would it work without, i.e. could we enclose it in #ifndef _WIN32?
Andreas
Quoted 89 lines · Andreas Färber
Am 20.09.2010 um 22:33 schrieb Blue Swirl:
Quoted 87 lines
Quoted 75 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise().Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()
as wrapper. Prefermadvise()overposix_madvise()due to flag availability.
Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype,
not byqemu_madvise()itself. It helps with porting though, and it simplifies
most call sites.v6 -> v7:
* Adoptmadvise()rather thanposix_madvise()semantics for returning errors.
* Use EINVAL in place of ENOTSUP.v5 -> v6:
* Replace two leftover instances ofPOSIX_MADV_NORMALwithQEMU_MADV_INVALID.
Spotted by Blue Swirl.v4 -> v5:
* IntroduceQEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with
a supported flag, which will not fail. Ideas/patches welcome.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.
* Display configure check results.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>Cc Andrea Arcangeli <[email protected]>---
arch_init.c | 2 +-
configure | 33 +++++++++++++++++++++++++++++++++exec.c| 8 ++------hw/virtio-balloon.c| 4 ++--
kvm-all.c | 12 ++++--------
osdep.c | 20 ++++++++++++++++++++osdep.h| 35 +++++++++++++++++++++++++++++++++++vl.c| 3 ---8 files changed, 97 insertions(+), 20 deletions(-)osdep.c +0
-0osdep.c line 31
Quoted 4 lines
osdep.c +1
-0@@ -28,6 +28,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <sys/mman.h> With the patch applied, I get a warning here with mingw from Debian stable:
CC osdep.o
/src/qemu/osdep.c:31:22: error:sys/mman.h: No such file or directory
Quoted 4 lines
Quoted 1 line
For some reason, it doesn't happen with newer mingw from Debian testing.
Any suggestions what to do about that? Would it work without, i.e. could we enclose it in #ifndef
_WIN32?
There's no madvise in mingw, so either that or #if defined(CONFIG_MADVISE) || defined(CONFIG_POSIX_MADVISE).
PATCH v8 1/1 Introduce qemu_madvise()
From: Andreas Färber <[email protected]>
vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c.
Haiku doesn't implement madvise() in favor of posix_madvise(). OpenBSD and Solaris 10 don't implement posix_madvise() but madvise(). MinGW implements neither.
Check for madvise() and posix_madvise() in configure and supply qemu_madvise() as wrapper. Prefer madvise() over posix_madvise() due to flag availability. Convert all callers to use qemu_madvise() and QEMU_MADV_*.
Note that on Solaris the warning is fixed by moving the madvise() prototype, not by qemu_madvise() itself. It helps with porting though, and it simplifies most call sites.
v7 -> v8:
* Some versions of MinGW have no sys/mman.h header. Reported by Blue Swirl.
v6 -> v7:
* Adopt madvise() rather than posix_madvise() semantics for returning errors.
* Use EINVAL in place of ENOTSUP.
v5 -> v6:
* Replace two leftover instances of POSIX_MADV_NORMAL with QEMU_MADV_INVALID. Spotted by Blue Swirl.
v4 -> v5:
* Introduce QEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.
v3 -> v4:
* Eliminate #ifdefs at qemu_advise() call sites. Requested by Blue Swirl. This will currently break the check in kvm-all.c by calling madvise() with a supported flag, which will not fail. Ideas/patches welcome.
v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check for madvise(), too.
Add defines to Makefile, not QEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris' madvise() prototype around. Pointed out by Alexander Graf.
* Display configure check results.
v1 -> v2:
* Don't rely on posix_madvise() availability, add qemu_madvise(). Suggested by Blue Swirl.
--- arch_init.c | 2 +- configure | 33 +++++++++++++++++++++++++++++++++ exec.c | 8 ++------ hw/virtio-balloon.c | 4 ++-- kvm-all.c | 12 ++++-------- osdep.c | 22 ++++++++++++++++++++++ osdep.h | 35 +++++++++++++++++++++++++++++++++++ vl.c | 3 --- 8 files changed, 99 insertions(+), 20 deletions(-)
arch_init.c +1 -1
@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)#ifndef _WIN32if (ch ==0 && (!kvm_enabled () ||kvm_has_sync_mmu ())) { -madvise (host,TARGET_PAGE_SIZE ,MADV_DONTNEED ); +qemu_madvise (host,TARGET_PAGE_SIZE ,QEMU_MADV_DONTNEED ); }#endif }else if (flags &RAM_SAVE_FLAG_PAGE ) {
configure +33 -0
@@ -2072,6 +2072,31 @@ if compile_prog "" "" ; then fi ########################################## +# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################## # check if trace backend exists sh "$source_path/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null
@@ -2238,6 +2263,8 @@ echo "KVM support $kvm" echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" +echo "madvise $madvise" +echo "posix_madvise $posix_madvise" echo "uuid support $uuid" echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend"
@@ -2478,6 +2505,12 @@ fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi +if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then
exec.c +2 -6
@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host =file_ram_alloc (new_block, size, mem_path);if (!new_block->host) { new_block->host =qemu_vmalloc (size); -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); }#else fprintf (stderr,"-mem-path option unsupported\n" );
@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,#else new_block->host =qemu_vmalloc (size);#endif -#ifdef MADV_MERGEABLE -madvise (new_block->host, size,MADV_MERGEABLE ); -#endif +qemu_madvise (new_block->host, size,QEMU_MADV_MERGEABLE ); } }
hw/virtio-balloon.c +2 -2
@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) {#if defined(__linux__)if (!kvm_enabled () ||kvm_has_sync_mmu ()) -madvise (addr,TARGET_PAGE_SIZE , - deflate ?MADV_WILLNEED :MADV_DONTNEED ); +qemu_madvise (addr,TARGET_PAGE_SIZE , + deflate ?QEMU_MADV_WILLNEED :QEMU_MADV_DONTNEED );#endif }
kvm-all.c +4 -8
@@ -1031,18 +1031,14 @@ int kvm_has_xcrs(void)void kvm_setup_guest_memory (void *start,size_t size) {if (!kvm_has_sync_mmu ()) { -#ifdef MADV_DONTFORK -int ret =madvise (start, size,MADV_DONTFORK ); +int ret =qemu_madvise (start, size,QEMU_MADV_DONTFORK );if (ret) { -perror ("madvice" ); +perror ("qemu_madvise" ); +fprintf (stderr, +"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" );exit (1 ); } -#else -fprintf (stderr, -"Need MADV_DONTFORK in absence of synchronous KVM MMU\n" ); -exit (1 ); -#endif } }
osdep.c +22 -0
@@ -28,6 +28,9 @@#include <errno.h> #include <unistd.h> #include <fcntl.h> +#if defined(CONFIG_MADVISE ) || defined(CONFIG_POSIX_MADVISE ) +#include <sys/mman.h> +#endif /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"
@@ -35,6 +38,9 @@#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int );#endif #ifdef CONFIG_EVENTFD
@@ -139,6 +145,22 @@ void qemu_vfree(void *ptr)#endif +int qemu_madvise (void *addr,size_t len,int advice) +{ +if (advice ==QEMU_MADV_INVALID ) { + errno =EINVAL ; +return -1 ; + } +#if defined(CONFIG_MADVISE ) +return madvise (addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) +return posix_madvise (addr, len, advice); +#else + errno =EINVAL ; +return -1 ; +#endif +} +int qemu_create_pidfile (const char *filename) {char buffer[128 ];
osdep.h +35 -0
@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size);void *qemu_vmalloc (size_t size);void qemu_vfree (void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); +int qemu_create_pidfile (const char *filename);#ifdef _WIN32
vl.c +0 -3
@@ -80,9 +80,6 @@#include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int );#endif #endif #endif
Signature · 1 line
1.7.2.2
Blue Swirl
AppliedThanks, applied. I moved the include line below #include "config-host.h", otherwise CONFIG_xx would have been undefined.
Quoted 314 lines · Andreas Färber
From: Andreas Färber <[email protected]>
vl.chas a Sun-specific hack to supply a prototype formadvise(), but the call site has apparently moved toarch_init.c.Haiku doesn't implement
madvise()in favor ofposix_madvise(). OpenBSD and Solaris 10 don't implementposix_madvise()butmadvise(). MinGW implements neither.Check for
madvise()andposix_madvise()in configure and supplyqemu_madvise()as wrapper. Prefermadvise()overposix_madvise()due to flag availability. Convert all callers to useqemu_madvise()and QEMU_MADV_*.Note that on Solaris the warning is fixed by moving the
madvise()prototype, not byqemu_madvise()itself. It helps with porting though, and it simplifies most call sites.v7 -> v8:
* Some versions of MinGW have nosys/mman.hheader. Reported by Blue Swirl.v6 -> v7:
* Adoptmadvise()rather thanposix_madvise()semantics for returning errors.
* Use EINVAL in place of ENOTSUP.v5 -> v6:
* Replace two leftover instances ofPOSIX_MADV_NORMALwithQEMU_MADV_INVALID. Spotted by Blue Swirl.v4 -> v5:
* IntroduceQEMU_MADV_INVALID, suggested by Alexander Graf. Note that this relies on -1 not being a valid advice value.v3 -> v4:
* Eliminate #ifdefs atqemu_advise()call sites. Requested by Blue Swirl. This will currently break the check inkvm-all.cby callingmadvise()with a supported flag, which will not fail. Ideas/patches welcome.v2 -> v3:
* Reuse the *_MADV_* defines for QEMU_MADV_*. Suggested by Alexander Graf.
* Add configure check formadvise(), too.
Add defines toMakefile, notQEMU_CFLAGS.
Convert all callers, untested. Suggested by Blue Swirl.
* Keep Solaris'madvise()prototype around. Pointed out by Alexander Graf.
* Display configure check results.v1 -> v2:
* Don't rely onposix_madvise()availability, addqemu_madvise(). Suggested by Blue Swirl.Signed-off-by Andreas Färber <[email protected]>Cc Blue Swirl <[email protected]>Cc Alexander Graf <[email protected]>Cc Andrea Arcangeli <[email protected]>---
arch_init.c | 2 +-
configure | 33 +++++++++++++++++++++++++++++++++exec.c| 8 ++------hw/virtio-balloon.c| 4 ++--
kvm-all.c | 12 ++++--------
osdep.c | 22 ++++++++++++++++++++++osdep.h| 35 +++++++++++++++++++++++++++++++++++vl.c| 3 ---8 files changed, 99 insertions(+), 20 deletions(-)arch_init.c +0
-0@@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) #ifndef _WIN32if (ch == 0 &&
(!kvm_enabled() ||kvm_has_sync_mmu())) {
- madvise(host,TARGET_PAGE_SIZE,MADV_DONTNEED);
+ qemu_madvise(host,TARGET_PAGE_SIZE,QEMU_MADV_DONTNEED); }
#endif
} else if (flags &RAM_SAVE_FLAG_PAGE) {configure +0
-0@@ -2072,6 +2072,31 @@ if compile_prog "" "" ; thenfi
##########################################
configure +25
-0+# check if we have madvise + +madvise=no +cat > $TMPC << EOF +#include <sys/types.h> +#include <sys/mman.h> +int main(void) { return madvise(NULL, 0, MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + madvise=yes +fi + +########################################## +# check if we have posix_madvise + +posix_madvise=no +cat > $TMPC << EOF +#include <sys/mman.h> +int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); } +EOF +if compile_prog "" "" ; then + posix_madvise=yes +fi + +########################################### check if trace backend existssh "$source_path/tracetool" "--$trace_backend" --check-backend >
/dev/null2>/dev/nullconfigure +0
-0@@ -2238,6 +2263,8 @@ echo "KVM support $kvm"echo "fdt support $fdt"
echo "preadv support $preadv"
echo "fdatasync $fdatasync"configure +2
-0+echo "madvise $madvise" +echo "posix_madvise $posix_madvise"echo "uuid support $uuid"
echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend"configure +0
-0@@ -2478,6 +2505,12 @@ fiif test "$fdatasync" = "yes" ; then
echo "CONFIG_FDATASYNC=y" >> $config_host_mak
ficonfigure +6
-0+if test "$madvise" = "yes" ; then + echo "CONFIG_MADVISE=y" >> $config_host_mak +fi +if test "$posix_madvise" = "yes" ; then + echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak +fi# XXX: suppress that
if [ "$bsd" = "yes" ] ; thenexec.c +2
-6@@ -2841,9 +2841,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, new_block->host = file_ram_alloc(new_block, size, mem_path); if (!new_block->host) { new_block->host = qemu_vmalloc(size); -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } #else fprintf(stderr, "-mem-path option unsupported\n");@@ -2858,9 +2856,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, #else new_block->host = qemu_vmalloc(size); #endif -#ifdef MADV_MERGEABLE - madvise(new_block->host, size, MADV_MERGEABLE); -#endif + qemu_madvise(new_block->host, size, QEMU_MADV_MERGEABLE); } }hw/virtio-balloon.c +2
-2@@ -51,8 +51,8 @@ static void balloon_page(void *addr, int deflate) { #if defined(__linux__) if (!kvm_enabled() || kvm_has_sync_mmu()) - madvise(addr, TARGET_PAGE_SIZE, - deflate ? MADV_WILLNEED : MADV_DONTNEED); + qemu_madvise(addr, TARGET_PAGE_SIZE, + deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED); #endif }kvm-all.c +4
-8@@ -1031,18 +1031,14 @@ int kvm_has_xcrs(void) void kvm_setup_guest_memory(void *start, size_t size) { if (!kvm_has_sync_mmu()) { -#ifdef MADV_DONTFORK - int ret = madvise(start, size, MADV_DONTFORK); + int ret = qemu_madvise(start, size, QEMU_MADV_DONTFORK); if (ret) { - perror("madvice"); + perror("qemu_madvise"); + fprintf(stderr, + "Need MADV_DONTFORK in absence of synchronous KVM MMU\n"); exit(1); } -#else - fprintf(stderr, - "Need MADV_DONTFORK in absence of synchronous KVM MMU\n"); - exit(1); -#endif } }osdep.c +22
-0@@ -28,6 +28,9 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#if defined(CONFIG_MADVISE ) || defined(CONFIG_POSIX_MADVISE ) +#include <sys/mman.h> +#endif /* Needed early for CONFIG_BSD etc. */ #include "config-host.h"@@ -35,6 +38,9 @@ #ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> +/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for +discussion about Solaris header problems */ +extern int madvise (caddr_t ,size_t ,int ); #endif #ifdef CONFIG_EVENTFD@@ -139,6 +145,22 @@ void qemu_vfree(void *ptr) #endif +int qemu_madvise (void *addr,size_t len,int advice) +{ + if (advice == QEMU_MADV_INVALID) { + errno = EINVAL; + return -1; + } +#if defined(CONFIG_MADVISE ) + return madvise(addr, len, advice); +#elif defined(CONFIG_POSIX_MADVISE ) + return posix_madvise(addr, len, advice); +#else + errno = EINVAL; + return -1; +#endif +} + int qemu_create_pidfile(const char *filename) { char buffer[128];osdep.h +35
-0@@ -90,6 +90,41 @@ void *qemu_memalign(size_t alignment, size_t size); void *qemu_vmalloc(size_t size); void qemu_vfree(void *ptr); +#define QEMU_MADV_INVALID -1 + +#if defined(CONFIG_MADVISE ) + +#define QEMU_MADV_WILLNEED MADV_WILLNEED +#define QEMU_MADV_DONTNEED MADV_DONTNEED +#ifdef MADV_DONTFORK +#define QEMU_MADV_DONTFORK MADV_DONTFORK +#else +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#endif +#ifdef MADV_MERGEABLE +#define QEMU_MADV_MERGEABLE MADV_MERGEABLE +#else +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID +#endif + +#elif defined(CONFIG_POSIX_MADVISE ) + +#define QEMU_MADV_WILLNEED POSIX_MADV_WILLNEED +#define QEMU_MADV_DONTNEED POSIX_MADV_DONTNEED +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#else /* no-op */ + +#define QEMU_MADV_WILLNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTNEED QEMU_MADV_INVALID +#define QEMU_MADV_DONTFORK QEMU_MADV_INVALID +#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID + +#endif + +int qemu_madvise (void *addr,size_t len,int advice); + int qemu_create_pidfile(const char *filename); #ifdef _WIN32vl.c +0
-4@@ -80,9 +80,6 @@ #include <net/if.h> #include <syslog.h> #include <stropts.h> -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for -discussion about Solaris header problems */ -extern int madvise (caddr_t ,size_t ,int ); #endif #endif #endif --1.7.2.2