commit d6111501c15972e48b20a60ab0fdd726e84a3ed1
author Anthony Liguori <aliguori@us.ibm.com> Wed May 30 15:02:03 2012 +0800
committer Anthony Liguori <aliguori@us.ibm.com> Wed May 30 15:02:03 2012 +0800
tree 9a62891981a2f89dd2a73bf58134bf6aad7471d2
parent eba25057b9a5e19d10ace2bc7716667a31297169
parent 9e2fa418fbe71dd472fe5a9cd89ca26d5b594920

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

* 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

qga/commands-posix.c

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index dab3bf9..00d035d 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -22,8 +22,13 @@
 #include "host-utils.h"
 
 #ifndef CONFIG_HAS_ENVIRON
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
 extern char **environ;
 #endif
+#endif
 
 #if defined(__linux__)
 #include <mntent.h>
@@ -340,7 +345,7 @@
 {
     struct mntent *ment;
     GuestFsfreezeMount *mount;
-    char const *mtab = MOUNTED;
+    char const *mtab = "/proc/self/mounts";
     FILE *fp;
 
     fp = setmntent(mtab, "r");