proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-14 21:35:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.qemu.org/qemu

Browse Source
This commit is contained in:
malc 2011-12-12 00:47:40 +04:00
commit 5bf1356026
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/bsdload.c
View File

@ -196,7 +196,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
/* Something went wrong, return the inode and free the argument pages*/ /* Something went wrong, return the inode and free the argument pages*/
for (i=0 ; i<MAX_ARG_PAGES ; i++) { for (i=0 ; i<MAX_ARG_PAGES ; i++) {
free(bprm.page[i]); g_free(bprm.page[i]);
} }
return(retval); return(retval);
} }

5
bsd-user/elfload.c
View File

@ -641,8 +641,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page,
offset = p % TARGET_PAGE_SIZE; offset = p % TARGET_PAGE_SIZE;
pag = (char *)page[p/TARGET_PAGE_SIZE]; pag = (char *)page[p/TARGET_PAGE_SIZE];
if (!pag) { if (!pag) {
pag = (char *)malloc(TARGET_PAGE_SIZE); pag = g_try_malloc0(TARGET_PAGE_SIZE);
memset(pag, 0, TARGET_PAGE_SIZE);
page[p/TARGET_PAGE_SIZE] = pag; page[p/TARGET_PAGE_SIZE] = pag;
if (!pag) if (!pag)
return 0; return 0;
@ -696,7 +695,7 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm,
info->rss++; info->rss++;
/* FIXME - check return value of memcpy_to_target() for failure */ /* FIXME - check return value of memcpy_to_target() for failure */
memcpy_to_target(stack_base, bprm->page[i], TARGET_PAGE_SIZE); memcpy_to_target(stack_base, bprm->page[i], TARGET_PAGE_SIZE);
free(bprm->page[i]); g_free(bprm->page[i]);
} }
stack_base += TARGET_PAGE_SIZE; stack_base += TARGET_PAGE_SIZE;
} }

5
configure vendored
View File

@ -1111,7 +1111,7 @@ fi
if test "$pie" = ""; then if test "$pie" = ""; then
case "$cpu-$targetos" in case "$cpu-$targetos" in
i386-Linux|x86_64-Linux) i386-Linux|x86_64-Linux|i386-OpenBSD|x86_64-OpenBSD)
;; ;;
*) *)
pie="no" pie="no"
@ -1523,9 +1523,6 @@ EOF
if compile_prog "$sdl_cflags" "$sdl_libs" ; then if compile_prog "$sdl_cflags" "$sdl_libs" ; then
sdl_libs="$sdl_libs -lX11" sdl_libs="$sdl_libs -lX11"
fi fi
if test "$mingw32" = "yes" ; then
sdl_libs="`echo $sdl_libs | sed s/-mwindows//g` -mconsole"
fi
libs_softmmu="$sdl_libs $libs_softmmu" libs_softmmu="$sdl_libs $libs_softmmu"
fi fi

6
exec.c
View File

@ -1603,8 +1603,10 @@ void cpu_set_log(int log_flags)
static char logfile_buf[4096]; static char logfile_buf[4096];
setvbuf(logfile, logfile_buf, _IOLBF, sizeof(logfile_buf)); setvbuf(logfile, logfile_buf, _IOLBF, sizeof(logfile_buf));
} }
#elif !defined(_WIN32) #elif defined(_WIN32)
/* Win32 doesn't support line-buffering and requires size >= 2 */ /* Win32 doesn't support line-buffering, so use unbuffered output. */
setvbuf(logfile, NULL, _IONBF, 0);
#else
setvbuf(logfile, NULL, _IOLBF, 0); setvbuf(logfile, NULL, _IOLBF, 0);
#endif #endif
log_append = 1; log_append = 1;