virNetClientStreamRecvPacket: Introduce @flags argument

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ff5be6ebb9770bc93ec61f0ed527082dab97283b..63daec5875141bd2d959d02c02b6e04270a1da4e 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -5665,7 +5665,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 10fd0a8594eeb6ed375129722ec385c8057f096c..91df5d483b543e7e9176ac1193b8a7ed0570071c 100644 (file)
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -457,13 +457,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 c25c69bb1c668724f0ab262eee090cfae2d05136..1774e5ac3cc72c41b636afcbbea705feb8f74d9e 100644 (file)
--- 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 virNetClientStreamSendHole(virNetClientStreamPtr st,
                                virNetClientPtr client,