mirror of https://gitee.com/openkylin/libvirt.git
Revert "Add new API virDomainBlockPull* to headers"
This reverts commit 7d56a16d03
.
Conflicts:
python/generator.py
src/libvirt_public.syms
This commit is contained in:
parent
6389bea91c
commit
1aa859d633
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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",
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
|
|
22
src/driver.h
22
src/driver.h
|
@ -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
|
||||
|
|
|
@ -452,10 +452,6 @@ LIBVIRT_0.9.2 {
|
|||
|
||||
LIBVIRT_0.9.3 {
|
||||
global:
|
||||
virDomainBlockPull;
|
||||
virDomainBlockPullAbort;
|
||||
virDomainBlockPullAll;
|
||||
virDomainGetBlockPullInfo;
|
||||
virDomainGetControlInfo;
|
||||
virDomainPinVcpuFlags;
|
||||
virDomainSendKey;
|
||||
|
|
Loading…
Reference in New Issue