External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Rename domain lifecycle event message

Browse Source 
To avoid confusion, rename the current REMOTE_PROC_DOMAIN_EVENT
message to REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE. This does not
cause ABI problems, since the names are only relevant at the source
code level. On the wire they encoding is a plain integer whose
value does not change

* src/remote/remote_protocol.x: Rename REMOTE_PROC_DOMAIN_EVENT
  to REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE.
* daemon/remote.c, src/remote/remote_driver.c: Update code for
  renamed event
This commit is contained in:
Daniel P. Berrange 2010-03-19 14:28:23 +00:00
parent 6bae6677c8
commit d51638d0ad
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/remote.c
View File

@ -105,7 +105,7 @@ static int remoteRelayDomainEventLifecycle(virConnectPtr conn ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
struct qemud_client *client = opaque; struct qemud_client *client = opaque;
remote_domain_event_msg data; remote_domain_event_lifecycle_msg data;
if (!client) if (!client)
return -1; return -1;
@ -121,8 +121,8 @@ static int remoteRelayDomainEventLifecycle(virConnectPtr conn ATTRIBUTE_UNUSED,
data.detail = detail; data.detail = detail;
remoteDispatchDomainEventSend (client, remoteDispatchDomainEventSend (client,
REMOTE_PROC_DOMAIN_EVENT, REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE,
(xdrproc_t)xdr_remote_domain_event_msg, &data); (xdrproc_t)xdr_remote_domain_event_lifecycle_msg, &data);
virMutexUnlock(&client->lock); virMutexUnlock(&client->lock);

2
daemon/remote_dispatch_table.h
View File

@ -537,7 +537,7 @@
.args_filter = (xdrproc_t) xdr_void, .args_filter = (xdrproc_t) xdr_void,
.ret_filter = (xdrproc_t) xdr_remote_domain_events_deregister_ret, .ret_filter = (xdrproc_t) xdr_remote_domain_events_deregister_ret,
}, },
{ /* Async event DomainEvent => 107 */ { /* Async event DomainEventLifecycle => 107 */
.fn = NULL, .fn = NULL,
.args_filter = (xdrproc_t) xdr_void, .args_filter = (xdrproc_t) xdr_void,
.ret_filter = (xdrproc_t) xdr_void, .ret_filter = (xdrproc_t) xdr_void,

8
src/remote/remote_driver.c
View File

@ -6889,13 +6889,13 @@ done:
static virDomainEventPtr static virDomainEventPtr
remoteDomainReadEventLifecycle(virConnectPtr conn, XDR *xdr) remoteDomainReadEventLifecycle(virConnectPtr conn, XDR *xdr)
{ {
remote_domain_event_msg msg; remote_domain_event_lifecycle_msg msg;
virDomainPtr dom; virDomainPtr dom;
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
memset (&msg, 0, sizeof msg); memset (&msg, 0, sizeof msg);
/* unmarshall parameters, and process it*/ /* unmarshall parameters, and process it*/
if (! xdr_remote_domain_event_msg(xdr, &msg) ) { if (! xdr_remote_domain_event_lifecycle_msg(xdr, &msg) ) {
error (conn, VIR_ERR_RPC, error (conn, VIR_ERR_RPC,
_("unable to demarshall lifecycle event")); _("unable to demarshall lifecycle event"));
return NULL; return NULL;
@ -6906,7 +6906,7 @@ remoteDomainReadEventLifecycle(virConnectPtr conn, XDR *xdr)
return NULL; return NULL;
event = virDomainEventNewFromDom(dom, msg.event, msg.detail); event = virDomainEventNewFromDom(dom, msg.event, msg.detail);
xdr_free ((xdrproc_t) &xdr_remote_domain_event_msg, (char *) &msg); xdr_free ((xdrproc_t) &xdr_remote_domain_event_lifecycle_msg, (char *) &msg);
virDomainFree(dom); virDomainFree(dom);
return event; return event;
@ -8452,7 +8452,7 @@ processCallDispatchMessage(virConnectPtr conn, struct private_data *priv,
} }
switch (hdr->proc) { switch (hdr->proc) {
case REMOTE_PROC_DOMAIN_EVENT: case REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE:
event = remoteDomainReadEventLifecycle(conn, xdr); event = remoteDomainReadEventLifecycle(conn, xdr);
break; break;

2
src/remote/remote_protocol.c
View File

@ -2571,7 +2571,7 @@ xdr_remote_domain_events_deregister_ret (XDR *xdrs, remote_domain_events_deregis
} }
bool_t bool_t
xdr_remote_domain_event_msg (XDR *xdrs, remote_domain_event_msg *objp) xdr_remote_domain_event_lifecycle_msg (XDR *xdrs, remote_domain_event_lifecycle_msg *objp)
{ {
if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))

10
src/remote/remote_protocol.h
View File

@ -1456,12 +1456,12 @@ struct remote_domain_events_deregister_ret {
}; };
typedef struct remote_domain_events_deregister_ret remote_domain_events_deregister_ret; typedef struct remote_domain_events_deregister_ret remote_domain_events_deregister_ret;
struct remote_domain_event_msg { struct remote_domain_event_lifecycle_msg {
remote_nonnull_domain dom; remote_nonnull_domain dom;
int event; int event;
int detail; int detail;
}; };
typedef struct remote_domain_event_msg remote_domain_event_msg; typedef struct remote_domain_event_lifecycle_msg remote_domain_event_lifecycle_msg;
struct remote_domain_xml_from_native_args { struct remote_domain_xml_from_native_args {
remote_nonnull_string nativeFormat; remote_nonnull_string nativeFormat;
@ -1837,7 +1837,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104, REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104,
REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105, REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105,
REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106,
REMOTE_PROC_DOMAIN_EVENT = 107, REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE = 107,
REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108,
REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109, REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109,
REMOTE_PROC_GET_URI = 110, REMOTE_PROC_GET_URI = 110,
@ -2166,7 +2166,7 @@ extern bool_t xdr_remote_node_device_create_xml_ret (XDR *, remote_node_device_
extern bool_t xdr_remote_node_device_destroy_args (XDR *, remote_node_device_destroy_args*); extern bool_t xdr_remote_node_device_destroy_args (XDR *, remote_node_device_destroy_args*);
extern bool_t xdr_remote_domain_events_register_ret (XDR *, remote_domain_events_register_ret*); extern bool_t xdr_remote_domain_events_register_ret (XDR *, remote_domain_events_register_ret*);
extern bool_t xdr_remote_domain_events_deregister_ret (XDR *, remote_domain_events_deregister_ret*); extern bool_t xdr_remote_domain_events_deregister_ret (XDR *, remote_domain_events_deregister_ret*);
extern bool_t xdr_remote_domain_event_msg (XDR *, remote_domain_event_msg*); extern bool_t xdr_remote_domain_event_lifecycle_msg (XDR *, remote_domain_event_lifecycle_msg*);
extern bool_t xdr_remote_domain_xml_from_native_args (XDR *, remote_domain_xml_from_native_args*); extern bool_t xdr_remote_domain_xml_from_native_args (XDR *, remote_domain_xml_from_native_args*);
extern bool_t xdr_remote_domain_xml_from_native_ret (XDR *, remote_domain_xml_from_native_ret*); extern bool_t xdr_remote_domain_xml_from_native_ret (XDR *, remote_domain_xml_from_native_ret*);
extern bool_t xdr_remote_domain_xml_to_native_args (XDR *, remote_domain_xml_to_native_args*); extern bool_t xdr_remote_domain_xml_to_native_args (XDR *, remote_domain_xml_to_native_args*);
@ -2453,7 +2453,7 @@ extern bool_t xdr_remote_node_device_create_xml_ret ();
extern bool_t xdr_remote_node_device_destroy_args (); extern bool_t xdr_remote_node_device_destroy_args ();
extern bool_t xdr_remote_domain_events_register_ret (); extern bool_t xdr_remote_domain_events_register_ret ();
extern bool_t xdr_remote_domain_events_deregister_ret (); extern bool_t xdr_remote_domain_events_deregister_ret ();
extern bool_t xdr_remote_domain_event_msg (); extern bool_t xdr_remote_domain_event_lifecycle_msg ();
extern bool_t xdr_remote_domain_xml_from_native_args (); extern bool_t xdr_remote_domain_xml_from_native_args ();
extern bool_t xdr_remote_domain_xml_from_native_ret (); extern bool_t xdr_remote_domain_xml_from_native_ret ();
extern bool_t xdr_remote_domain_xml_to_native_args (); extern bool_t xdr_remote_domain_xml_to_native_args ();

4
src/remote/remote_protocol.x
View File

@ -1304,7 +1304,7 @@ struct remote_domain_events_deregister_ret {
int cb_registered; int cb_registered;
}; };
struct remote_domain_event_msg { struct remote_domain_event_lifecycle_msg {
remote_nonnull_domain dom; remote_nonnull_domain dom;
int event; int event;
int detail; int detail;
@ -1660,7 +1660,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104, REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104,
REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105, REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105,
REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106,
REMOTE_PROC_DOMAIN_EVENT = 107, REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE = 107,
REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108,
REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109, REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109,
REMOTE_PROC_GET_URI = 110, REMOTE_PROC_GET_URI = 110,