[libvirt] [PATCH 03/22] remote: Replace 'domain' with 'dom' in the XDR protocol

This simplifies the remote protocol code generator. Also rename 'ret' to 'result' to resolve a naming conflict in the generator. --- daemon/remote.c | 22 +++++++++++----------- daemon/remote_dispatch_bodies.c | 4 ++-- daemon/remote_generator.pl | 2 +- src/remote/qemu_protocol.c | 2 +- src/remote/qemu_protocol.h | 2 +- src/remote/qemu_protocol.x | 2 +- src/remote/remote_driver.c | 20 ++++++++++---------- src/remote/remote_protocol.c | 18 +++++++++--------- src/remote/remote_protocol.h | 18 +++++++++--------- src/remote/remote_protocol.x | 18 +++++++++--------- src/remote_protocol-structs | 18 +++++++++--------- 11 files changed, 63 insertions(+), 63 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 676c99a..48dbcc5 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2875,7 +2875,7 @@ remoteDispatchDomainHasManagedSaveImage(struct qemud_server *server ATTRIBUTE_UN if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - if ((ret->ret = virDomainHasManagedSaveImage(dom, args->flags)) < 0) + if ((ret->result = virDomainHasManagedSaveImage(dom, args->flags)) < 0) goto cleanup; rv = 0; @@ -6361,7 +6361,7 @@ remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (!(snapshot = virDomainSnapshotCreateXML(dom, args->xml_desc, args->flags))) @@ -6399,7 +6399,7 @@ remoteDispatchDomainSnapshotDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->snap.domain))) + if (!(dom = get_nonnull_domain(conn, args->snap.dom))) goto cleanup; if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap))) @@ -6438,7 +6438,7 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if ((ret->num = virDomainSnapshotNum(dom, args->flags)) < 0) @@ -6478,7 +6478,7 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; /* Allocate return buffer. */ @@ -6525,7 +6525,7 @@ remoteDispatchDomainSnapshotLookupByName(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (!(snapshot = virDomainSnapshotLookupByName(dom, args->name, args->flags))) @@ -6563,7 +6563,7 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; result = virDomainHasCurrentSnapshot(dom, args->flags); @@ -6600,7 +6600,7 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (!(snapshot = virDomainSnapshotCurrent(dom, args->flags))) @@ -6969,7 +6969,7 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainQemuMonitorCommand(dom, args->cmd, &ret->result, @@ -7005,7 +7005,7 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (!(stream = remoteCreateClientStream(conn, hdr))) { @@ -7168,5 +7168,5 @@ static void make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *snapshot_dst, virDomainSnapshotPtr snapshot_src) { snapshot_dst->name = strdup(snapshot_src->name); - make_nonnull_domain(&snapshot_dst->domain, snapshot_src->domain); + make_nonnull_domain(&snapshot_dst->dom, snapshot_src->domain); } diff --git a/daemon/remote_dispatch_bodies.c b/daemon/remote_dispatch_bodies.c index 962b12a..a3360c5 100644 --- a/daemon/remote_dispatch_bodies.c +++ b/daemon/remote_dispatch_bodies.c @@ -629,7 +629,7 @@ remoteDispatchDomainRevertToSnapshot( goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->snap.domain))) + if (!(dom = get_nonnull_domain(conn, args->snap.dom))) goto cleanup; if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap))) @@ -951,7 +951,7 @@ remoteDispatchDomainSnapshotDelete( goto cleanup; } - if (!(dom = get_nonnull_domain(conn, args->snap.domain))) + if (!(dom = get_nonnull_domain(conn, args->snap.dom))) goto cleanup; if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap))) diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl index bf971e2..8ad6d0d 100755 --- a/daemon/remote_generator.pl +++ b/daemon/remote_generator.pl @@ -367,7 +367,7 @@ elsif ($opt_b) { push(@vars_list, "virDomainPtr dom = NULL"); push(@vars_list, "virDomainSnapshotPtr snapshot = NULL"); push(@getters_list, - " if (!(dom = get_nonnull_domain(conn, args->snap.domain)))\n" . + " if (!(dom = get_nonnull_domain(conn, args->snap.dom)))\n" . " goto cleanup;\n" . "\n" . " if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap)))\n" . diff --git a/src/remote/qemu_protocol.c b/src/remote/qemu_protocol.c index 81916ed..3480c54 100644 --- a/src/remote/qemu_protocol.c +++ b/src/remote/qemu_protocol.c @@ -13,7 +13,7 @@ bool_t xdr_qemu_monitor_command_args (XDR *xdrs, qemu_monitor_command_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_remote_nonnull_string (xdrs, &objp->cmd)) return FALSE; diff --git a/src/remote/qemu_protocol.h b/src/remote/qemu_protocol.h index b822187..c2501c7 100644 --- a/src/remote/qemu_protocol.h +++ b/src/remote/qemu_protocol.h @@ -18,7 +18,7 @@ extern "C" { #include <arpa/inet.h> struct qemu_monitor_command_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string cmd; int flags; }; diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x index 1d07895..9eed73f 100644 --- a/src/remote/qemu_protocol.x +++ b/src/remote/qemu_protocol.x @@ -28,7 +28,7 @@ /*----- Protocol. -----*/ struct qemu_monitor_command_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string cmd; int flags; }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e30780c..9d6056b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4352,7 +4352,7 @@ remoteDomainHasManagedSaveImage (virDomainPtr domain, unsigned int flags) (xdrproc_t) xdr_remote_domain_has_managed_save_image_ret, (char *) &ret) == -1) goto done; - rv = ret.ret; + rv = ret.result; done: remoteDriverUnlock(priv); @@ -9236,7 +9236,7 @@ remoteDomainSnapshotCreateXML(virDomainPtr domain, remoteDriverLock(priv); - make_nonnull_domain (&args.domain, domain); + make_nonnull_domain (&args.dom, domain); args.xml_desc = (char *) xmlDesc; args.flags = flags; @@ -9293,7 +9293,7 @@ remoteDomainSnapshotNum (virDomainPtr domain, unsigned int flags) remoteDriverLock(priv); - make_nonnull_domain (&args.domain, domain); + make_nonnull_domain (&args.dom, domain); args.flags = flags; memset (&ret, 0, sizeof ret); @@ -9329,7 +9329,7 @@ remoteDomainSnapshotListNames (virDomainPtr domain, char **const names, goto done; } - make_nonnull_domain(&args.domain, domain); + make_nonnull_domain(&args.dom, domain); args.nameslen = nameslen; args.flags = flags; @@ -9385,7 +9385,7 @@ remoteDomainSnapshotLookupByName (virDomainPtr domain, const char *name, remoteDriverLock(priv); - make_nonnull_domain(&args.domain, domain); + make_nonnull_domain(&args.dom, domain); args.name = (char *) name; args.flags = flags; @@ -9414,7 +9414,7 @@ remoteDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) remoteDriverLock(priv); - make_nonnull_domain(&args.domain, domain); + make_nonnull_domain(&args.dom, domain); args.flags = flags; if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_HAS_CURRENT_SNAPSHOT, @@ -9441,7 +9441,7 @@ remoteDomainSnapshotCurrent(virDomainPtr domain, remoteDriverLock(priv); - make_nonnull_domain(&args.domain, domain); + make_nonnull_domain(&args.dom, domain); args.flags = flags; memset(&ret, 0, sizeof ret); @@ -9709,7 +9709,7 @@ remoteDomainOpenConsole(virDomainPtr dom, st->driver = &remoteStreamDrv; st->privateData = privst; - make_nonnull_domain (&args.domain, dom); + make_nonnull_domain (&args.dom, dom); args.devname = devname ? (char **)&devname : NULL; args.flags = flags; @@ -9743,7 +9743,7 @@ remoteQemuDomainMonitorCommand (virDomainPtr domain, const char *cmd, remoteDriverLock(priv); - make_nonnull_domain(&args.domain, domain); + make_nonnull_domain(&args.dom, domain); args.cmd = (char *)cmd; args.flags = flags; @@ -11177,7 +11177,7 @@ static void make_nonnull_domain_snapshot (remote_nonnull_domain_snapshot *snapshot_dst, virDomainSnapshotPtr snapshot_src) { snapshot_dst->name = snapshot_src->name; - make_nonnull_domain(&snapshot_dst->domain, snapshot_src->domain); + make_nonnull_domain(&snapshot_dst->dom, snapshot_src->domain); } /*----------------------------------------------------------------------*/ diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c index 5604371..e85f607 100644 --- a/src/remote/remote_protocol.c +++ b/src/remote/remote_protocol.c @@ -148,7 +148,7 @@ xdr_remote_nonnull_domain_snapshot (XDR *xdrs, remote_nonnull_domain_snapshot *o if (!xdr_remote_nonnull_string (xdrs, &objp->name)) return FALSE; - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; return TRUE; } @@ -3672,7 +3672,7 @@ bool_t xdr_remote_domain_has_managed_save_image_ret (XDR *xdrs, remote_domain_has_managed_save_image_ret *objp) { - if (!xdr_int (xdrs, &objp->ret)) + if (!xdr_int (xdrs, &objp->result)) return FALSE; return TRUE; } @@ -3692,7 +3692,7 @@ bool_t xdr_remote_domain_snapshot_create_xml_args (XDR *xdrs, remote_domain_snapshot_create_xml_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_remote_nonnull_string (xdrs, &objp->xml_desc)) return FALSE; @@ -3734,7 +3734,7 @@ bool_t xdr_remote_domain_snapshot_num_args (XDR *xdrs, remote_domain_snapshot_num_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_int (xdrs, &objp->flags)) return FALSE; @@ -3754,7 +3754,7 @@ bool_t xdr_remote_domain_snapshot_list_names_args (XDR *xdrs, remote_domain_snapshot_list_names_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_int (xdrs, &objp->nameslen)) return FALSE; @@ -3778,7 +3778,7 @@ bool_t xdr_remote_domain_snapshot_lookup_by_name_args (XDR *xdrs, remote_domain_snapshot_lookup_by_name_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_remote_nonnull_string (xdrs, &objp->name)) return FALSE; @@ -3800,7 +3800,7 @@ bool_t xdr_remote_domain_has_current_snapshot_args (XDR *xdrs, remote_domain_has_current_snapshot_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_int (xdrs, &objp->flags)) return FALSE; @@ -3820,7 +3820,7 @@ bool_t xdr_remote_domain_snapshot_current_args (XDR *xdrs, remote_domain_snapshot_current_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_int (xdrs, &objp->flags)) return FALSE; @@ -3862,7 +3862,7 @@ bool_t xdr_remote_domain_open_console_args (XDR *xdrs, remote_domain_open_console_args *objp) { - if (!xdr_remote_nonnull_domain (xdrs, &objp->domain)) + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) return FALSE; if (!xdr_remote_string (xdrs, &objp->devname)) return FALSE; diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h index d9bf151..82d0981 100644 --- a/src/remote/remote_protocol.h +++ b/src/remote/remote_protocol.h @@ -123,7 +123,7 @@ typedef struct remote_nonnull_secret remote_nonnull_secret; struct remote_nonnull_domain_snapshot { remote_nonnull_string name; - remote_nonnull_domain domain; + remote_nonnull_domain dom; }; typedef struct remote_nonnull_domain_snapshot remote_nonnull_domain_snapshot; @@ -2073,7 +2073,7 @@ struct remote_domain_has_managed_save_image_args { typedef struct remote_domain_has_managed_save_image_args remote_domain_has_managed_save_image_args; struct remote_domain_has_managed_save_image_ret { - int ret; + int result; }; typedef struct remote_domain_has_managed_save_image_ret remote_domain_has_managed_save_image_ret; @@ -2084,7 +2084,7 @@ struct remote_domain_managed_save_remove_args { typedef struct remote_domain_managed_save_remove_args remote_domain_managed_save_remove_args; struct remote_domain_snapshot_create_xml_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string xml_desc; int flags; }; @@ -2107,7 +2107,7 @@ struct remote_domain_snapshot_dump_xml_ret { typedef struct remote_domain_snapshot_dump_xml_ret remote_domain_snapshot_dump_xml_ret; struct remote_domain_snapshot_num_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; typedef struct remote_domain_snapshot_num_args remote_domain_snapshot_num_args; @@ -2118,7 +2118,7 @@ struct remote_domain_snapshot_num_ret { typedef struct remote_domain_snapshot_num_ret remote_domain_snapshot_num_ret; struct remote_domain_snapshot_list_names_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int nameslen; int flags; }; @@ -2133,7 +2133,7 @@ struct remote_domain_snapshot_list_names_ret { typedef struct remote_domain_snapshot_list_names_ret remote_domain_snapshot_list_names_ret; struct remote_domain_snapshot_lookup_by_name_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string name; int flags; }; @@ -2145,7 +2145,7 @@ struct remote_domain_snapshot_lookup_by_name_ret { typedef struct remote_domain_snapshot_lookup_by_name_ret remote_domain_snapshot_lookup_by_name_ret; struct remote_domain_has_current_snapshot_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; typedef struct remote_domain_has_current_snapshot_args remote_domain_has_current_snapshot_args; @@ -2156,7 +2156,7 @@ struct remote_domain_has_current_snapshot_ret { typedef struct remote_domain_has_current_snapshot_ret remote_domain_has_current_snapshot_ret; struct remote_domain_snapshot_current_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; typedef struct remote_domain_snapshot_current_args remote_domain_snapshot_current_args; @@ -2179,7 +2179,7 @@ struct remote_domain_snapshot_delete_args { typedef struct remote_domain_snapshot_delete_args remote_domain_snapshot_delete_args; struct remote_domain_open_console_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_string devname; u_int flags; }; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b02f082..0422c7b 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -247,7 +247,7 @@ struct remote_nonnull_secret { /* A snapshot which may not be NULL. */ struct remote_nonnull_domain_snapshot { remote_nonnull_string name; - remote_nonnull_domain domain; + remote_nonnull_domain dom; }; /* A domain or network which may be NULL. */ @@ -1836,7 +1836,7 @@ struct remote_domain_has_managed_save_image_args { }; struct remote_domain_has_managed_save_image_ret { - int ret; + int result; }; struct remote_domain_managed_save_remove_args { @@ -1845,7 +1845,7 @@ struct remote_domain_managed_save_remove_args { }; struct remote_domain_snapshot_create_xml_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string xml_desc; int flags; }; @@ -1864,7 +1864,7 @@ struct remote_domain_snapshot_dump_xml_ret { }; struct remote_domain_snapshot_num_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; @@ -1873,7 +1873,7 @@ struct remote_domain_snapshot_num_ret { }; struct remote_domain_snapshot_list_names_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int nameslen; int flags; }; @@ -1883,7 +1883,7 @@ struct remote_domain_snapshot_list_names_ret { }; struct remote_domain_snapshot_lookup_by_name_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string name; int flags; }; @@ -1893,7 +1893,7 @@ struct remote_domain_snapshot_lookup_by_name_ret { }; struct remote_domain_has_current_snapshot_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; @@ -1902,7 +1902,7 @@ struct remote_domain_has_current_snapshot_ret { }; struct remote_domain_snapshot_current_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; @@ -1921,7 +1921,7 @@ struct remote_domain_snapshot_delete_args { }; struct remote_domain_open_console_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_string devname; unsigned int flags; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 944553c..73c7202 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -35,7 +35,7 @@ struct remote_nonnull_secret { }; struct remote_nonnull_domain_snapshot { remote_nonnull_string name; - remote_nonnull_domain domain; + remote_nonnull_domain dom; }; struct remote_error { int code; @@ -1341,14 +1341,14 @@ struct remote_domain_has_managed_save_image_args { u_int flags; }; struct remote_domain_has_managed_save_image_ret { - int ret; + int result; }; struct remote_domain_managed_save_remove_args { remote_nonnull_domain dom; u_int flags; }; struct remote_domain_snapshot_create_xml_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string xml_desc; int flags; }; @@ -1363,14 +1363,14 @@ struct remote_domain_snapshot_dump_xml_ret { remote_nonnull_string xml; }; struct remote_domain_snapshot_num_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; struct remote_domain_snapshot_num_ret { int num; }; struct remote_domain_snapshot_list_names_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int nameslen; int flags; }; @@ -1381,7 +1381,7 @@ struct remote_domain_snapshot_list_names_ret { } names; }; struct remote_domain_snapshot_lookup_by_name_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_nonnull_string name; int flags; }; @@ -1389,14 +1389,14 @@ struct remote_domain_snapshot_lookup_by_name_ret { remote_nonnull_domain_snapshot snap; }; struct remote_domain_has_current_snapshot_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; struct remote_domain_has_current_snapshot_ret { int result; }; struct remote_domain_snapshot_current_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; int flags; }; struct remote_domain_snapshot_current_ret { @@ -1411,7 +1411,7 @@ struct remote_domain_snapshot_delete_args { int flags; }; struct remote_domain_open_console_args { - remote_nonnull_domain domain; + remote_nonnull_domain dom; remote_string devname; u_int flags; }; -- 1.7.0.4