NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Asynchronous event for BlockPull completion"

Browse Source 
This reverts commit 12cd77a0c5.

Conflicts:

	python/libvirt-override-virConnect.py
	python/libvirt-override.c
	src/remote/remote_protocol.x
This commit is contained in:
Eric Blake
2011-06-23 11:54:19 -06:00
parent cd48c3f4e9
commit c4c59e7228
14 changed files with 2 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
daemon/remote.c
View File

@@ -396,37 +396,6 @@ static int remoteRelayDomainEventGraphics(virConnectPtr conn ATTRIBUTE_UNUSED,
return 0;
}
static int remoteRelayDomainEventBlockPull(virConnectPtr conn ATTRIBUTE_UNUSED,
virDomainPtr dom,
const char *path,
int status,
void *opaque)
{
struct qemud_client *client = opaque;
remote_domain_event_block_pull_msg data;
if (!client)
return -1;
VIR_DEBUG("Relaying domain block pull event %s %d %s %i", dom->name, dom->id, path, status);
virMutexLock(&client->lock);
/* build return data */
memset(&data, 0, sizeof data);
make_nonnull_domain(&data.dom, dom);
data.path = (char*)path;
data.status = status;
remoteDispatchDomainEventSend(client,
REMOTE_PROC_DOMAIN_EVENT_BLOCK_PULL,
(xdrproc_t)xdr_remote_domain_event_block_pull_msg, &data);
virMutexUnlock(&client->lock);
return 0;
}
static int remoteRelayDomainEventControlError(virConnectPtr conn ATTRIBUTE_UNUSED,
virDomainPtr dom,
@@ -465,7 +434,6 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = {
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventGraphics),
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventIOErrorReason),
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventControlError),
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockPull),
};
verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST);