vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mdroth/qga-pull-10-9-12' into staging 

* mdroth/qga-pull-10-9-12:
  qemu-ga: ga_open_pidfile(): add new line to pidfile
  qemu-ga: use state dir from CONFIG_QEMU_LOCALSTATEDIR
  configure: add --localstatedir
master
Anthony Liguori 2012-10-12 09:14:23 -05:00
parent 557e01a3f9 9d6f1b73f8
commit 453162e132
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -185,6 +185,7 @@ libdir="\${prefix}/lib"
libexecdir="\${prefix}/libexec" libexecdir="\${prefix}/libexec"
includedir="\${prefix}/include" includedir="\${prefix}/include"
sysconfdir="\${prefix}/etc" sysconfdir="\${prefix}/etc"
local_statedir="\${prefix}/var"
confsuffix="/qemu" confsuffix="/qemu"
slirp="yes" slirp="yes"
fmod_lib="" fmod_lib=""
@ -554,6 +555,7 @@ EOF
qemu_docdir="\${prefix}" qemu_docdir="\${prefix}"
bindir="\${prefix}" bindir="\${prefix}"
sysconfdir="\${prefix}" sysconfdir="\${prefix}"
local_statedir="\${prefix}"
confsuffix="" confsuffix=""
libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga" libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga"
fi fi
@ -630,7 +632,9 @@ for opt do
;; ;;
--sysconfdir=*) sysconfdir="$optarg" --sysconfdir=*) sysconfdir="$optarg"
;; ;;
--sbindir=*|--sharedstatedir=*|--localstatedir=*|\ --localstatedir=*) local_statedir="$optarg"
;;
--sbindir=*|--sharedstatedir=*|\
--oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\ --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
--htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*) --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
# These switches are silently ignored, for compatibility with # These switches are silently ignored, for compatibility with
@ -1028,6 +1032,7 @@ echo " --datadir=PATH install firmware in PATH$confsuffix"
echo " --docdir=PATH install documentation in PATH$confsuffix" echo " --docdir=PATH install documentation in PATH$confsuffix"
echo " --bindir=PATH install binaries in PATH" echo " --bindir=PATH install binaries in PATH"
echo " --sysconfdir=PATH install config in PATH$confsuffix" echo " --sysconfdir=PATH install config in PATH$confsuffix"
echo " --localstatedir=PATH install local state in PATH"
echo " --with-confsuffix=SUFFIX suffix for QEMU data inside datadir and sysconfdir [$confsuffix]" echo " --with-confsuffix=SUFFIX suffix for QEMU data inside datadir and sysconfdir [$confsuffix]"
echo " --enable-debug-tcg enable TCG debugging" echo " --enable-debug-tcg enable TCG debugging"
echo " --disable-debug-tcg disable TCG debugging (default)" echo " --disable-debug-tcg disable TCG debugging (default)"
@ -3111,6 +3116,7 @@ echo "library directory `eval echo $libdir`"
echo "libexec directory `eval echo $libexecdir`" echo "libexec directory `eval echo $libexecdir`"
echo "include directory `eval echo $includedir`" echo "include directory `eval echo $includedir`"
echo "config directory `eval echo $sysconfdir`" echo "config directory `eval echo $sysconfdir`"
echo "local state directory `eval echo $local_statedir`"
if test "$mingw32" = "no" ; then if test "$mingw32" = "no" ; then
echo "Manual directory `eval echo $mandir`" echo "Manual directory `eval echo $mandir`"
echo "ELF interp prefix $interp_prefix" echo "ELF interp prefix $interp_prefix"
@ -3220,6 +3226,7 @@ echo "sysconfdir=$sysconfdir" >> $config_host_mak
echo "qemu_confdir=$qemu_confdir" >> $config_host_mak echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
echo "qemu_docdir=$qemu_docdir" >> $config_host_mak echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak

6
qemu-ga.c
View File

@ -40,8 +40,8 @@
#else #else
#define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0" #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0"
#endif #endif
#define QGA_PIDFILE_DEFAULT "/var/run/qemu-ga.pid" #define QGA_STATEDIR_DEFAULT CONFIG_QEMU_LOCALSTATEDIR "/run"
#define QGA_STATEDIR_DEFAULT "/tmp" #define QGA_PIDFILE_DEFAULT QGA_STATEDIR_DEFAULT "/qemu-ga.pid"
#define QGA_SENTINEL_BYTE 0xFF #define QGA_SENTINEL_BYTE 0xFF
struct GAState { struct GAState {
@ -255,7 +255,7 @@ static bool ga_open_pidfile(const char *pidfile)
g_critical("Failed to truncate pid file"); g_critical("Failed to truncate pid file");
goto fail; goto fail;
} }
sprintf(pidstr, "%d", getpid()); snprintf(pidstr, sizeof(pidstr), "%d\n", getpid());
if (write(pidfd, pidstr, strlen(pidstr)) != strlen(pidstr)) { if (write(pidfd, pidstr, strlen(pidstr)) != strlen(pidstr)) {
g_critical("Failed to write pid file"); g_critical("Failed to write pid file");
goto fail; goto fail;