Add new API virDomainBlockPull* to headers

Set up the types for the block pull functions and insert them into the
virDriver structure definition.  Symbols are exported in this patch to prevent
documentation compile failures.

* include/libvirt/libvirt.h.in: new API
* src/driver.h: add the new entry to the driver structure
* python/generator.py: fix compiler errors, the actual python bindings are
  implemented later
* src/libvirt_public.syms: export symbols

Signed-off-by: Adam Litke <agl@us.ibm.com>

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index d4fa9d09bed38ab1b0c02ce41e2d0b5d15e04c5c..8c4ce59ff8b2fd852411bdfd850c6997567c33b5 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1324,6 +1324,45 @@ int virDomainDetachDeviceFlags(virDomainPtr domain,
 int virDomainUpdateDeviceFlags(virDomainPtr domain,
                                const char *xml, unsigned int flags);
 
+/*
+ * BlockPull API
+ */
+
+/* An iterator for initiating and monitoring block pull operations */
+typedef unsigned long long virDomainBlockPullCursor;
+
+typedef struct _virDomainBlockPullInfo virDomainBlockPullInfo;
+struct _virDomainBlockPullInfo {
+    /*
+     * The following fields provide an indication of block pull progress.  @cur
+     * indicates the current position and will be between 0 and @end.  @end is
+     * the final cursor position for this operation and represents completion.
+     * To approximate progress, divide @cur by @end.
+     */
+    virDomainBlockPullCursor cur;
+    virDomainBlockPullCursor end;
+};
+typedef virDomainBlockPullInfo *virDomainBlockPullInfoPtr;
+
+int                 virDomainBlockPull(virDomainPtr dom,
+                                       const char *path,
+                                       virDomainBlockPullInfoPtr info,
+                                       unsigned int flags);
+
+int                 virDomainBlockPullAll(virDomainPtr dom,
+                                          const char *path,
+                                          unsigned int flags);
+
+int                 virDomainBlockPullAbort(virDomainPtr dom,
+                                            const char *path,
+                                            unsigned int flags);
+
+int                 virDomainGetBlockPullInfo(virDomainPtr dom,
+                                              const char *path,
+                                              virDomainBlockPullInfoPtr info,
+                                              unsigned int flags);
+
+
 /*
  * NUMA support
  */

diff --git a/python/generator.py b/python/generator.py
index a14b9ce2d04a1f2e536d393ae49f911ea76cdcf3..58689928367a9b3253208733442bad4172f2dc7d 100755 (executable)
--- a/python/generator.py
+++ b/python/generator.py
@@ -184,6 +184,8 @@ def enum(type, name, value):
 functions_failed = []
 functions_skipped = [
     "virConnectListDomains",
+    'virDomainBlockPull',
+    'virDomainGetBlockPullInfo',
 ]
 
 skipped_modules = {
@@ -198,6 +200,7 @@ skipped_types = {
      'virConnectDomainEventIOErrorCallback': "No function types in python",
      'virConnectDomainEventGraphicsCallback': "No function types in python",
      'virEventAddHandleFunc': "No function types in python",
+     'virDomainBlockPullInfoPtr': "Not implemented yet",
 }
 
 #######################################################################

diff --git a/src/driver.h b/src/driver.h
index a94bbb0193ad25f4ad7673b5d5d27c19be04b39b..d45575af995f06891426d41a85efc17a9f6f6da0 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -644,6 +644,24 @@ typedef int
                      unsigned long flags,
                      int cancelled);
 
+typedef int
+    (*virDrvDomainBlockPull)(virDomainPtr dom, const char *path,
+                             virDomainBlockPullInfoPtr info,
+                             unsigned int flags);
+
+typedef int
+    (*virDrvDomainBlockPullAll)(virDomainPtr dom, const char *path,
+                                unsigned int flags);
+
+typedef int
+    (*virDrvDomainBlockPullAbort)(virDomainPtr dom, const char *path,
+                                  unsigned int flags);
+
+typedef int
+    (*virDrvDomainGetBlockPullInfo)(virDomainPtr dom, const char *path,
+                                    virDomainBlockPullInfoPtr info,
+                                    unsigned int flags);
+
 /**
  * _virDriver:
  *
@@ -782,6 +800,10 @@ struct _virDriver {
     virDrvDomainMigrateFinish3 domainMigrateFinish3;
     virDrvDomainMigrateConfirm3        domainMigrateConfirm3;
     virDrvDomainSendKey domainSendKey;
+    virDrvDomainBlockPull domainBlockPull;
+    virDrvDomainBlockPullAll domainBlockPullAll;
+    virDrvDomainBlockPullAbort domainBlockPullAbort;
+    virDrvDomainGetBlockPullInfo domainGetBlockPullInfo;
 };
 
 typedef int

diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 362dbed070de7348b3b340f0838ead34154baf6f..f7a6df6b7fda25fa4735654700cbf8b4ca006f29 100644 (file)
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -452,6 +452,10 @@ LIBVIRT_0.9.2 {
 
 LIBVIRT_0.9.3 {
     global:
+        virDomainBlockPull;
+        virDomainBlockPullAbort;
+        virDomainBlockPullAll;
+        virDomainGetBlockPullInfo;
         virDomainPinVcpuFlags;
         virDomainSendKey;
         virNodeGetCPUStats;