[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v2 19/32] virNetClientStreamRecvPacket: Introduce @flags argument



Signed-off-by: Michal Privoznik <mprivozn redhat com>
---
 src/remote/remote_driver.c   |  3 ++-
 src/rpc/virnetclientstream.c | 10 +++++++---
 src/rpc/virnetclientstream.h |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f0e85ce..824fe03 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -5109,7 +5109,8 @@ remoteStreamRecvFlags(virStreamPtr st,
                                       priv->client,
                                       data,
                                       nbytes,
-                                      (st->flags & VIR_STREAM_NONBLOCK));
+                                      (st->flags & VIR_STREAM_NONBLOCK),
+                                      flags);
 
     VIR_DEBUG("Done %d", rv);
 
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 0e982ba..c8c89ec 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -425,13 +425,17 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st,
                                  virNetClientPtr client,
                                  char *data,
                                  size_t nbytes,
-                                 bool nonblock)
+                                 bool nonblock,
+                                 unsigned int flags)
 {
     int rv = -1;
     size_t want;
 
-    VIR_DEBUG("st=%p client=%p data=%p nbytes=%zu nonblock=%d",
-              st, client, data, nbytes, nonblock);
+    VIR_DEBUG("st=%p client=%p data=%p nbytes=%zu nonblock=%d flags=%x",
+              st, client, data, nbytes, nonblock, flags);
+
+    virCheckFlags(0, -1);
+
     virObjectLock(st);
     if (!st->rx && !st->incomingEOF) {
         virNetMessagePtr msg;
diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h
index a648b7c..2835066 100644
--- a/src/rpc/virnetclientstream.h
+++ b/src/rpc/virnetclientstream.h
@@ -59,7 +59,8 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st,
                                  virNetClientPtr client,
                                  char *data,
                                  size_t nbytes,
-                                 bool nonblock);
+                                 bool nonblock,
+                                 unsigned int flags);
 
 int virNetClientStreamSendSkip(virNetClientStreamPtr st,
                                virNetClientPtr client,
-- 
2.8.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]