mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support running QEMU on Valgrind

Browse Source 
Valgrind is a tool which can automatically detect many kinds of bugs.

Running QEMU on Valgrind with x86_64 hosts was not possible because
Valgrind aborts when memalign is called with an alignment larger than
1 MiB. QEMU normally uses 2 MiB on Linux x86_64.

Now the alignment is reduced to the page size when QEMU is running on
Valgrind.

v2:
Instead of using the macro RUNNING_ON_VALGRIND from valgrind.h,
the patch now uses a hack from libvirt which tests for the pre-loaded
vgpreload_*.so shared libraries. This avoids the need for valgrind.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Stefan Weil 2011-10-31 21:29:46 +01:00 committed by Anthony Liguori
parent ec38d39827
commit c2a8238a2c
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
oslib-posix.c
View File

@ -36,8 +36,11 @@ extern int daemon(int, int);
#endif #endif
#if defined(__linux__) && defined(__x86_64__) #if defined(__linux__) && defined(__x86_64__)
/* Use 2MB alignment so transparent hugepages can be used by KVM */ /* Use 2 MiB alignment so transparent hugepages can be used by KVM.
Valgrind does not support alignments larger than 1 MiB,
therefore we need special code which handles running on Valgrind. */
# define QEMU_VMALLOC_ALIGN (512 * 4096) # define QEMU_VMALLOC_ALIGN (512 * 4096)
# define CONFIG_VALGRIND
#else #else
# define QEMU_VMALLOC_ALIGN getpagesize() # define QEMU_VMALLOC_ALIGN getpagesize()
#endif #endif
@ -47,7 +50,11 @@ extern int daemon(int, int);
#include "trace.h" #include "trace.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#if defined(CONFIG_VALGRIND)
static int running_on_valgrind = -1;
#else
# define running_on_valgrind 0
#endif
int qemu_daemon(int nochdir, int noclose) int qemu_daemon(int nochdir, int noclose)
{ {
@ -89,7 +96,16 @@ void *qemu_vmalloc(size_t size)
void *ptr; void *ptr;
size_t align = QEMU_VMALLOC_ALIGN; size_t align = QEMU_VMALLOC_ALIGN;
if (size < align) { #if defined(CONFIG_VALGRIND)
if (running_on_valgrind < 0) {
/* First call, test whether we are running on Valgrind.
This is a substitute for RUNNING_ON_VALGRIND from valgrind.h. */
const char *ld = getenv("LD_PRELOAD");
running_on_valgrind = (ld != NULL && strstr(ld, "vgpreload"));
}
#endif
if (size < align || running_on_valgrind) {
align = getpagesize(); align = getpagesize();
} }
ptr = qemu_memalign(align, size); ptr = qemu_memalign(align, size);