Re: [Libguestfs] [libnbd PATCH] internal: s/handle/cookie/ to match NBD spec

On Tue, May 30, 2023 at 01:18:55PM +0200, Laszlo Ersek wrote: > On 5/29/23 18:24, Eric Blake wrote: > > Externally, we have been exposing the 64-bit opaque marker for each > > NBD packet as the "cookie", because it was less confusing when > > contrasted with our 'struct nbd_handle *' holding all libnbd state. > > It also avoids confusion between the noun 'handle' as a way to > > identify a packet and the verb 'handle' for reacting to things like > > signals. Upstream NBD changed their spec to favor the name "cookie" > > based on our recommendations[1], and so now we can get rid of our last > > uses of the old name. > > > > [1] https://github.com/NetworkBlockDevice/nbd/commit/ca4392eb2b > > > > */ > > - cookie = be64toh (h->sbuf.simple_reply.handle); > > + cookie = be64toh (h->sbuf.simple_reply.cookie); > > /* Find the command amongst the commands in flight. */ > > for (cmd = h->cmds_in_flight, prev_cmd = NULL; > > cmd != NULL; > > > (I didn't dig into the larger contexts.) > > Reviewed-by: Laszlo Ersek <lersek(a)redhat.com&gt; Both commits now in; libnbd as c1df4df9 and nbdkit as 5637302c