openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: fix output of pid values 

Nuke the last vestiges of printing pid_t values with the wrong
types, at least in code compiled on mingw64.  There may be other
places, but for now they are only compiled on systems where the
existing %d doesn't trigger gcc warnings.

* src/rpc/virnetsocket.c (virNetSocketNew): Use %lld and casting,
rather than assuming any particular int type for pid_t.
* src/util/command.c (virCommandRunAsync, virPidWait)
(virPidAbort): Likewise.
(verify): Drop a now stale assertion.
This commit is contained in:
Eric Blake 2012-02-10 16:52:01 -07:00
parent 3e2c3d8f6d
commit 355ec28167
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpc/virnetsocket.c
View File

@ -1,7 +1,7 @@
/* /*
* virnetsocket.c: generic network socket handling * virnetsocket.c: generic network socket handling
* *
* Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006-2012 Red Hat, Inc.
* Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006 Daniel P. Berrange
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -114,9 +114,9 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
virNetSocketPtr sock; virNetSocketPtr sock;
int no_slow_start = 1; int no_slow_start = 1;
VIR_DEBUG("localAddr=%p remoteAddr=%p fd=%d errfd=%d pid=%d", VIR_DEBUG("localAddr=%p remoteAddr=%p fd=%d errfd=%d pid=%lld",
localAddr, remoteAddr, localAddr, remoteAddr,
fd, errfd, pid); fd, errfd, (long long) pid);
if (virSetCloseExec(fd) < 0) { if (virSetCloseExec(fd) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
@ -174,9 +174,9 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
sock->client = isClient; sock->client = isClient;
PROBE(RPC_SOCKET_NEW, PROBE(RPC_SOCKET_NEW,
"sock=%p refs=%d fd=%d errfd=%d pid=%d localAddr=%s, remoteAddr=%s", "sock=%p refs=%d fd=%d errfd=%d pid=%lld localAddr=%s, remoteAddr=%s",
sock, sock->refs, fd, errfd, sock, sock->refs, fd, errfd, (long long) pid,
pid, NULLSTR(sock->localAddrStr), NULLSTR(sock->remoteAddrStr)); NULLSTR(sock->localAddrStr), NULLSTR(sock->remoteAddrStr));
return sock; return sock;

20
src/util/command.c
View File

@ -42,7 +42,6 @@
#include "virpidfile.h" #include "virpidfile.h"
#include "buf.h" #include "buf.h"
#include "ignore-value.h" #include "ignore-value.h"
#include "verify.h"
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
@ -50,9 +49,6 @@
virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
/* We have quite a bit of changes to make if this doesn't hold. */
verify(sizeof(pid_t) <= sizeof(int));
/* Flags for virExecWithHook */ /* Flags for virExecWithHook */
enum { enum {
VIR_EXEC_NONE = 0, VIR_EXEC_NONE = 0,
@ -2152,8 +2148,8 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
if (cmd->pid != -1) { if (cmd->pid != -1) {
virCommandError(VIR_ERR_INTERNAL_ERROR, virCommandError(VIR_ERR_INTERNAL_ERROR,
_("command is already running as pid %d"), _("command is already running as pid %lld"),
cmd->pid); (long long) cmd->pid);
return -1; return -1;
} }
@ -2228,7 +2224,8 @@ virPidWait(pid_t pid, int *exitstatus)
int status; int status;
if (pid <= 0) { if (pid <= 0) {
virReportSystemError(EINVAL, _("unable to wait for process %d"), pid); virReportSystemError(EINVAL, _("unable to wait for process %lld"),
(long long) pid);
return -1; return -1;
} }
@ -2237,7 +2234,8 @@ virPidWait(pid_t pid, int *exitstatus)
errno == EINTR); errno == EINTR);
if (ret == -1) { if (ret == -1) {
virReportSystemError(errno, _("unable to wait for process %d"), pid); virReportSystemError(errno, _("unable to wait for process %lld"),
(long long) pid);
return -1; return -1;
} }
@ -2245,8 +2243,8 @@ virPidWait(pid_t pid, int *exitstatus)
if (status != 0) { if (status != 0) {
char *st = virCommandTranslateStatus(status); char *st = virCommandTranslateStatus(status);
virCommandError(VIR_ERR_INTERNAL_ERROR, virCommandError(VIR_ERR_INTERNAL_ERROR,
_("Child process (%d) status unexpected: %s"), _("Child process (%lld) status unexpected: %s"),
pid, NULLSTR(st)); (long long) pid, NULLSTR(st));
VIR_FREE(st); VIR_FREE(st);
return -1; return -1;
} }
@ -2371,7 +2369,7 @@ virPidAbort(pid_t pid)
} }
} }
} }
VIR_DEBUG("failed to reap child %d, abandoning it", pid); VIR_DEBUG("failed to reap child %lld, abandoning it", (long long) pid);
cleanup: cleanup:
VIR_FREE(tmp); VIR_FREE(tmp);