nbd/client.c: use errp instead of LOG (be41c100) · Commits · SUMMER2020 / students / proj-2021291

block/nbd-client.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		*/

		#include "qemu/osdep.h"
		#include "qapi/error.h"
		#include "nbd-client.h"

		#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs))
		@@ -70,10 +71,14 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)
		NBDClientSession *s = opaque;
		uint64_t i;
		int ret;
		Error *local_err = NULL;

		for (;;) {
		assert(s->reply.handle == 0);
		ret = nbd_receive_reply(s->ioc, &s->reply);
		ret = nbd_receive_reply(s->ioc, &s->reply, &local_err);
		if (ret < 0) {
		error_report_err(local_err);
		}
		if (ret <= 0) {
		break;
		}

include/block/nbd.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -133,9 +133,10 @@ int nbd_receive_negotiate(QIOChannel ioc, const char name, uint16_t *flags,
		QCryptoTLSCreds tlscreds, const char hostname,
		QIOChannel **outioc,
		off_t size, Error *errp);
		int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size);
		int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size,
		Error **errp);
		ssize_t nbd_send_request(QIOChannel ioc, NBDRequest request);
		ssize_t nbd_receive_reply(QIOChannel ioc, NBDReply reply);
		ssize_t nbd_receive_reply(QIOChannel ioc, NBDReply reply, Error **errp);
		int nbd_client(int fd);
		int nbd_disconnect(int fd);

nbd/client.c

+17 −13

Original line number	Diff line number	Diff line
		@@ -627,11 +627,13 @@ fail:
		}

		#ifdef __linux__
		int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size)
		int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size,
		Error **errp)
		{
		unsigned long sectors = size / BDRV_SECTOR_SIZE;
		if (size / BDRV_SECTOR_SIZE != sectors) {
		LOG("Export size %lld too large for 32-bit kernel", (long long) size);
		error_setg(errp, "Export size %lld too large for 32-bit kernel",
		(long long) size);
		return -E2BIG;
		}

		@@ -639,7 +641,7 @@ int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size)

		if (ioctl(fd, NBD_SET_SOCK, (unsigned long) sioc->fd) < 0) {
		int serrno = errno;
		LOG("Failed to set NBD socket");
		error_setg(errp, "Failed to set NBD socket");
		return -serrno;
		}

		@@ -647,7 +649,7 @@ int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size)

		if (ioctl(fd, NBD_SET_BLKSIZE, (unsigned long)BDRV_SECTOR_SIZE) < 0) {
		int serrno = errno;
		LOG("Failed setting NBD block size");
		error_setg(errp, "Failed setting NBD block size");
		return -serrno;
		}

		@@ -659,7 +661,7 @@ int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size)

		if (ioctl(fd, NBD_SET_SIZE_BLOCKS, sectors) < 0) {
		int serrno = errno;
		LOG("Failed setting size (in blocks)");
		error_setg(errp, "Failed setting size (in blocks)");
		return -serrno;
		}

		@@ -670,12 +672,12 @@ int nbd_init(int fd, QIOChannelSocket *sioc, uint16_t flags, off_t size)

		if (ioctl(fd, BLKROSET, (unsigned long) &read_only) < 0) {
		int serrno = errno;
		LOG("Failed setting read-only attribute");
		error_setg(errp, "Failed setting read-only attribute");
		return -serrno;
		}
		} else {
		int serrno = errno;
		LOG("Failed setting flags");
		error_setg(errp, "Failed setting flags");
		return -serrno;
		}
		}
		@@ -723,8 +725,10 @@ int nbd_disconnect(int fd)
		}

		#else
		int nbd_init(int fd, QIOChannelSocket *ioc, uint16_t flags, off_t size)
		int nbd_init(int fd, QIOChannelSocket *ioc, uint16_t flags, off_t size,
		Error **errp)
		{
		error_setg(errp, "nbd_init is only supported on Linux");
		return -ENOTSUP;
		}

		@@ -758,19 +762,19 @@ ssize_t nbd_send_request(QIOChannel ioc, NBDRequest request)
		return write_sync(ioc, buf, sizeof(buf), NULL);
		}

		ssize_t nbd_receive_reply(QIOChannel ioc, NBDReply reply)
		ssize_t nbd_receive_reply(QIOChannel ioc, NBDReply reply, Error **errp)
		{
		uint8_t buf[NBD_REPLY_SIZE];
		uint32_t magic;
		ssize_t ret;

		ret = read_sync_eof(ioc, buf, sizeof(buf), NULL);
		ret = read_sync_eof(ioc, buf, sizeof(buf), errp);
		if (ret <= 0) {
		return ret;
		}

		if (ret != sizeof(buf)) {
		LOG("read failed");
		error_setg(errp, "read failed");
		return -EINVAL;
		}

		@@ -788,7 +792,7 @@ ssize_t nbd_receive_reply(QIOChannel ioc, NBDReply reply)

		if (reply->error == ESHUTDOWN) {
		/* This works even on mingw which lacks a native ESHUTDOWN */
		LOG("server shutting down");
		error_setg(errp, "server shutting down");
		return -EINVAL;
		}
		TRACE("Got reply: { magic = 0x%" PRIx32 ", .error = % " PRId32
		@@ -796,7 +800,7 @@ ssize_t nbd_receive_reply(QIOChannel ioc, NBDReply reply)
		magic, reply->error, reply->handle);

		if (magic != NBD_REPLY_MAGIC) {
		LOG("invalid magic (got 0x%" PRIx32 ")", magic);
		error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", magic);
		return -EINVAL;
		}
		return sizeof(buf);

qemu-nbd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -288,8 +288,9 @@ static void nbd_client_thread(void arg)
		goto out_socket;
		}

		ret = nbd_init(fd, sioc, nbdflags, size);
		ret = nbd_init(fd, sioc, nbdflags, size, &local_error);
		if (ret < 0) {
		error_report_err(local_error);
		goto out_fd;
		}

tests/qemu-iotests/083.out

+2 −0

Original line number	Diff line number	Diff line
		@@ -69,10 +69,12 @@ read failed: Input/output error

		=== Check disconnect 4 reply ===

		read failed
		read failed: Input/output error

		=== Check disconnect 8 reply ===

		read failed
		read failed: Input/output error

		=== Check disconnect before data ===