Redo previous by avoiding the casts and using PRIxREGISTER instead
This commit is contained in:
parent
cccccd8360
commit
832d276ed9
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rumpclient.c,v 1.66 2016/09/06 07:12:48 martin Exp $ */
|
/* $NetBSD: rumpclient.c,v 1.67 2016/09/06 07:45:41 martin Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
|
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
#define USE_SIGNALFD
|
#define USE_SIGNALFD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__RCSID("$NetBSD: rumpclient.c,v 1.66 2016/09/06 07:12:48 martin Exp $");
|
__RCSID("$NetBSD: rumpclient.c,v 1.67 2016/09/06 07:45:41 martin Exp $");
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
@ -590,9 +590,9 @@ rumpclient_syscall(int sysnum, const void *data, size_t dlen,
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
resp = rdata;
|
resp = rdata;
|
||||||
DPRINTF(("rumpsp syscall_resp: syscall %d error %d, rv: %ld/%ld\n",
|
DPRINTF(("rumpsp syscall_resp: syscall %d error %d, rv: %"
|
||||||
sysnum, rv, (unsigned long)resp->rsys_retval[0],
|
PRIxREGISTER"/%"PRIxREGISTER"\n",
|
||||||
(unsigned long)resp->rsys_retval[1]));
|
sysnum, rv, resp->rsys_retval[0], resp->rsys_retval[1]));
|
||||||
|
|
||||||
memcpy(retval, &resp->rsys_retval, sizeof(resp->rsys_retval));
|
memcpy(retval, &resp->rsys_retval, sizeof(resp->rsys_retval));
|
||||||
rv = resp->rsys_error;
|
rv = resp->rsys_error;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rumpuser_sp.c,v 1.71 2016/09/06 07:32:39 martin Exp $ */
|
/* $NetBSD: rumpuser_sp.c,v 1.72 2016/09/06 07:45:41 martin Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
|
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
#include "rumpuser_port.h"
|
#include "rumpuser_port.h"
|
||||||
|
|
||||||
#if !defined(lint)
|
#if !defined(lint)
|
||||||
__RCSID("$NetBSD: rumpuser_sp.c,v 1.71 2016/09/06 07:32:39 martin Exp $");
|
__RCSID("$NetBSD: rumpuser_sp.c,v 1.72 2016/09/06 07:45:41 martin Exp $");
|
||||||
#endif /* !lint */
|
#endif /* !lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -691,8 +691,9 @@ serv_handlesyscall(struct spclient *spc, struct rsp_hdr *rhdr, uint8_t *data)
|
||||||
spc->spc_syscallreq = 0;
|
spc->spc_syscallreq = 0;
|
||||||
lwproc_release();
|
lwproc_release();
|
||||||
|
|
||||||
DPRINTF(("rump_sp: got return value %d & %ld/%ld\n",
|
DPRINTF(("rump_sp: got return value %d & %"PRIxREGISTER
|
||||||
rv, (long)retval[0], (long)retval[1]));
|
"/%"PRIxREGISTER"\n",
|
||||||
|
rv, retval[0], retval[1]));
|
||||||
|
|
||||||
send_syscall_resp(spc, rhdr->rsp_reqno, rv, retval);
|
send_syscall_resp(spc, rhdr->rsp_reqno, rv, retval);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue