I just pushed these 4 trivial patches: From: Chris Lalancette <clalance(a)redhat.com&gt; Date: Wed, 7 Apr 2010 11:23:11 -0400 Subject: [PATCH] Fix up formatting of remote protocol stuff. Signed-off-by: Chris Lalancette <clalance(a)redhat.com&gt; --- daemon/remote_dispatch_prototypes.h | 66 +++++++++++++++++----------------- src/remote/remote_protocol.x | 1 + 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h index 5ce2873..f6fcff8 100644 --- a/daemon/remote_dispatch_prototypes.h +++ b/daemon/remote_dispatch_prototypes.h @@ -282,6 +282,14 @@ static int remoteDispatchDomainGetVcpus( remote_error *err, remote_domain_get_vcpus_args *args, remote_domain_get_vcpus_ret *ret); +static int remoteDispatchDomainHasCurrentSnapshot( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *err, + remote_domain_has_current_snapshot_args *args, + remote_domain_has_current_snapshot_ret *ret); static int remoteDispatchDomainHasManagedSaveImage( struct qemud_server *server, struct qemud_client *client, @@ -458,6 +466,14 @@ static int remoteDispatchDomainResume( remote_error *err, remote_domain_resume_args *args, void *ret); +static int remoteDispatchDomainRevertToSnapshot( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *err, + remote_domain_revert_to_snapshot_args *args, + void *ret); static int remoteDispatchDomainSave( struct qemud_server *server, struct qemud_client *client, @@ -522,22 +538,30 @@ static int remoteDispatchDomainSnapshotCreateXml( remote_error *err, remote_domain_snapshot_create_xml_args *args, remote_domain_snapshot_create_xml_ret *ret); -static int remoteDispatchDomainSnapshotDumpXml( +static int remoteDispatchDomainSnapshotCurrent( struct qemud_server *server, struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, remote_error *err, - remote_domain_snapshot_dump_xml_args *args, - remote_domain_snapshot_dump_xml_ret *ret); -static int remoteDispatchDomainSnapshotNum( + remote_domain_snapshot_current_args *args, + remote_domain_snapshot_current_ret *ret); +static int remoteDispatchDomainSnapshotDelete( struct qemud_server *server, struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, remote_error *err, - remote_domain_snapshot_num_args *args, - remote_domain_snapshot_num_ret *ret); + remote_domain_snapshot_delete_args *args, + void *ret); +static int remoteDispatchDomainSnapshotDumpXml( + struct qemud_server *server, + struct qemud_client *client, + virConnectPtr conn, + remote_message_header *hdr, + remote_error *err, + remote_domain_snapshot_dump_xml_args *args, + remote_domain_snapshot_dump_xml_ret *ret); static int remoteDispatchDomainSnapshotListNames( struct qemud_server *server, struct qemud_client *client, @@ -554,38 +578,14 @@ static int remoteDispatchDomainSnapshotLookupByName( remote_error *err, remote_domain_snapshot_lookup_by_name_args *args, remote_domain_snapshot_lookup_by_name_ret *ret); -static int remoteDispatchDomainHasCurrentSnapshot( - struct qemud_server *server, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *err, - remote_domain_has_current_snapshot_args *args, - remote_domain_has_current_snapshot_ret *ret); -static int remoteDispatchDomainSnapshotCurrent( - struct qemud_server *server, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *err, - remote_domain_snapshot_current_args *args, - remote_domain_snapshot_current_ret *ret); -static int remoteDispatchDomainRevertToSnapshot( - struct qemud_server *server, - struct qemud_client *client, - virConnectPtr conn, - remote_message_header *hdr, - remote_error *err, - remote_domain_revert_to_snapshot_args *args, - void *ret); -static int remoteDispatchDomainSnapshotDelete( +static int remoteDispatchDomainSnapshotNum( struct qemud_server *server, struct qemud_client *client, virConnectPtr conn, remote_message_header *hdr, remote_error *err, - remote_domain_snapshot_delete_args *args, - void *ret); + remote_domain_snapshot_num_args *args, + remote_domain_snapshot_num_ret *ret); static int remoteDispatchDomainSuspend( struct qemud_server *server, struct qemud_client *client, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 61b4bc1..9aa3a7e 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1967,6 +1967,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SNAPSHOT_LIST_NAMES = 188, REMOTE_PROC_DOMAIN_SNAPSHOT_LOOKUP_BY_NAME = 189, REMOTE_PROC_DOMAIN_HAS_CURRENT_SNAPSHOT = 190, + REMOTE_PROC_DOMAIN_SNAPSHOT_CURRENT = 191, REMOTE_PROC_DOMAIN_REVERT_TO_SNAPSHOT = 192, REMOTE_PROC_DOMAIN_SNAPSHOT_DELETE = 193 -- 1.6.6.1 From: Chris Lalancette <clalance(a)redhat.com&gt; Date: Thu, 8 Apr 2010 08:19:35 -0400 Subject: [PATCH] Fix messsage -> message. Signed-off-by: Chris Lalancette <clalance(a)redhat.com&gt; --- daemon/dispatch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index f024900..e24acc1 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -348,7 +348,7 @@ remoteDispatchClientCall (struct qemud_server *server, * @msg: the complete incoming message packet, with header already decoded * * This function gets called from qemud when it pulls a incoming - * remote protocol messsage off the dispatch queue for processing. + * remote protocol message off the dispatch queue for processing. * * The @msg parameter must have had its header decoded already by * calling remoteDecodeClientMessageHeader -- 1.6.6.1 From: Chris Lalancette <clalance(a)redhat.com&gt; Date: Thu, 8 Apr 2010 08:47:02 -0400 Subject: [PATCH] Fix up a debug typo. Signed-off-by: Chris Lalancette <clalance(a)redhat.com&gt; --- daemon/dispatch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index e24acc1..8f55eaa 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -363,7 +363,7 @@ remoteDispatchClientRequest (struct qemud_server *server, int ret; remote_error rerr; - DEBUG("prog=%d ver=%d type=%d satus=%d serial=%d proc=%d", + DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d", msg->hdr.prog, msg->hdr.vers, msg->hdr.type, msg->hdr.status, msg->hdr.serial, msg->hdr.proc); -- 1.6.6.1 From: Chris Lalancette <clalance(a)redhat.com&gt; Date: Thu, 8 Apr 2010 10:29:46 -0400 Subject: [PATCH] Remove some debugging leftovers. Signed-off-by: Chris Lalancette <clalance(a)redhat.com&gt; --- src/remote/remote_driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 98cc7f9..eec3322 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7421,15 +7421,12 @@ remoteDomainReadEventGraphics(virConnectPtr conn, XDR *xdr) !(remoteAddr->node = strdup(msg.remote.node))) goto no_memory; - fprintf(stderr, "Got %d\n", msg.subject.subject_len); if (VIR_ALLOC(subject) < 0) goto no_memory; if (VIR_ALLOC_N(subject->identities, msg.subject.subject_len) < 0) goto no_memory; subject->nidentity = msg.subject.subject_len; for (i = 0 ; i < subject->nidentity ; i++) { - fprintf(stderr, " %s=%s\n", msg.subject.subject_val[i].type, - msg.subject.subject_val[i].name); if (!(subject->identities[i].type = strdup(msg.subject.subject_val[i].type)) || !(subject->identities[i].name = strdup(msg.subject.subject_val[i].name))) goto no_memory; -- 1.6.6.1