diff options
author | Thanos Makatos <thanos.makatos@nutanix.com> | 2020-12-02 05:31:52 -0500 |
---|---|---|
committer | Thanos <tmakatos@gmail.com> | 2020-12-02 11:09:41 +0000 |
commit | ddf444e8da02e0c8796944e2484cd0ca91a0105d (patch) | |
tree | 72b8ee1f1fae4ba84155fc1970da16bb49693345 /lib/tran_sock.c | |
parent | 806284b29414e11f7fd5274ba608ba66bbedc49f (diff) | |
download | libvfio-user-ddf444e8da02e0c8796944e2484cd0ca91a0105d.zip libvfio-user-ddf444e8da02e0c8796944e2484cd0ca91a0105d.tar.gz libvfio-user-ddf444e8da02e0c8796944e2484cd0ca91a0105d.tar.bz2 |
use log level defines from syslog
Signed-off-by: Thanos Makatos <thanos.makatos@nutanix.com>
Diffstat (limited to 'lib/tran_sock.c')
-rw-r--r-- | lib/tran_sock.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/tran_sock.c b/lib/tran_sock.c index 7649244..a7d6505 100644 --- a/lib/tran_sock.c +++ b/lib/tran_sock.c @@ -462,27 +462,27 @@ recv_version(vfu_ctx_t *vfu_ctx, int sock, uint16_t *msg_idp, (void **)&cversion, &vlen); if (ret < 0) { - vfu_log(vfu_ctx, VFU_ERR, "failed to receive version: %s", + vfu_log(vfu_ctx, LOG_ERR, "failed to receive version: %s", strerror(-ret)); return ret; } if (hdr.cmd != VFIO_USER_VERSION) { - vfu_log(vfu_ctx, VFU_ERR, "msg%hx: invalid cmd %hu (expected %hu)", + vfu_log(vfu_ctx, LOG_ERR, "msg%hx: invalid cmd %hu (expected %hu)", *msg_idp, hdr.cmd, VFIO_USER_VERSION); ret = -EINVAL; goto out; } if (vlen < sizeof (*cversion)) { - vfu_log(vfu_ctx, VFU_ERR, + vfu_log(vfu_ctx, LOG_ERR, "msg%hx (VFIO_USER_VERSION): invalid size %lu", *msg_idp, vlen); ret = -EINVAL; goto out; } if (cversion->major != LIB_VFIO_USER_MAJOR) { - vfu_log(vfu_ctx, VFU_ERR, "unsupported client major %hu (must be %hu)", + vfu_log(vfu_ctx, LOG_ERR, "unsupported client major %hu (must be %hu)", cversion->major, LIB_VFIO_USER_MAJOR); ret = -ENOTSUP; goto out; @@ -496,7 +496,7 @@ recv_version(vfu_ctx_t *vfu_ctx, int sock, uint16_t *msg_idp, size_t pgsize = 0; if (json_str[len - 1] != '\0') { - vfu_log(vfu_ctx, VFU_ERR, "ignoring invalid JSON from client"); + vfu_log(vfu_ctx, LOG_ERR, "ignoring invalid JSON from client"); ret = -EINVAL; goto out; } @@ -507,10 +507,10 @@ recv_version(vfu_ctx_t *vfu_ctx, int sock, uint16_t *msg_idp, if (ret < 0) { /* No client-supplied strings in the log for release build. */ #ifdef DEBUG - vfu_log(vfu_ctx, VFU_ERR, "failed to parse client JSON \"%s\"", + vfu_log(vfu_ctx, LOG_ERR, "failed to parse client JSON \"%s\"", json_str); #else - vfu_log(vfu_ctx, VFU_ERR, "failed to parse client JSON"); + vfu_log(vfu_ctx, LOG_ERR, "failed to parse client JSON"); #endif goto out; } @@ -519,7 +519,7 @@ recv_version(vfu_ctx_t *vfu_ctx, int sock, uint16_t *msg_idp, ret = migration_set_pgsize(vfu_ctx->migration, pgsize); if (ret != 0) { - vfu_log(vfu_ctx, VFU_ERR, "refusing client page size of %zu", + vfu_log(vfu_ctx, LOG_ERR, "refusing client page size of %zu", pgsize); goto out; } @@ -528,7 +528,7 @@ recv_version(vfu_ctx_t *vfu_ctx, int sock, uint16_t *msg_idp, // FIXME: is the code resilient against ->client_max_fds == 0? if (vfu_ctx->client_max_fds < 0 || vfu_ctx->client_max_fds > VFIO_USER_CLIENT_MAX_FDS_LIMIT) { - vfu_log(vfu_ctx, VFU_ERR, "refusing client max_fds of %d", + vfu_log(vfu_ctx, LOG_ERR, "refusing client max_fds of %d", vfu_ctx->client_max_fds); ret = -EINVAL; goto out; @@ -601,7 +601,7 @@ negotiate(vfu_ctx_t *vfu_ctx, int sock) ret = recv_version(vfu_ctx, sock, &msg_id, &client_version); if (ret < 0) { - vfu_log(vfu_ctx, VFU_ERR, "failed to recv version: %s", strerror(-ret)); + vfu_log(vfu_ctx, LOG_ERR, "failed to recv version: %s", strerror(-ret)); return ret; } @@ -610,7 +610,7 @@ negotiate(vfu_ctx_t *vfu_ctx, int sock) free(client_version); if (ret < 0) { - vfu_log(vfu_ctx, VFU_ERR, "failed to send version: %s", strerror(-ret)); + vfu_log(vfu_ctx, LOG_ERR, "failed to send version: %s", strerror(-ret)); } return ret; |