OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'mdroth/qga-pull-5-29-12-v2' into staging

Browse Source 
* mdroth/qga-pull-5-29-12-v2:
  qemu-ga: avoid blocking on atime update when reading /etc/mtab
  qemu-ga: Fix use of environ on Darwin
This commit is contained in:
Anthony Liguori 2012-05-30 15:02:03 +08:00
commit d6111501c1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qga/commands-posix.c
View File

@ -22,8 +22,13 @@
#include "host-utils.h" #include "host-utils.h"
#ifndef CONFIG_HAS_ENVIRON #ifndef CONFIG_HAS_ENVIRON
#ifdef __APPLE__
#include <crt_externs.h>
#define environ (*_NSGetEnviron())
#else
extern char **environ; extern char **environ;
#endif #endif
#endif
#if defined(__linux__) #if defined(__linux__)
#include <mntent.h> #include <mntent.h>
@ -340,7 +345,7 @@ static int guest_fsfreeze_build_mount_list(GuestFsfreezeMountList *mounts)
{ {
struct mntent *ment; struct mntent *ment;
GuestFsfreezeMount *mount; GuestFsfreezeMount *mount;
char const *mtab = MOUNTED; char const *mtab = "/proc/self/mounts";
FILE *fp; FILE *fp;
fp = setmntent(mtab, "r"); fp = setmntent(mtab, "r");