On 10/12/2017 04:53 AM, Vladimir Sementsov-Ogievskiy wrote: > NBDReply structure will be upgraded in future patches to handle both > simple and structured replies and will be used only in the client > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > nbd/server.c | 36 +++++++++++++++--------------------- > 1 file changed, 15 insertions(+), 21 deletions(-) > > diff --git a/nbd/server.c b/nbd/server.c > index 43ade30ba3..3878145f63 100644 > --- a/nbd/server.c > +++ b/nbd/server.c > @@ -1196,7 +1196,9 @@ static inline void set_be_simple_reply(NBDSimpleReply > *reply, uint64_t error, > stq_be_p(&reply->handle, handle); > } > > -static int nbd_co_send_simple_reply(NBDRequestData *req, NBDReply *reply, > +static int nbd_co_send_simple_reply(NBDRequestData *req, > + uint64_t handle, > + uint32_t error,
Feels a bit like a step backwards for the parameter list, but I'm not
opposed to the patch (it does make for some nice cleanup elsewhere).
> int len, Error **errp)
> {
> NBDClient *client = req->client;
> @@ -1205,10 +1207,10 @@ static int nbd_co_send_simple_reply(NBDRequestData
> *req, NBDReply *reply,
>
> g_assert(qemu_in_coroutine());
>
> - trace_nbd_co_send_simple_reply(reply->handle, reply->error, len);
> + trace_nbd_co_send_simple_reply(handle, error, len);
I had to tweak this to rebase on top of my churn on 4/13.
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
