]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "Add new API virDomainBlockPull* to headers"
authorEric Blake <eblake@redhat.com>
Thu, 23 Jun 2011 21:40:48 +0000 (15:40 -0600)
committerEric Blake <eblake@redhat.com>
Fri, 24 Jun 2011 14:41:25 +0000 (08:41 -0600)
This reverts commit 7d56a16d036d9aa7292e10e884c129742036f8a7.

Conflicts:

python/generator.py
src/libvirt_public.syms

include/libvirt/libvirt.h.in
python/generator.py
src/driver.h
src/libvirt_public.syms

index f7c16fb7afd0883fd0be051ffcbe22d11a3c9da9..229c3cd1e6f3fefb8bffe028b7c6dd42ddebf846 100644 (file)
@@ -1373,45 +1373,6 @@ 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
  */
index bbd150e6538bdee09d6c9de3faee80f75d3614b7..c27ff739a47db0f8981ef19456fb0b1594f32721 100755 (executable)
@@ -184,8 +184,6 @@ def enum(type, name, value):
 functions_failed = []
 functions_skipped = [
     "virConnectListDomains",
-    'virDomainBlockPull',
-    'virDomainGetBlockPullInfo',
 ]
 
 skipped_modules = {
@@ -202,7 +200,6 @@ skipped_types = {
      'virStreamEventCallback': "No function types in python",
      'virEventHandleCallback': "No function types in python",
      'virEventTimeoutCallback': "No function types in python",
-     'virDomainBlockPullInfoPtr': "Not implemented yet",
 }
 
 #######################################################################
index 62bbc1d4226ecf484f93226019819597cad036c5..b02989bd60e7d92e2830e2407698b073ce8f0776 100644 (file)
@@ -648,24 +648,6 @@ 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:
  *
@@ -805,10 +787,6 @@ struct _virDriver {
     virDrvDomainMigrateFinish3 domainMigrateFinish3;
     virDrvDomainMigrateConfirm3        domainMigrateConfirm3;
     virDrvDomainSendKey domainSendKey;
-    virDrvDomainBlockPull domainBlockPull;
-    virDrvDomainBlockPullAll domainBlockPullAll;
-    virDrvDomainBlockPullAbort domainBlockPullAbort;
-    virDrvDomainGetBlockPullInfo domainGetBlockPullInfo;
 };
 
 typedef int
index 39d4cae4adee08c99b5f6ce4d194afe76e9f785b..768722330954afc0a2f88458a09a124ed9c930f8 100644 (file)
@@ -452,10 +452,6 @@ LIBVIRT_0.9.2 {
 
 LIBVIRT_0.9.3 {
     global:
-        virDomainBlockPull;
-        virDomainBlockPullAbort;
-        virDomainBlockPullAll;
-        virDomainGetBlockPullInfo;
         virDomainGetControlInfo;
         virDomainPinVcpuFlags;
         virDomainSendKey;