External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 15:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: virdaemon: fix compilation on mingw

Browse Source 
The daemons are not supported on Win32 and therefore were not compiled
in that platform. However, with the daemon code sharing, all the code in
utils *is* compiled and it failed because `waitpid`, `fork`, and
`setsid` are not available. So, as before, let's not build them on
Win32 and make the code more portable by using existing vir* wrappers.

Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Rafael Fonseca 2020-03-27 18:40:47 +01:00 committed by Michal Privoznik
parent cab35ae380
commit c360ea28dc
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/util/virdaemon.c
View File

@ -20,9 +20,7 @@
#include <config.h> #include <config.h>
#include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <stdbool.h> #include <stdbool.h>
@ -32,9 +30,13 @@
#include "virfile.h" #include "virfile.h"
#include "virlog.h" #include "virlog.h"
#include "viralloc.h" #include "viralloc.h"
#include "virprocess.h"
#include "vircommand.h"
#include "configmake.h" #include "configmake.h"
#ifndef WIN32
int int
virDaemonForkIntoBackground(const char *argv0) virDaemonForkIntoBackground(const char *argv0)
{ {
@ -42,7 +44,7 @@ virDaemonForkIntoBackground(const char *argv0)
if (virPipeQuiet(statuspipe) < 0) if (virPipeQuiet(statuspipe) < 0)
return -1; return -1;
pid_t pid = fork(); pid_t pid = virFork();
switch (pid) { switch (pid) {
case 0: case 0:
{ {
@ -71,7 +73,7 @@ virDaemonForkIntoBackground(const char *argv0)
if (setsid() < 0) if (setsid() < 0)
goto cleanup; goto cleanup;
nextpid = fork(); nextpid = virFork();
switch (nextpid) { switch (nextpid) {
case 0: /* grandchild */ case 0: /* grandchild */
return statuspipe[1]; return statuspipe[1];
@ -102,7 +104,7 @@ virDaemonForkIntoBackground(const char *argv0)
VIR_FORCE_CLOSE(statuspipe[1]); VIR_FORCE_CLOSE(statuspipe[1]);
/* We wait to make sure the first child forked successfully */ /* We wait to make sure the first child forked successfully */
if ((got = waitpid(pid, &exitstatus, 0)) < 0 || if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 ||
got != pid || got != pid ||
exitstatus != 0) { exitstatus != 0) {
goto error; goto error;
@ -250,3 +252,37 @@ virDaemonUnixSocketPaths(const char *sock_prefix,
VIR_FREE(rundir); VIR_FREE(rundir);
return ret; return ret;
} }
#else /* WIN32 */
int virDaemonForkIntoBackground(const char *argv0 G_GNUC_UNUSED)
{
errno = ENOTSUP;
return -1;
}
void virDaemonSetupLogging(const char *daemon_name G_GNUC_UNUSED,
unsigned int log_level G_GNUC_UNUSED,
char *log_filters G_GNUC_UNUSED,
char *log_outputs G_GNUC_UNUSED,
bool privileged G_GNUC_UNUSED,
bool verbose G_GNUC_UNUSED,
bool godaemon G_GNUC_UNUSED)
{
/* NOOP */
errno = ENOTSUP;
return;
}
int virDaemonUnixSocketPaths(const char *sock_prefix G_GNUC_UNUSED,
bool privileged G_GNUC_UNUSED,
char *unix_sock_dir G_GNUC_UNUSED,
char **sockfile G_GNUC_UNUSED,
char **rosockfile G_GNUC_UNUSED,
char **adminSockfile G_GNUC_UNUSED)
{
errno = ENOTSUP;
return -1;
}
#endif /* WIN32 */