[libvirt] [PATCH 05/13] virsh: Rename client specific methods in virsh.h

[Erik Skultety]

---
 tools/virsh.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tools/virsh.h b/tools/virsh.h
index 15a938e..d10ed66 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -36,6 +36,7 @@
 # include "internal.h"
 # include "virerror.h"
 # include "virthread.h"
+# include "vsh.h"
 
 # define VIRSH_MAX_XML_FILE (10*1024*1024)
 
@@ -60,7 +61,10 @@
 # define VIRSH_CMD_GRP_HOST_AND_HV      "Host and Hypervisor"
 # define VIRSH_CMD_GRP_VIRSH            "Virsh itself"
 
+typedef struct _virshControl virshControl;
+typedef virshControl *virshControlPtr;
 
+typedef struct _virshCtrlData virshCtrlData;
 
 /*
  * vshControl
@@ -91,9 +95,24 @@ struct _virshCtrlData {
     virConnectPtr dconn;
 };
 
+virConnectPtr virshConnect(vshControl *ctl, const char *uri, bool readonly);
 
+int virshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout);
 
+/* Given an index, return either the name of that device (non-NULL) or
+ * of its parent (NULL if a root).  */
+typedef const char * (*vshTreeLookup)(int devid, bool parent, void *opaque);
+int virshTreePrint(vshControl *ctl, vshTreeLookup lookup, void *opaque,
+                 int num_devices, int devid);
 
+int virshDomainState(vshControl *ctl, virDomainPtr dom, int *reason);
 
+char *virshEditWriteToTempFile(vshControl *ctl, const char *doc);
+int virshEditFile(vshControl *ctl, const char *filename);
+char *virshEditReadBackFile(vshControl *ctl, const char *filename);
+int virshAskReedit(vshControl *ctl, const char *msg, bool relax_avail);
+int virshStreamSink(virStreamPtr st, const char *bytes, size_t nbytes,
+                  void *opaque);
+double virshPrettyCapacity(unsigned long long val, const char **unit);
 
 #endif /* VIRSH_H */
-- 
1.9.3