search for: bce4f85

...ost it because it was an interesting problem. (Sad when my writeup is three times longer than the patch itself...) generator/states.c | 5 +++++ lib/crypto.c | 7 +++++++ lib/internal.h | 1 + 3 files changed, 13 insertions(+) diff --git a/generator/states.c b/generator/states.c index bce4f85..145e8c1 100644 --- a/generator/states.c +++ b/generator/states.c @@ -113,6 +113,11 @@ send_from_wbuf (struct nbd_handle *h) READY: if (h->cmds_to_issue) SET_NEXT_STATE (%ISSUE_COMMAND.START); + else { + assert (h->sock); + if (h->sock->ops->pending && h->...

...; + r = h->sock->ops->recv (h, h->sock, h->rbuf, h->rlen); if (r == -1) { /* This should never happen because when we enter this state we * should have notification that the socket is ready to read. diff --git a/generator/states.c b/generator/states.c index 834fa44..bce4f85 100644 --- a/generator/states.c +++ b/generator/states.c @@ -61,7 +61,7 @@ recv_into_rbuf (struct nbd_handle *h) rlen = h->rlen > sizeof buf ? sizeof buf : h->rlen; } - r = h->sock->ops->recv (h->sock, rbuf, rlen); + r = h->sock->ops->recv (h, h->sock, r...

This works, but there's no time saving and I'm still investigating whether it does what I think it does. Nevertheless I thought I would post it because it (probably) implements the idea I had last night outlined in: https://www.redhat.com/archives/libguestfs/2019-June/msg00010.html The meat of the change is patch 4. Patch 5 is an example which I would probably fold into patch 4 for