struct NBDRequest {
QSIMPLEQ_ENTRY(NBDRequest) entry;
+ NBDClient *client;
uint8_t *data;
};
nbd_client_put(client);
}
-static NBDRequest *nbd_request_get(NBDExport *exp)
+static NBDRequest *nbd_request_get(NBDClient *client)
{
NBDRequest *req;
+ NBDExport *exp = client->exp;
+
if (QSIMPLEQ_EMPTY(&exp->requests)) {
req = g_malloc0(sizeof(NBDRequest));
req->data = qemu_blockalign(exp->bs, NBD_BUFFER_SIZE);
req = QSIMPLEQ_FIRST(&exp->requests);
QSIMPLEQ_REMOVE_HEAD(&exp->requests, entry);
}
+ nbd_client_get(client);
+ req->client = client;
return req;
}
-static void nbd_request_put(NBDExport *exp, NBDRequest *req)
+static void nbd_request_put(NBDRequest *req)
{
- QSIMPLEQ_INSERT_HEAD(&exp->requests, req, entry);
+ NBDClient *client = req->client;
+ QSIMPLEQ_INSERT_HEAD(&client->exp->requests, req, entry);
+ nbd_client_put(client);
}
NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,
g_free(exp);
}
-static int nbd_do_send_reply(int csock, struct nbd_reply *reply,
- uint8_t *data, int len)
+static int nbd_do_send_reply(NBDRequest *req, struct nbd_reply *reply,
+ int len)
{
+ NBDClient *client = req->client;
+ int csock = client->sock;
int rc, ret;
if (!len) {
socket_set_cork(csock, 1);
rc = nbd_send_reply(csock, reply);
if (rc != -1) {
- ret = write_sync(csock, data, len);
+ ret = write_sync(csock, req->data, len);
if (ret != len) {
errno = EIO;
rc = -1;
return rc;
}
-static int nbd_do_receive_request(int csock, struct nbd_request *request,
- uint8_t *data)
+static int nbd_do_receive_request(NBDRequest *req, struct nbd_request *request)
{
+ NBDClient *client = req->client;
+ int csock = client->sock;
int rc;
if (nbd_receive_request(csock, request) == -1) {
if ((request->type & NBD_CMD_MASK_COMMAND) == NBD_CMD_WRITE) {
TRACE("Reading %u byte(s)", request->len);
- if (read_sync(csock, data, request->len) != request->len) {
+ if (read_sync(csock, req->data, request->len) != request->len) {
LOG("reading from socket failed");
rc = -EIO;
goto out;
static int nbd_trip(NBDClient *client)
{
+ NBDRequest *req = nbd_request_get(client);
NBDExport *exp = client->exp;
- NBDRequest *req = nbd_request_get(exp);
- int csock = client->sock;
struct nbd_request request;
struct nbd_reply reply;
int rc = -1;
TRACE("Reading request.");
- ret = nbd_do_receive_request(csock, &request, req->data);
+ ret = nbd_do_receive_request(req, &request);
if (ret == -EIO) {
goto out;
}
}
TRACE("Read %u byte(s)", request.len);
- if (nbd_do_send_reply(csock, &reply, req->data, request.len) < 0)
+ if (nbd_do_send_reply(req, &reply, request.len) < 0)
goto out;
break;
case NBD_CMD_WRITE:
}
}
- if (nbd_do_send_reply(csock, &reply, NULL, 0) < 0)
+ if (nbd_do_send_reply(req, &reply, 0) < 0)
goto out;
break;
case NBD_CMD_DISC:
reply.error = -ret;
}
- if (nbd_do_send_reply(csock, &reply, NULL, 0) < 0)
+ if (nbd_do_send_reply(req, &reply, 0) < 0)
goto out;
break;
case NBD_CMD_TRIM:
LOG("discard failed");
reply.error = -ret;
}
- if (nbd_do_send_reply(csock, &reply, NULL, 0) < 0)
+ if (nbd_do_send_reply(req, &reply, 0) < 0)
goto out;
break;
default:
invalid_request:
reply.error = -EINVAL;
error_reply:
- if (nbd_do_send_reply(csock, &reply, NULL, 0) == -1)
+ if (nbd_do_send_reply(req, &reply, 0) == -1)
goto out;
break;
}
rc = 0;
out:
- nbd_request_put(exp, req);
+ nbd_request_put(req);
return rc;
}
{
NBDClient *client = opaque;
- nbd_client_get(client);
if (nbd_trip(client) != 0) {
nbd_client_close(client);
}
-
- nbd_client_put(client);
}
NBDClient *nbd_client_new(NBDExport *exp, int csock,