[libvirt] [PATCH 3/8] Add virDomainBlockPull support to the remote driver
Adam Litke
agl at us.ibm.com
Tue Jun 14 13:17:34 UTC 2011
On 06/14/2011 04:49 AM, Daniel P. Berrange wrote:
> On Thu, Jun 09, 2011 at 12:10:09PM -0500, Adam Litke wrote:
>> The generator can handle DomainBlockPullAll and DomainBlockPullAbort.
>> DomainBlockPull and DomainBlockPullInfo must be written by hand.
>>
>> * src/remote/remote_protocol.x: provide defines for the new entry points
>> * src/remote/remote_driver.c daemon/remote.c: implement the client and
>> server side
>> * src/remote_protocol-structs: structure definitions for protocol verification
>>
>> Signed-off-by: Adam Litke <agl at us.ibm.com>
>> ---
>> daemon/remote.c | 71 ++++++++++++++++++++++++++++++++++++++++++
>> src/remote/remote_driver.c | 68 ++++++++++++++++++++++++++++++++++++++++
>> src/remote/remote_protocol.x | 40 +++++++++++++++++++++++-
>> src/remote_protocol-structs | 28 ++++++++++++++++
>> 4 files changed, 206 insertions(+), 1 deletions(-)
>>
>> diff --git a/daemon/remote.c b/daemon/remote.c
>> index 49058f2..e0b681c 100644
>> --- a/daemon/remote.c
>> +++ b/daemon/remote.c
>> @@ -1474,6 +1474,77 @@ cleanup:
>> return rv;
>> }
>>
>> +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;
>> + rv = 0;
>> + ret->cur = tmp.cur;
>> + ret->end = tmp.end;
>
> 'rv = 0' should really be the last statement before the cleanup
> label. Likewise for next method.
Ok.
>> static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
>> @@ -6337,6 +6401,10 @@ static virDriver remote_driver = {
>> .domainMigratePerform3 = remoteDomainMigratePerform3, /* 0.9.2 */
>> .domainMigrateFinish3 = remoteDomainMigrateFinish3, /* 0.9.2 */
>> .domainMigrateConfirm3 = remoteDomainMigrateConfirm3, /* 0.9.2 */
>> + .domainBlockPull = remoteDomainBlockPull, /* 0.9.2 */
>> + .domainBlockPullAll = remoteDomainBlockPullAll, /* 0.9.2 */
>> + .domainBlockPullAbort = remoteDomainBlockPullAbort, /* 0.9.2 */
>> + .domainGetBlockPullInfo = remoteDomainGetBlockPullInfo, /* 0.9.2 */
>> };
>
> These need updating to 0.9.3
Ok, Got these and the qemu ones.
--
Adam Litke
IBM Linux Technology Center
More information about the libvir-list
mailing list