[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/26] qemu-nbd: remove data_size argument to nbd_tr
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/26] qemu-nbd: remove data_size argument to nbd_trip |
Date: |
Fri, 23 Dec 2011 16:26:16 +0100 |
The size of the buffer is in practice part of the protocol.
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 6 +++---
nbd.h | 4 +++-
qemu-nbd.c | 4 +---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/nbd.c b/nbd.c
index 1df2b91..d8cc331 100644
--- a/nbd.c
+++ b/nbd.c
@@ -585,7 +585,7 @@ static int nbd_send_reply(int csock, struct nbd_reply
*reply)
int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset, uint32_t nbdflags,
- uint8_t *data, int data_size)
+ uint8_t *data)
{
struct nbd_request request;
struct nbd_reply reply;
@@ -596,9 +596,9 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
if (nbd_receive_request(csock, &request) == -1)
return -1;
- if (request.len + NBD_REPLY_SIZE > data_size) {
+ if (request.len + NBD_REPLY_SIZE > NBD_BUFFER_SIZE) {
LOG("len (%u) is larger than max len (%u)",
- request.len + NBD_REPLY_SIZE, data_size);
+ request.len + NBD_REPLY_SIZE, NBD_BUFFER_SIZE);
errno = EINVAL;
return -1;
}
diff --git a/nbd.h b/nbd.h
index ebdb2db..dbc4c0d 100644
--- a/nbd.h
+++ b/nbd.h
@@ -57,6 +57,8 @@ enum {
#define NBD_DEFAULT_PORT 10809
+#define NBD_BUFFER_SIZE (1024*1024)
+
size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read);
int tcp_socket_outgoing(const char *address, uint16_t port);
int tcp_socket_incoming(const char *address, uint16_t port);
@@ -72,7 +74,7 @@ int nbd_init(int fd, int csock, uint32_t flags, off_t size,
size_t blocksize);
int nbd_send_request(int csock, struct nbd_request *request);
int nbd_receive_reply(int csock, struct nbd_reply *reply);
int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
- uint32_t nbdflags, uint8_t *data, int data_size);
+ uint32_t nbdflags, uint8_t *data);
int nbd_client(int fd);
int nbd_disconnect(int fd);
diff --git a/qemu-nbd.c b/qemu-nbd.c
index f9ee9c5..d662268 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -35,8 +35,6 @@
#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
-#define NBD_BUFFER_SIZE (1024*1024)
-
static int sigterm_wfd;
static int verbose;
static char *device;
@@ -541,7 +539,7 @@ int main(int argc, char **argv)
for (i = 1; i < nb_fds && ret; i++) {
if (FD_ISSET(sharing_fds[i], &fds)) {
if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset,
- nbdflags, data, NBD_BUFFER_SIZE) != 0) {
+ nbdflags, data) != 0) {
close(sharing_fds[i]);
nb_fds--;
sharing_fds[i] = sharing_fds[nb_fds];
--
1.7.7.1
- [Qemu-devel] [PULL 00/26] nbd refactoring, fully asynchronous operation, flushing, fixes, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 01/26] add qemu_send_full and qemu_recv_full, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 02/26] sheepdog: move coroutine send/recv function to generic code, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 03/26] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 04/26] nbd: split requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 08/26] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 06/26] nbd: fix error handling in the server, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 05/26] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 10/26] Update ioctl order in nbd_init() to detect EBUSY, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 12/26] qemu-nbd: remove data_size argument to nbd_trip,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/26] move corking functions to osdep.c, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 14/26] qemu-nbd: simplify nbd_trip, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 15/26] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 16/26] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 19/26] qemu-nbd: introduce NBDRequest, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 20/26] link the main loop and its dependencies into the tools, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 22/26] qemu-nbd: move client handling to nbd.c, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 21/26] qemu-nbd: use common main loop, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 25/26] qemu-nbd: throttle requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 26/26] nbd: add myself as maintainer, Paolo Bonzini, 2011/12/23