diff options
| author | Eric Blake <eblake@redhat.com> | 2023-08-29 12:58:30 -0500 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2023-09-22 17:21:08 -0500 |
| commit | d95ffb6fe6008c114602e20d848100081d62f7aa (patch) | |
| tree | 6e051c4a1e55a3ba7dec997426a9a4ab450b4df2 /nbd/server.c | |
| parent | 297365b40ff24c7e07d6f40ec8f9ac83229ace94 (diff) | |
nbd: Add types for extended headers
Add the constants and structs necessary for later patches to start
implementing the NBD_OPT_EXTENDED_HEADERS extension in both the client
and server, matching recent upstream nbd.git (through commit
e6f3b94a934). This patch does not change any existing behavior, but
merely sets the stage for upcoming patches.
This patch does not change the status quo that neither the client nor
server use a packed-struct representation for the request header.
While most of the patch adds new types, there is also some churn for
renaming the existing NBDExtent to NBDExtent32 to contrast it with
NBDExtent64, which I thought was a nicer name than NBDExtentExt.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20230829175826.377251-22-eblake@redhat.com>
Diffstat (limited to 'nbd/server.c')
| -rw-r--r-- | nbd/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nbd/server.c b/nbd/server.c index 936c35e55c..35fcd9fdbc 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -2072,7 +2072,7 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client, } typedef struct NBDExtentArray { - NBDExtent *extents; + NBDExtent32 *extents; unsigned int nb_alloc; unsigned int count; uint64_t total_length; @@ -2085,7 +2085,7 @@ static NBDExtentArray *nbd_extent_array_new(unsigned int nb_alloc) NBDExtentArray *ea = g_new0(NBDExtentArray, 1); ea->nb_alloc = nb_alloc; - ea->extents = g_new(NBDExtent, nb_alloc); + ea->extents = g_new(NBDExtent32, nb_alloc); ea->can_add = true; return ea; @@ -2148,7 +2148,7 @@ static int nbd_extent_array_add(NBDExtentArray *ea, } ea->total_length += length; - ea->extents[ea->count] = (NBDExtent) {.length = length, .flags = flags}; + ea->extents[ea->count] = (NBDExtent32) {.length = length, .flags = flags}; ea->count++; return 0; |