diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2019-01-28 19:58:30 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-02-04 15:11:27 -0600 |
| commit | e6798f06a67a25def45a6636259de38cc38f1414 (patch) | |
| tree | aa6666d07f2722947fea9f44b19aa1ec9d4ca5fa /block | |
| parent | 0ae2d54645eb2888af6dc7f701bc02ca18e4e656 (diff) | |
nbd: generalize usage of nbd_read
We generally do very similar things around nbd_read: error_prepend
specifying what we have tried to read, and be_to_cpu conversion of
integers.
So, it seems reasonable to move common things to helper functions,
which:
1. simplify code a bit
2. generalize nbd_read error descriptions, all starting with
"Failed to read"
3. make it more difficult to forget to convert things from BE
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190128165830.165170-1-vsementsov@virtuozzo.com>
[eblake: rename macro to DEF_NBD_READ_N and formatting tweaks;
checkpatch has false positive complaint]
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/nbd-client.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/nbd-client.c b/block/nbd-client.c index 50a8dadd85..57f679ad4d 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -338,10 +338,9 @@ static int nbd_co_receive_offset_data_payload(NBDClientSession *s, return -EINVAL; } - if (nbd_read(s->ioc, &offset, sizeof(offset), errp) < 0) { + if (nbd_read64(s->ioc, &offset, "OFFSET_DATA offset", errp) < 0) { return -EIO; } - be64_to_cpus(&offset); data_size = chunk->length - sizeof(offset); assert(data_size); @@ -388,7 +387,7 @@ static coroutine_fn int nbd_co_receive_structured_payload( } *payload = g_new(char, len); - ret = nbd_read(s->ioc, *payload, len, errp); + ret = nbd_read(s->ioc, *payload, len, "structured payload", errp); if (ret < 0) { g_free(*payload); *payload = NULL; |