[libvirt] [PATCH] remote: Generate virDomainGetBlockPullInfo
It was already generatable but skipped.
---
daemon/remote.c | 36 ------------------------------------
src/remote/remote_driver.c | 32 --------------------------------
src/remote/remote_protocol.x | 4 ++--
3 files changed, 2 insertions(+), 70 deletions(-)
diff --git a/daemon/remote.c b/daemon/remote.c
index 1914b25..8e0f47d 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1737,42 +1737,6 @@ cleanup:
return rv;
}
-static int
-remoteDispatchDomainGetBlockPullInfo(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_get_block_pull_info_args *args,
- remote_domain_get_block_pull_info_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 (virDomainGetBlockPullInfo(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 f4b43e0..5db1064 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2671,38 +2671,6 @@ done:
return rv;
}
-static int remoteDomainGetBlockPullInfo(virDomainPtr domain,
- const char *path,
- virDomainBlockPullInfoPtr info,
- unsigned int flags)
-{
- int rv = -1;
- remote_domain_get_block_pull_info_args args;
- remote_domain_get_block_pull_info_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_GET_BLOCK_PULL_INFO,
- (xdrproc_t)xdr_remote_domain_get_block_pull_info_args,
- (char *)&args,
- (xdrproc_t)xdr_remote_domain_get_block_pull_info_ret,
- (char *)&ret) == -1)
- goto done;
-
- info->cur = ret.cur;
- info->end = ret.end;
- rv = 0;
-
-done:
- remoteDriverUnlock(priv);
- return rv;
-}
-
/*----------------------------------------------------------------------*/
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 2b9784b..b136e41 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1003,7 +1003,7 @@ struct remote_domain_get_block_pull_info_args {
unsigned int flags;
};
-struct remote_domain_get_block_pull_info_ret {
+struct remote_domain_get_block_pull_info_ret { /* insert@2 */
unsigned hyper cur;
unsigned hyper end;
};
@@ -2409,7 +2409,7 @@ enum remote_procedure {
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, /* skipgen skipgen */
+ REMOTE_PROC_DOMAIN_GET_BLOCK_PULL_INFO = 232, /* autogen autogen */
REMOTE_PROC_DOMAIN_EVENT_BLOCK_PULL = 233 /* skipgen skipgen */
/*
--
1.7.0.4