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

build: fix output of pid values

Browse Source 
Fix a few more places where pid_t is printed with wrong type
(cherry picked from commit ca1bf4bd7433f05862a6c46d7da4dacaa6a89e2b)
This commit is contained in:
Marc-André Lureau 2012-04-20 15:13:51 +02:00 committed by Cole Robinson
parent 763f71e51f
commit f065174ede
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_audit.c
View File

@ -562,8 +562,8 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op,
} }
VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success, VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success,
"virt=%s op=%s reason=%s %s uuid=%s vm-pid=%d", "virt=%s op=%s reason=%s %s uuid=%s vm-pid=%lld",
virt, op, reason, vmname, uuidstr, vm->pid); virt, op, reason, vmname, uuidstr, (long long)vm->pid);
VIR_FREE(vmname); VIR_FREE(vmname);
} }

4
src/conf/domain_conf.c
View File

@ -12787,10 +12787,10 @@ static char *virDomainObjFormat(virCapsPtr caps,
int i; int i;
state = virDomainObjGetState(obj, &reason); state = virDomainObjGetState(obj, &reason);
virBufferAsprintf(&buf, "<domstatus state='%s' reason='%s' pid='%d'>\n", virBufferAsprintf(&buf, "<domstatus state='%s' reason='%s' pid='%lld'>\n",
virDomainStateTypeToString(state), virDomainStateTypeToString(state),
virDomainStateReasonToString(state, reason), virDomainStateReasonToString(state, reason),
obj->pid); (long long)obj->pid);
for (i = 0 ; i < VIR_DOMAIN_TAINT_LAST ; i++) { for (i = 0 ; i < VIR_DOMAIN_TAINT_LAST ; i++) {
if (obj->taint & (1 << i)) if (obj->taint & (1 << i))

2
src/util/command.c
View File

@ -2399,7 +2399,7 @@ void
virPidAbort(pid_t pid) virPidAbort(pid_t pid)
{ {
/* Not yet ported to mingw. Any volunteers? */ /* Not yet ported to mingw. Any volunteers? */
VIR_DEBUG("failed to reap child %d, abandoning it", pid); VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid);
} }
void void

2
src/util/virpidfile.c
View File

@ -222,7 +222,7 @@ int virPidFileReadPathIfAlive(const char *path,
#endif #endif
if (binpath) { if (binpath) {
if (virAsprintf(&procpath, "/proc/%d/exe", *pid) < 0) { if (virAsprintf(&procpath, "/proc/%lld/exe", (long long)*pid) < 0) {
*pid = -1; *pid = -1;
return -1; return -1;
} }