[libvirt] [PATCH 5/7] Revert "Add virDomainBlockPull support to the remote driver"

This reverts commit d1693bb160ea78954592c45a40eb856190c619c8. Conflicts: daemon/remote.c src/remote/remote_driver.c src/remote/remote_protocol.x --- daemon/remote.c | 35 ----------------------------------- src/remote/remote_driver.c | 36 ------------------------------------ src/remote/remote_protocol.x | 41 +---------------------------------------- src/remote_protocol-structs | 28 ---------------------------- 4 files changed, 1 insertions(+), 139 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 5e58427..48624d6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1524,41 +1524,6 @@ no_memory: goto cleanup; } -static int -remoteDispatchDomainBlockPull(struct qemud_server *server ATTRIBUTE_UNUSED, - struct qemud_client *client ATTRIBUTE_UNUSED, - virConnectPtr conn, - remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error * rerr, - remote_domain_block_pull_args *args, - remote_domain_block_pull_ret *ret) -{ - virDomainPtr dom = NULL; - virDomainBlockPullInfo tmp; - int rv = -1; - - if (!conn) { - virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); - goto cleanup; - } - - if (!(dom = get_nonnull_domain(conn, args->dom))) - goto cleanup; - - if (virDomainBlockPull(dom, args->path, &tmp, args->flags) < 0) - goto cleanup; - ret->cur = tmp.cur; - ret->end = tmp.end; - rv = 0; - -cleanup: - if (rv < 0) - remoteDispatchError(rerr); - if (dom) - virDomainFree(dom); - return rv; -} - /*-------------------------------------------------------------*/ static int diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fdbcc36..a7ac90a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2638,38 +2638,6 @@ done: return rv; } -static int remoteDomainBlockPull(virDomainPtr domain, - const char *path, - virDomainBlockPullInfoPtr info, - unsigned int flags) -{ - int rv = -1; - remote_domain_block_pull_args args; - remote_domain_block_pull_ret ret; - struct private_data *priv = domain->conn->privateData; - - remoteDriverLock(priv); - - make_nonnull_domain(&args.dom, domain); - args.path = (char *)path; - args.flags = flags; - - if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_BLOCK_PULL, - (xdrproc_t)xdr_remote_domain_block_pull_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_block_pull_ret, (char *)&ret) == -1) - goto done; - - if (info) { - info->cur = ret.cur; - info->end = ret.end; - } - rv = 0; - -done: - remoteDriverUnlock(priv); - return rv; -} - /*----------------------------------------------------------------------*/ static virDrvOpenStatus ATTRIBUTE_NONNULL (1) @@ -6503,10 +6471,6 @@ static virDriver remote_driver = { .domainMigrateFinish3 = remoteDomainMigrateFinish3, /* 0.9.2 */ .domainMigrateConfirm3 = remoteDomainMigrateConfirm3, /* 0.9.2 */ .domainSendKey = remoteDomainSendKey, /* 0.9.3 */ - .domainBlockPull = remoteDomainBlockPull, /* 0.9.3 */ - .domainBlockPullAll = remoteDomainBlockPullAll, /* 0.9.3 */ - .domainBlockPullAbort = remoteDomainBlockPullAbort, /* 0.9.3 */ - .domainGetBlockPullInfo = remoteDomainGetBlockPullInfo, /* 0.9.3 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index a3ea287..35f6ee5 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -977,40 +977,6 @@ struct remote_domain_set_autostart_args { int autostart; }; -struct remote_domain_block_pull_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - unsigned int flags; -}; - -struct remote_domain_block_pull_ret { - unsigned hyper cur; - unsigned hyper end; -}; - -struct remote_domain_block_pull_all_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - unsigned int flags; -}; - -struct remote_domain_block_pull_abort_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - unsigned int flags; -}; - -struct remote_domain_get_block_pull_info_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - unsigned int flags; -}; - -struct remote_domain_get_block_pull_info_ret { /* insert@2 */ - unsigned hyper cur; - unsigned hyper end; -}; - /* Network calls: */ struct remote_num_of_networks_ret { @@ -2413,12 +2379,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SEND_KEY = 226, /* autogen autogen */ REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */ REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, /* skipgen skipgen */ - REMOTE_PROC_DOMAIN_BLOCK_PULL = 229, /* skipgen skipgen */ - REMOTE_PROC_DOMAIN_BLOCK_PULL_ALL = 230, /* autogen autogen */ - - REMOTE_PROC_DOMAIN_BLOCK_PULL_ABORT = 231, /* autogen autogen */ - REMOTE_PROC_DOMAIN_GET_BLOCK_PULL_INFO = 232, /* autogen autogen */ - REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 233 /* autogen autogen */ + REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 229 /* autogen autogen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 99792e8..81bd033 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -654,34 +654,6 @@ struct remote_domain_set_autostart_args { remote_nonnull_domain dom; int autostart; }; -struct remote_domain_block_pull_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - u_int flags; -}; -struct remote_domain_block_pull_ret { - uint64_t cur; - uint64_t end; -}; -struct remote_domain_block_pull_all_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - u_int flags; -}; -struct remote_domain_block_pull_abort_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - u_int flags; -}; -struct remote_domain_get_block_pull_info_args { - remote_nonnull_domain dom; - remote_nonnull_string path; - u_int flags; -}; -struct remote_domain_get_block_pull_info_ret { - uint64_t cur; - uint64_t end; -}; struct remote_num_of_networks_ret { int num; }; -- 1.7.4.4