Commit d6111501 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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
parents eba25057 9e2fa418

qga/commands-posix.c

+6 −1
Original line number Diff line number Diff line
@@ -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 @@ static int guest_fsfreeze_build_mount_list(GuestFsfreezeMountList *mounts) 
{

    struct mntent *ment;

    GuestFsfreezeMount *mount;

    char const *mtab = MOUNTED;

    char const *mtab = "/proc/self/mounts";

    FILE *fp;



    fp = setmntent(mtab, "r");