util: make virCommandSetSendBuffer testable

Add a private function to peek at the list of send buffers in virCommand
so that it is testable

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b8eccc4d21477b8aca89fd8049c513f9ee75cf79..4e475d5b1a57a77fde94005f11a5f378e78fa13f 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2119,6 +2119,7 @@ virCommandNewArgs;
 virCommandNewVAList;
 virCommandNonblockingFDs;
 virCommandPassFD;
+virCommandPeekSendBuffers;
 virCommandRawStatus;
 virCommandRequireHandshake;
 virCommandRun;

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 5fe7f2212d0c0997c176913be726c5b304975a8c..9d4ba1e97c829e93bcd148d1890aee42b27e21d7 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -78,14 +78,6 @@ struct _virCommandFD {
     unsigned int flags;
 };
 
-typedef struct _virCommandSendBuffer virCommandSendBuffer;
-struct _virCommandSendBuffer {
-    int fd;
-    unsigned char *buffer;
-    size_t buflen;
-    off_t offset;
-};
-
 struct _virCommand {
     int has_error; /* 0 on success, -1 on error  */
 
@@ -3514,3 +3506,12 @@ virCommandSetRunAmong(virCommand *cmd,
 
     cmd->schedCore = pid;
 }
+
+void
+virCommandPeekSendBuffers(virCommand *cmd,
+                          virCommandSendBuffer **buffers,
+                          int *nbuffers)
+{
+    *buffers = cmd->sendBuffers;
+    *nbuffers = cmd->numSendBuffers;
+}

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index d51449ac90f050fe394d4f33745237ac7d69fed8..9bcdce35b9d6fcfc8a238cc83f8dd1439029f5f0 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -24,6 +24,14 @@
 #include "internal.h"
 #include "virbuffer.h"
 
+typedef struct _virCommandSendBuffer virCommandSendBuffer;
+struct _virCommandSendBuffer {
+    int fd;
+    unsigned char *buffer;
+    size_t buflen;
+    off_t offset;
+};
+
 typedef struct _virCommand virCommand;
 
 /* This will execute in the context of the first child

diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h
index ff17fa5ded2bd2f043e6fbf3028d3e6a4c39e35a..d579810bb5bcd4b1505b7e03e4fc1a5e02dbe36a 100644 (file)
--- a/src/util/vircommandpriv.h
+++ b/src/util/vircommandpriv.h
@@ -47,3 +47,7 @@ void virCommandSetDryRun(virCommandDryRunToken *tok,
                          bool bufCommandStripPath,
                          virCommandDryRunCallback cb,
                          void *opaque);
+
+void virCommandPeekSendBuffers(virCommand *cmd,
+                               virCommandSendBuffer **buffers,
+                               int *nbuffers);