NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-08-10 04:58:12 -05: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-24 08:41:24 -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
src/conf/domain_event.c
-51
View File
@@ -83,10 +83,6 @@ struct _virDomainEvent {
char *authScheme;
virDomainEventGraphicsSubjectPtr subject;
} graphics;
struct {
char *path;
int status;
} blockPull;
} data;
};
@@ -503,11 +499,6 @@ void virDomainEventFree(virDomainEventPtr event)
}
VIR_FREE(event->data.graphics.subject);
}
break;
case VIR_DOMAIN_EVENT_ID_BLOCK_PULL:
VIR_FREE(event->data.blockPull.path);
break;
}
VIR_FREE(event->dom.name);
@@ -883,41 +874,6 @@ virDomainEventPtr virDomainEventGraphicsNewFromObj(virDomainObjPtr obj,
return ev;
}
static virDomainEventPtr
virDomainEventBlockPullNew(int id, const char *name, unsigned char *uuid,
const char *path, int status)
{
virDomainEventPtr ev =
virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_BLOCK_PULL,
id, name, uuid);
if (ev) {
if (!(ev->data.blockPull.path = strdup(path))) {
virReportOOMError();
virDomainEventFree(ev);
return NULL;
}
ev->data.blockPull.status = status;
}
return ev;
}
virDomainEventPtr virDomainEventBlockPullNewFromObj(virDomainObjPtr obj,
const char *path,
int status)
{
return virDomainEventBlockPullNew(obj->def->id, obj->def->name,
obj->def->uuid, path, status);
}
virDomainEventPtr virDomainEventBlockPullNewFromDom(virDomainPtr dom,
const char *path,
int status)
{
return virDomainEventBlockPullNew(dom->id, dom->name, dom->uuid,
path, status);
}
virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom)
{
@@ -1071,13 +1027,6 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn,
cbopaque);
break;
case VIR_DOMAIN_EVENT_ID_BLOCK_PULL:
((virConnectDomainEventBlockPullCallback)cb)(conn, dom,
event->data.blockPull.path,
event->data.blockPull.status,
cbopaque);
break;
default:
VIR_WARN("Unexpected event ID %d", event->eventID);
break;
src/conf/domain_event.h
+1 -6
View File
@@ -169,12 +169,7 @@ virDomainEventPtr virDomainEventGraphicsNewFromObj(virDomainObjPtr obj,
virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom);
virDomainEventPtr virDomainEventControlErrorNewFromObj(virDomainObjPtr obj);
virDomainEventPtr virDomainEventBlockPullNewFromObj(virDomainObjPtr obj,
const char *path,
int status);
virDomainEventPtr virDomainEventBlockPullNewFromDom(virDomainPtr dom,
const char *path,
int status);
int virDomainEventQueuePush(virDomainEventQueuePtr evtQueue,
virDomainEventPtr event);
src/libvirt_private.syms
-2
View File
@@ -382,8 +382,6 @@ virDomainWatchdogModelTypeToString;
# domain_event.h
virDomainEventBlockPullNewFromObj;
virDomainEventBlockPullNewFromDom;
virDomainEventCallbackListAdd;
virDomainEventCallbackListAddID;
virDomainEventCallbackListCount;
src/qemu/qemu_monitor.c
-12
View File
@@ -956,18 +956,6 @@ int qemuMonitorEmitGraphics(qemuMonitorPtr mon,
return ret;
}
int qemuMonitorEmitBlockPull(qemuMonitorPtr mon,
const char *diskAlias,
int status)
{
int ret = -1;
VIR_DEBUG("mon=%p", mon);
QEMU_MONITOR_CALLBACK(mon, ret, domainBlockPull, mon->vm,
diskAlias, status);
return ret;
}
int qemuMonitorSetCapabilities(qemuMonitorPtr mon)
src/qemu/qemu_monitor.h
-8
View File
@@ -117,10 +117,6 @@ struct _qemuMonitorCallbacks {
const char *authScheme,
const char *x509dname,
const char *saslUsername);
int (*domainBlockPull)(qemuMonitorPtr mon,
virDomainObjPtr vm,
const char *diskAlias,
int status);
};
@@ -183,10 +179,6 @@ int qemuMonitorEmitGraphics(qemuMonitorPtr mon,
const char *authScheme,
const char *x509dname,
const char *saslUsername);
int qemuMonitorEmitBlockPull(qemuMonitorPtr mon,
const char *diskAlias,
int status);
int qemuMonitorStartCPUs(qemuMonitorPtr mon,
src/qemu/qemu_monitor_json.c
-30
View File
@@ -56,7 +56,6 @@ static void qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr dat
static void qemuMonitorJSONHandleVNCConnect(qemuMonitorPtr mon, virJSONValuePtr data);
static void qemuMonitorJSONHandleVNCInitialize(qemuMonitorPtr mon, virJSONValuePtr data);
static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValuePtr data);
static void qemuMonitorJSONHandleBlockPull(qemuMonitorPtr mon, virJSONValuePtr data);
struct {
const char *type;
@@ -72,7 +71,6 @@ struct {
{ "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, },
{ "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, },
{ "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, },
{ "BLOCK_STREAM_COMPLETED", qemuMonitorJSONHandleBlockPull, },
};
@@ -681,34 +679,6 @@ static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValueP
qemuMonitorJSONHandleVNC(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_DISCONNECT);
}
static void qemuMonitorJSONHandleBlockPull(qemuMonitorPtr mon, virJSONValuePtr data)
{
const char *device;
unsigned long long offset, len;
int status = VIR_DOMAIN_BLOCK_PULL_FAILED;
if ((device = virJSONValueObjectGetString(data, "device")) == NULL) {
VIR_WARN("missing device in disk io error event");
goto out;
}
if (virJSONValueObjectGetNumberUlong(data, "offset", &offset) < 0) {
VIR_WARN("missing offset in block pull event");
goto out;
}
if (virJSONValueObjectGetNumberUlong(data, "len", &len) < 0) {
VIR_WARN("missing len in block pull event");
goto out;
}
if (offset != 0 && offset == len)
status = VIR_DOMAIN_BLOCK_PULL_COMPLETED;
out:
qemuMonitorEmitBlockPull(mon, device, status);
}
int
qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
src/qemu/qemu_process.c
-30
View File
@@ -658,35 +658,6 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
return 0;
}
static int
qemuProcessHandleBlockPull(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm,
const char *diskAlias,
int status)
{
struct qemud_driver *driver = qemu_driver;
virDomainEventPtr event = NULL;
const char *path;
virDomainDiskDefPtr disk;
virDomainObjLock(vm);
disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias);
if (disk) {
path = disk->src;
event = virDomainEventBlockPullNewFromObj(vm, path, status);
}
virDomainObjUnlock(vm);
if (event) {
qemuDriverLock(driver);
qemuDomainEventQueue(driver, event);
qemuDriverUnlock(driver);
}
return 0;
}
static int
qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
@@ -804,7 +775,6 @@ static qemuMonitorCallbacks monitorCallbacks = {
.domainWatchdog = qemuProcessHandleWatchdog,
.domainIOError = qemuProcessHandleIOError,
.domainGraphics = qemuProcessHandleGraphics,
.domainBlockPull = qemuProcessHandleBlockPull,
};
static int
src/remote/remote_driver.c
-30
View File
@@ -3824,32 +3824,6 @@ remoteDomainReadEventIOErrorReason(virConnectPtr conn, XDR *xdr)
return event;
}
static virDomainEventPtr
remoteDomainReadEventBlockPull(virConnectPtr conn, XDR *xdr)
{
remote_domain_event_block_pull_msg msg;
virDomainPtr dom;
virDomainEventPtr event = NULL;
memset (&msg, 0, sizeof msg);
/* unmarshall parameters, and process it*/
if (! xdr_remote_domain_event_block_pull_msg(xdr, &msg) ) {
remoteError(VIR_ERR_RPC, "%s",
_("unable to demarshall block_pull event"));
return NULL;
}
dom = get_nonnull_domain(conn,msg.dom);
if (!dom)
return NULL;
event = virDomainEventBlockPullNewFromDom(dom, msg.path, msg.status);
xdr_free ((xdrproc_t) &xdr_remote_domain_event_block_pull_msg, (char *) &msg);
virDomainFree(dom);
return event;
}
static virDomainEventPtr
remoteDomainReadEventGraphics(virConnectPtr conn, XDR *xdr)
@@ -5574,10 +5548,6 @@ processCallDispatchMessage(virConnectPtr conn, struct private_data *priv,
event = remoteDomainReadEventControlError(conn, xdr);
break;
case REMOTE_PROC_DOMAIN_EVENT_BLOCK_PULL:
event = remoteDomainReadEventBlockPull(conn, xdr);
break;
default:
VIR_DEBUG("Unexpected event proc %d", hdr->proc);
break;
src/remote/remote_protocol.x
+1 -8
View File
@@ -1931,12 +1931,6 @@ struct remote_domain_event_graphics_msg {
remote_domain_event_graphics_identity subject<REMOTE_DOMAIN_EVENT_GRAPHICS_IDENTITY_MAX>;
};
struct remote_domain_event_block_pull_msg {
remote_nonnull_domain dom;
remote_nonnull_string path;
int status;
};
struct remote_domain_managed_save_args {
remote_nonnull_domain dom;
unsigned int flags;
@@ -2424,8 +2418,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_BLOCK_PULL_ABORT = 231, /* autogen autogen */
REMOTE_PROC_DOMAIN_GET_BLOCK_PULL_INFO = 232, /* autogen autogen */
REMOTE_PROC_DOMAIN_EVENT_BLOCK_PULL = 233, /* skipgen skipgen */
REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 234 /* autogen autogen */
REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 233 /* autogen autogen */
/*
* Notice how the entries are grouped in sets of 10 ?
src/remote_protocol-structs
-5
View File
@@ -1421,11 +1421,6 @@ struct remote_domain_event_graphics_msg {
remote_domain_event_graphics_identity * subject_val;
} subject;
};
struct remote_domain_event_block_pull_msg {
remote_nonnull_domain dom;
remote_nonnull_string path;
int status;
};
struct remote_domain_managed_save_args {
remote_nonnull_domain dom;
u_int flags;