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.

diff --git a/daemon/remote.c b/daemon/remote.c
index b446850566fda043b9afb8371c5cdc1f9b034149..daa4738a79d6fc2afd3d5089458da28c28f3d2a6 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2881,7 +2881,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;
@@ -6367,7 +6367,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)))
@@ -6405,7 +6405,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)))
@@ -6444,7 +6444,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)
@@ -6484,7 +6484,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. */
@@ -6531,7 +6531,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)))
@@ -6569,7 +6569,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);
@@ -6606,7 +6606,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)))
@@ -6975,7 +6975,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,
@@ -7011,7 +7011,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))) {
@@ -7174,5 +7174,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 8d737ebf5b8cb98d9e56d246f4629a35db4ae525..809b980180a18db1d531377f85c8509a65b7050d 100644 (file)
--- a/daemon/remote_dispatch_bodies.c
+++ b/daemon/remote_dispatch_bodies.c
@@ -630,7 +630,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)))
@@ -952,7 +952,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 65bb7ca9feae989b04a90b35ea9f5afb64607b8e..57d57c8f3198f4d293a983f93367ca5db305ed87 100755 (executable)
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -368,7 +368,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 81916ed0a6c19f4c1442bfe31808d54e02eb3f3c..3480c54de4e1a264c6d79815bbc81190ea3e4934 100644 (file)
--- 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 b82218742ba9707269662656e96c61a4e167b06b..c2501c79eed5c57842a08e1880f00cd2a956fd19 100644 (file)
--- 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 1d078953ae1924007fedd65afaae38ec1e1ea202..9eed73fa9147c0e5fda291b3b2a4004361732b32 100644 (file)
--- 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 97ee84a5e2f319ef9657ec34f15629e7198c93ca..c027e6b299b8a536ee4e86725303d41288635208 100644 (file)
--- 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 5604371b7f3f804042c883ed58369c8e95caf5c4..e85f607c3b86a33ba90bfcbe49f63c625b274820 100644 (file)
--- 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 d9bf1517b91888f9f5ae07e47d7112451aa1dee4..82d098167b0124ff0768c7a662ea76853c796765 100644 (file)
--- 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 b02f08272b45a05874fba0d736005b0677029a8d..0422c7b6ca89c9b4ed4059b7c6a86fda4e5bf240 100644 (file)
--- 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 944553cfa208a2dbaffc0b318717c9a9827d7ca5..73c720216f17542eb56f8db4484c02c644ac352e 100644 (file)
--- 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;
 };