From 9b91aeb6ad8eaea0779ba7d079b9efae5981285b Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan@xensource.com>
Date: Thu, 9 Nov 2006 11:02:48 +0000
Subject: [PATCH] Replace uses of the typename (e.g. xen_host) where its used
 as a variable name. This is an unusual style, and out of sync with the rest
 of the library.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---
 tools/libxen/include/xen_host.h    |   4 +-
 tools/libxen/include/xen_network.h |   8 +--
 tools/libxen/include/xen_pif.h     |  12 ++--
 tools/libxen/include/xen_sr.h      |  10 +--
 tools/libxen/include/xen_user.h    |   2 +-
 tools/libxen/include/xen_vbd.h     |  10 +--
 tools/libxen/include/xen_vdi.h     |  12 ++--
 tools/libxen/include/xen_vif.h     |  14 ++--
 tools/libxen/include/xen_vm.h      |  54 +++++++--------
 tools/libxen/src/xen_host.c        |   8 +--
 tools/libxen/src/xen_network.c     |  16 ++---
 tools/libxen/src/xen_pif.c         |  24 +++----
 tools/libxen/src/xen_sr.c          |   8 +--
 tools/libxen/src/xen_user.c        |   4 +-
 tools/libxen/src/xen_vbd.c         |  20 +++---
 tools/libxen/src/xen_vdi.c         |  24 +++----
 tools/libxen/src/xen_vif.c         |  28 ++++----
 tools/libxen/src/xen_vm.c          | 108 ++++++++++++++---------------
 18 files changed, 183 insertions(+), 183 deletions(-)

diff --git a/tools/libxen/include/xen_host.h b/tools/libxen/include/xen_host.h
index 02e2e86f74..8fada62773 100644
--- a/tools/libxen/include/xen_host.h
+++ b/tools/libxen/include/xen_host.h
@@ -234,14 +234,14 @@ xen_host_get_host_cpus(xen_session *session, struct xen_host_cpu_set **result, x
  * Set the name/label field of the given host.
  */
 extern bool
-xen_host_set_name_label(xen_session *session, xen_host xen_host, char *label);
+xen_host_set_name_label(xen_session *session, xen_host host, char *label);
 
 
 /**
  * Set the name/description field of the given host.
  */
 extern bool
-xen_host_set_name_description(xen_session *session, xen_host xen_host, char *description);
+xen_host_set_name_description(xen_session *session, xen_host host, char *description);
 
 
 /**
diff --git a/tools/libxen/include/xen_network.h b/tools/libxen/include/xen_network.h
index a65e20f0ff..ca590442eb 100644
--- a/tools/libxen/include/xen_network.h
+++ b/tools/libxen/include/xen_network.h
@@ -232,28 +232,28 @@ xen_network_get_default_netmask(xen_session *session, char **result, xen_network
  * Set the name/label field of the given network.
  */
 extern bool
-xen_network_set_name_label(xen_session *session, xen_network xen_network, char *label);
+xen_network_set_name_label(xen_session *session, xen_network network, char *label);
 
 
 /**
  * Set the name/description field of the given network.
  */
 extern bool
-xen_network_set_name_description(xen_session *session, xen_network xen_network, char *description);
+xen_network_set_name_description(xen_session *session, xen_network network, char *description);
 
 
 /**
  * Set the default_gateway field of the given network.
  */
 extern bool
-xen_network_set_default_gateway(xen_session *session, xen_network xen_network, char *default_gateway);
+xen_network_set_default_gateway(xen_session *session, xen_network network, char *default_gateway);
 
 
 /**
  * Set the default_netmask field of the given network.
  */
 extern bool
-xen_network_set_default_netmask(xen_session *session, xen_network xen_network, char *default_netmask);
+xen_network_set_default_netmask(xen_session *session, xen_network network, char *default_netmask);
 
 
 /**
diff --git a/tools/libxen/include/xen_pif.h b/tools/libxen/include/xen_pif.h
index f5db3fe3b1..8e7e1989cb 100644
--- a/tools/libxen/include/xen_pif.h
+++ b/tools/libxen/include/xen_pif.h
@@ -242,42 +242,42 @@ xen_pif_get_io_write_kbs(xen_session *session, double *result, xen_pif pif);
  * Set the name field of the given PIF.
  */
 extern bool
-xen_pif_set_name(xen_session *session, xen_pif xen_pif, char *name);
+xen_pif_set_name(xen_session *session, xen_pif pif, char *name);
 
 
 /**
  * Set the network field of the given PIF.
  */
 extern bool
-xen_pif_set_network(xen_session *session, xen_pif xen_pif, xen_network network);
+xen_pif_set_network(xen_session *session, xen_pif pif, xen_network network);
 
 
 /**
  * Set the host field of the given PIF.
  */
 extern bool
-xen_pif_set_host(xen_session *session, xen_pif xen_pif, xen_host host);
+xen_pif_set_host(xen_session *session, xen_pif pif, xen_host host);
 
 
 /**
  * Set the MAC field of the given PIF.
  */
 extern bool
-xen_pif_set_mac(xen_session *session, xen_pif xen_pif, char *mac);
+xen_pif_set_mac(xen_session *session, xen_pif pif, char *mac);
 
 
 /**
  * Set the MTU field of the given PIF.
  */
 extern bool
-xen_pif_set_mtu(xen_session *session, xen_pif xen_pif, int64_t mtu);
+xen_pif_set_mtu(xen_session *session, xen_pif pif, int64_t mtu);
 
 
 /**
  * Set the VLAN field of the given PIF.
  */
 extern bool
-xen_pif_set_vlan(xen_session *session, xen_pif xen_pif, char *vlan);
+xen_pif_set_vlan(xen_session *session, xen_pif pif, char *vlan);
 
 
 #endif
diff --git a/tools/libxen/include/xen_sr.h b/tools/libxen/include/xen_sr.h
index cdd29b7ec4..6ecd7d7ebd 100644
--- a/tools/libxen/include/xen_sr.h
+++ b/tools/libxen/include/xen_sr.h
@@ -247,26 +247,26 @@ xen_sr_get_location(xen_session *session, char **result, xen_sr sr);
  * Set the name/label field of the given SR.
  */
 extern bool
-xen_sr_set_name_label(xen_session *session, xen_sr xen_sr, char *label);
+xen_sr_set_name_label(xen_session *session, xen_sr sr, char *label);
 
 
 /**
  * Set the name/description field of the given SR.
  */
 extern bool
-xen_sr_set_name_description(xen_session *session, xen_sr xen_sr, char *description);
+xen_sr_set_name_description(xen_session *session, xen_sr sr, char *description);
 
 
 /**
- * Take an exact copy of the Storage Repository; 
- *         the cloned storage repository has the same type as its parent
+ * Take an exact copy of the Storage Repository; the cloned storage
+ * repository has the same type as its parent
  */
 extern bool
 xen_sr_clone(xen_session *session, xen_sr *result, xen_sr sr, char *loc, char *name);
 
 
 /**
- * Return a list of all the Storage Repositories known to the system
+ * Return a list of all the SRs known to the system
  */
 extern bool
 xen_sr_get_all(xen_session *session, struct xen_sr_set **result);
diff --git a/tools/libxen/include/xen_user.h b/tools/libxen/include/xen_user.h
index 5a6598511f..67cfe0caa4 100644
--- a/tools/libxen/include/xen_user.h
+++ b/tools/libxen/include/xen_user.h
@@ -191,7 +191,7 @@ xen_user_get_fullname(xen_session *session, char **result, xen_user user);
  * Set the fullname field of the given user.
  */
 extern bool
-xen_user_set_fullname(xen_session *session, xen_user xen_user, char *fullname);
+xen_user_set_fullname(xen_session *session, xen_user user, char *fullname);
 
 
 #endif
diff --git a/tools/libxen/include/xen_vbd.h b/tools/libxen/include/xen_vbd.h
index 44bdfb13ae..67f9c87066 100644
--- a/tools/libxen/include/xen_vbd.h
+++ b/tools/libxen/include/xen_vbd.h
@@ -236,35 +236,35 @@ xen_vbd_get_io_write_kbs(xen_session *session, double *result, xen_vbd vbd);
  * Set the VM field of the given VBD.
  */
 extern bool
-xen_vbd_set_vm(xen_session *session, xen_vbd xen_vbd, xen_vm vm);
+xen_vbd_set_vm(xen_session *session, xen_vbd vbd, xen_vm vm);
 
 
 /**
  * Set the VDI field of the given VBD.
  */
 extern bool
-xen_vbd_set_vdi(xen_session *session, xen_vbd xen_vbd, xen_vdi vdi);
+xen_vbd_set_vdi(xen_session *session, xen_vbd vbd, xen_vdi vdi);
 
 
 /**
  * Set the device field of the given VBD.
  */
 extern bool
-xen_vbd_set_device(xen_session *session, xen_vbd xen_vbd, char *device);
+xen_vbd_set_device(xen_session *session, xen_vbd vbd, char *device);
 
 
 /**
  * Set the mode field of the given VBD.
  */
 extern bool
-xen_vbd_set_mode(xen_session *session, xen_vbd xen_vbd, enum xen_vbd_mode mode);
+xen_vbd_set_mode(xen_session *session, xen_vbd vbd, enum xen_vbd_mode mode);
 
 
 /**
  * Set the driver field of the given VBD.
  */
 extern bool
-xen_vbd_set_driver(xen_session *session, xen_vbd xen_vbd, enum xen_driver_type driver);
+xen_vbd_set_driver(xen_session *session, xen_vbd vbd, enum xen_driver_type driver);
 
 
 /**
diff --git a/tools/libxen/include/xen_vdi.h b/tools/libxen/include/xen_vdi.h
index e42fdb8c9e..92298c9ef6 100644
--- a/tools/libxen/include/xen_vdi.h
+++ b/tools/libxen/include/xen_vdi.h
@@ -281,42 +281,42 @@ xen_vdi_get_read_only(xen_session *session, bool *result, xen_vdi vdi);
  * Set the name/label field of the given VDI.
  */
 extern bool
-xen_vdi_set_name_label(xen_session *session, xen_vdi xen_vdi, char *label);
+xen_vdi_set_name_label(xen_session *session, xen_vdi vdi, char *label);
 
 
 /**
  * Set the name/description field of the given VDI.
  */
 extern bool
-xen_vdi_set_name_description(xen_session *session, xen_vdi xen_vdi, char *description);
+xen_vdi_set_name_description(xen_session *session, xen_vdi vdi, char *description);
 
 
 /**
  * Set the SR field of the given VDI.
  */
 extern bool
-xen_vdi_set_sr(xen_session *session, xen_vdi xen_vdi, xen_sr sr);
+xen_vdi_set_sr(xen_session *session, xen_vdi vdi, xen_sr sr);
 
 
 /**
  * Set the virtual_size field of the given VDI.
  */
 extern bool
-xen_vdi_set_virtual_size(xen_session *session, xen_vdi xen_vdi, int64_t virtual_size);
+xen_vdi_set_virtual_size(xen_session *session, xen_vdi vdi, int64_t virtual_size);
 
 
 /**
  * Set the sharable field of the given VDI.
  */
 extern bool
-xen_vdi_set_sharable(xen_session *session, xen_vdi xen_vdi, bool sharable);
+xen_vdi_set_sharable(xen_session *session, xen_vdi vdi, bool sharable);
 
 
 /**
  * Set the read_only field of the given VDI.
  */
 extern bool
-xen_vdi_set_read_only(xen_session *session, xen_vdi xen_vdi, bool read_only);
+xen_vdi_set_read_only(xen_session *session, xen_vdi vdi, bool read_only);
 
 
 /**
diff --git a/tools/libxen/include/xen_vif.h b/tools/libxen/include/xen_vif.h
index 7a7d88b77f..d6022fa201 100644
--- a/tools/libxen/include/xen_vif.h
+++ b/tools/libxen/include/xen_vif.h
@@ -250,49 +250,49 @@ xen_vif_get_io_write_kbs(xen_session *session, double *result, xen_vif vif);
  * Set the name field of the given VIF.
  */
 extern bool
-xen_vif_set_name(xen_session *session, xen_vif xen_vif, char *name);
+xen_vif_set_name(xen_session *session, xen_vif vif, char *name);
 
 
 /**
  * Set the type field of the given VIF.
  */
 extern bool
-xen_vif_set_type(xen_session *session, xen_vif xen_vif, enum xen_driver_type type);
+xen_vif_set_type(xen_session *session, xen_vif vif, enum xen_driver_type type);
 
 
 /**
  * Set the device field of the given VIF.
  */
 extern bool
-xen_vif_set_device(xen_session *session, xen_vif xen_vif, char *device);
+xen_vif_set_device(xen_session *session, xen_vif vif, char *device);
 
 
 /**
  * Set the network field of the given VIF.
  */
 extern bool
-xen_vif_set_network(xen_session *session, xen_vif xen_vif, xen_network network);
+xen_vif_set_network(xen_session *session, xen_vif vif, xen_network network);
 
 
 /**
  * Set the VM field of the given VIF.
  */
 extern bool
-xen_vif_set_vm(xen_session *session, xen_vif xen_vif, xen_vm vm);
+xen_vif_set_vm(xen_session *session, xen_vif vif, xen_vm vm);
 
 
 /**
  * Set the MAC field of the given VIF.
  */
 extern bool
-xen_vif_set_mac(xen_session *session, xen_vif xen_vif, char *mac);
+xen_vif_set_mac(xen_session *session, xen_vif vif, char *mac);
 
 
 /**
  * Set the MTU field of the given VIF.
  */
 extern bool
-xen_vif_set_mtu(xen_session *session, xen_vif xen_vif, int64_t mtu);
+xen_vif_set_mtu(xen_session *session, xen_vif vif, int64_t mtu);
 
 
 #endif
diff --git a/tools/libxen/include/xen_vm.h b/tools/libxen/include/xen_vm.h
index b1ff2e812e..1ff893b86f 100644
--- a/tools/libxen/include/xen_vm.h
+++ b/tools/libxen/include/xen_vm.h
@@ -521,189 +521,189 @@ xen_vm_get_otherconfig(xen_session *session, xen_string_string_map **result, xen
  * Set the name/label field of the given VM.
  */
 extern bool
-xen_vm_set_name_label(xen_session *session, xen_vm xen_vm, char *label);
+xen_vm_set_name_label(xen_session *session, xen_vm vm, char *label);
 
 
 /**
  * Set the name/description field of the given VM.
  */
 extern bool
-xen_vm_set_name_description(xen_session *session, xen_vm xen_vm, char *description);
+xen_vm_set_name_description(xen_session *session, xen_vm vm, char *description);
 
 
 /**
  * Set the user_version field of the given VM.
  */
 extern bool
-xen_vm_set_user_version(xen_session *session, xen_vm xen_vm, int64_t user_version);
+xen_vm_set_user_version(xen_session *session, xen_vm vm, int64_t user_version);
 
 
 /**
  * Set the is_a_template field of the given VM.
  */
 extern bool
-xen_vm_set_is_a_template(xen_session *session, xen_vm xen_vm, bool is_a_template);
+xen_vm_set_is_a_template(xen_session *session, xen_vm vm, bool is_a_template);
 
 
 /**
  * Set the memory/dynamic_max field of the given VM.
  */
 extern bool
-xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm xen_vm, int64_t dynamic_max);
+xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm vm, int64_t dynamic_max);
 
 
 /**
  * Set the memory/dynamic_min field of the given VM.
  */
 extern bool
-xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm xen_vm, int64_t dynamic_min);
+xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm vm, int64_t dynamic_min);
 
 
 /**
  * Set the VCPUs/policy field of the given VM.
  */
 extern bool
-xen_vm_set_vcpus_policy(xen_session *session, xen_vm xen_vm, char *policy);
+xen_vm_set_vcpus_policy(xen_session *session, xen_vm vm, char *policy);
 
 
 /**
  * Set the VCPUs/params field of the given VM.
  */
 extern bool
-xen_vm_set_vcpus_params(xen_session *session, xen_vm xen_vm, char *params);
+xen_vm_set_vcpus_params(xen_session *session, xen_vm vm, char *params);
 
 
 /**
  * Set the VCPUs/features/force_on field of the given VM.
  */
 extern bool
-xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_on);
+xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_on);
 
 
 /**
  * Set the VCPUs/features/force_off field of the given VM.
  */
 extern bool
-xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_off);
+xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_off);
 
 
 /**
  * Set the actions/after_shutdown field of the given VM.
  */
 extern bool
-xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_shutdown);
+xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_shutdown);
 
 
 /**
  * Set the actions/after_reboot field of the given VM.
  */
 extern bool
-xen_vm_set_actions_after_reboot(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_reboot);
+xen_vm_set_actions_after_reboot(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_reboot);
 
 
 /**
  * Set the actions/after_suspend field of the given VM.
  */
 extern bool
-xen_vm_set_actions_after_suspend(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_suspend);
+xen_vm_set_actions_after_suspend(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_suspend);
 
 
 /**
  * Set the actions/after_crash field of the given VM.
  */
 extern bool
-xen_vm_set_actions_after_crash(xen_session *session, xen_vm xen_vm, enum xen_on_crash_behaviour after_crash);
+xen_vm_set_actions_after_crash(xen_session *session, xen_vm vm, enum xen_on_crash_behaviour after_crash);
 
 
 /**
  * Set the bios/boot field of the given VM.
  */
 extern bool
-xen_vm_set_bios_boot(xen_session *session, xen_vm xen_vm, char *boot);
+xen_vm_set_bios_boot(xen_session *session, xen_vm vm, char *boot);
 
 
 /**
  * Set the platform/std_VGA field of the given VM.
  */
 extern bool
-xen_vm_set_platform_std_vga(xen_session *session, xen_vm xen_vm, bool std_vga);
+xen_vm_set_platform_std_vga(xen_session *session, xen_vm vm, bool std_vga);
 
 
 /**
  * Set the platform/serial field of the given VM.
  */
 extern bool
-xen_vm_set_platform_serial(xen_session *session, xen_vm xen_vm, char *serial);
+xen_vm_set_platform_serial(xen_session *session, xen_vm vm, char *serial);
 
 
 /**
  * Set the platform/localtime field of the given VM.
  */
 extern bool
-xen_vm_set_platform_localtime(xen_session *session, xen_vm xen_vm, bool localtime);
+xen_vm_set_platform_localtime(xen_session *session, xen_vm vm, bool localtime);
 
 
 /**
  * Set the platform/clock_offset field of the given VM.
  */
 extern bool
-xen_vm_set_platform_clock_offset(xen_session *session, xen_vm xen_vm, bool clock_offset);
+xen_vm_set_platform_clock_offset(xen_session *session, xen_vm vm, bool clock_offset);
 
 
 /**
  * Set the platform/enable_audio field of the given VM.
  */
 extern bool
-xen_vm_set_platform_enable_audio(xen_session *session, xen_vm xen_vm, bool enable_audio);
+xen_vm_set_platform_enable_audio(xen_session *session, xen_vm vm, bool enable_audio);
 
 
 /**
  * Set the builder field of the given VM.
  */
 extern bool
-xen_vm_set_builder(xen_session *session, xen_vm xen_vm, char *builder);
+xen_vm_set_builder(xen_session *session, xen_vm vm, char *builder);
 
 
 /**
  * Set the boot_method field of the given VM.
  */
 extern bool
-xen_vm_set_boot_method(xen_session *session, xen_vm xen_vm, enum xen_boot_type boot_method);
+xen_vm_set_boot_method(xen_session *session, xen_vm vm, enum xen_boot_type boot_method);
 
 
 /**
  * Set the kernel/kernel field of the given VM.
  */
 extern bool
-xen_vm_set_kernel_kernel(xen_session *session, xen_vm xen_vm, char *kernel);
+xen_vm_set_kernel_kernel(xen_session *session, xen_vm vm, char *kernel);
 
 
 /**
  * Set the kernel/initrd field of the given VM.
  */
 extern bool
-xen_vm_set_kernel_initrd(xen_session *session, xen_vm xen_vm, char *initrd);
+xen_vm_set_kernel_initrd(xen_session *session, xen_vm vm, char *initrd);
 
 
 /**
  * Set the kernel/args field of the given VM.
  */
 extern bool
-xen_vm_set_kernel_args(xen_session *session, xen_vm xen_vm, char *args);
+xen_vm_set_kernel_args(xen_session *session, xen_vm vm, char *args);
 
 
 /**
  * Set the grub/cmdline field of the given VM.
  */
 extern bool
-xen_vm_set_grub_cmdline(xen_session *session, xen_vm xen_vm, char *cmdline);
+xen_vm_set_grub_cmdline(xen_session *session, xen_vm vm, char *cmdline);
 
 
 /**
  * Set the otherConfig field of the given VM.
  */
 extern bool
-xen_vm_set_otherconfig(xen_session *session, xen_vm xen_vm, xen_string_string_map *otherconfig);
+xen_vm_set_otherconfig(xen_session *session, xen_vm vm, xen_string_string_map *otherconfig);
 
 
 /**
diff --git a/tools/libxen/src/xen_host.c b/tools/libxen/src/xen_host.c
index 905aaf4ae5..d0f4d850b1 100644
--- a/tools/libxen/src/xen_host.c
+++ b/tools/libxen/src/xen_host.c
@@ -269,12 +269,12 @@ xen_host_get_host_cpus(xen_session *session, struct xen_host_cpu_set **result, x
 
 
 bool
-xen_host_set_name_label(xen_session *session, xen_host xen_host, char *label)
+xen_host_set_name_label(xen_session *session, xen_host host, char *label)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_host },
+              .u.string_val = host },
             { .type = &abstract_type_string,
               .u.string_val = label }
         };
@@ -285,12 +285,12 @@ xen_host_set_name_label(xen_session *session, xen_host xen_host, char *label)
 
 
 bool
-xen_host_set_name_description(xen_session *session, xen_host xen_host, char *description)
+xen_host_set_name_description(xen_session *session, xen_host host, char *description)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_host },
+              .u.string_val = host },
             { .type = &abstract_type_string,
               .u.string_val = description }
         };
diff --git a/tools/libxen/src/xen_network.c b/tools/libxen/src/xen_network.c
index 16b9d4035b..d496556ea9 100644
--- a/tools/libxen/src/xen_network.c
+++ b/tools/libxen/src/xen_network.c
@@ -267,12 +267,12 @@ xen_network_get_default_netmask(xen_session *session, char **result, xen_network
 
 
 bool
-xen_network_set_name_label(xen_session *session, xen_network xen_network, char *label)
+xen_network_set_name_label(xen_session *session, xen_network network, char *label)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_network },
+              .u.string_val = network },
             { .type = &abstract_type_string,
               .u.string_val = label }
         };
@@ -283,12 +283,12 @@ xen_network_set_name_label(xen_session *session, xen_network xen_network, char *
 
 
 bool
-xen_network_set_name_description(xen_session *session, xen_network xen_network, char *description)
+xen_network_set_name_description(xen_session *session, xen_network network, char *description)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_network },
+              .u.string_val = network },
             { .type = &abstract_type_string,
               .u.string_val = description }
         };
@@ -299,12 +299,12 @@ xen_network_set_name_description(xen_session *session, xen_network xen_network,
 
 
 bool
-xen_network_set_default_gateway(xen_session *session, xen_network xen_network, char *default_gateway)
+xen_network_set_default_gateway(xen_session *session, xen_network network, char *default_gateway)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_network },
+              .u.string_val = network },
             { .type = &abstract_type_string,
               .u.string_val = default_gateway }
         };
@@ -315,12 +315,12 @@ xen_network_set_default_gateway(xen_session *session, xen_network xen_network, c
 
 
 bool
-xen_network_set_default_netmask(xen_session *session, xen_network xen_network, char *default_netmask)
+xen_network_set_default_netmask(xen_session *session, xen_network network, char *default_netmask)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_network },
+              .u.string_val = network },
             { .type = &abstract_type_string,
               .u.string_val = default_netmask }
         };
diff --git a/tools/libxen/src/xen_pif.c b/tools/libxen/src/xen_pif.c
index 7f470a1658..2f4cb7881d 100644
--- a/tools/libxen/src/xen_pif.c
+++ b/tools/libxen/src/xen_pif.c
@@ -286,12 +286,12 @@ xen_pif_get_io_write_kbs(xen_session *session, double *result, xen_pif pif)
 
 
 bool
-xen_pif_set_name(xen_session *session, xen_pif xen_pif, char *name)
+xen_pif_set_name(xen_session *session, xen_pif pif, char *name)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_pif },
+              .u.string_val = pif },
             { .type = &abstract_type_string,
               .u.string_val = name }
         };
@@ -302,12 +302,12 @@ xen_pif_set_name(xen_session *session, xen_pif xen_pif, char *name)
 
 
 bool
-xen_pif_set_network(xen_session *session, xen_pif xen_pif, xen_network network)
+xen_pif_set_network(xen_session *session, xen_pif pif, xen_network network)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_pif },
+              .u.string_val = pif },
             { .type = &abstract_type_string,
               .u.string_val = network }
         };
@@ -318,12 +318,12 @@ xen_pif_set_network(xen_session *session, xen_pif xen_pif, xen_network network)
 
 
 bool
-xen_pif_set_host(xen_session *session, xen_pif xen_pif, xen_host host)
+xen_pif_set_host(xen_session *session, xen_pif pif, xen_host host)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_pif },
+              .u.string_val = pif },
             { .type = &abstract_type_string,
               .u.string_val = host }
         };
@@ -334,12 +334,12 @@ xen_pif_set_host(xen_session *session, xen_pif xen_pif, xen_host host)
 
 
 bool
-xen_pif_set_mac(xen_session *session, xen_pif xen_pif, char *mac)
+xen_pif_set_mac(xen_session *session, xen_pif pif, char *mac)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_pif },
+              .u.string_val = pif },
             { .type = &abstract_type_string,
               .u.string_val = mac }
         };
@@ -350,12 +350,12 @@ xen_pif_set_mac(xen_session *session, xen_pif xen_pif, char *mac)
 
 
 bool
-xen_pif_set_mtu(xen_session *session, xen_pif xen_pif, int64_t mtu)
+xen_pif_set_mtu(xen_session *session, xen_pif pif, int64_t mtu)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_pif },
+              .u.string_val = pif },
             { .type = &abstract_type_int,
               .u.int_val = mtu }
         };
@@ -366,12 +366,12 @@ xen_pif_set_mtu(xen_session *session, xen_pif xen_pif, int64_t mtu)
 
 
 bool
-xen_pif_set_vlan(xen_session *session, xen_pif xen_pif, char *vlan)
+xen_pif_set_vlan(xen_session *session, xen_pif pif, char *vlan)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_pif },
+              .u.string_val = pif },
             { .type = &abstract_type_string,
               .u.string_val = vlan }
         };
diff --git a/tools/libxen/src/xen_sr.c b/tools/libxen/src/xen_sr.c
index 7a5cc2e58d..8dd193c16b 100644
--- a/tools/libxen/src/xen_sr.c
+++ b/tools/libxen/src/xen_sr.c
@@ -302,12 +302,12 @@ xen_sr_get_location(xen_session *session, char **result, xen_sr sr)
 
 
 bool
-xen_sr_set_name_label(xen_session *session, xen_sr xen_sr, char *label)
+xen_sr_set_name_label(xen_session *session, xen_sr sr, char *label)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_sr },
+              .u.string_val = sr },
             { .type = &abstract_type_string,
               .u.string_val = label }
         };
@@ -318,12 +318,12 @@ xen_sr_set_name_label(xen_session *session, xen_sr xen_sr, char *label)
 
 
 bool
-xen_sr_set_name_description(xen_session *session, xen_sr xen_sr, char *description)
+xen_sr_set_name_description(xen_session *session, xen_sr sr, char *description)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_sr },
+              .u.string_val = sr },
             { .type = &abstract_type_string,
               .u.string_val = description }
         };
diff --git a/tools/libxen/src/xen_user.c b/tools/libxen/src/xen_user.c
index e98f0a0f86..da31391f83 100644
--- a/tools/libxen/src/xen_user.c
+++ b/tools/libxen/src/xen_user.c
@@ -164,12 +164,12 @@ xen_user_get_fullname(xen_session *session, char **result, xen_user user)
 
 
 bool
-xen_user_set_fullname(xen_session *session, xen_user xen_user, char *fullname)
+xen_user_set_fullname(xen_session *session, xen_user user, char *fullname)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_user },
+              .u.string_val = user },
             { .type = &abstract_type_string,
               .u.string_val = fullname }
         };
diff --git a/tools/libxen/src/xen_vbd.c b/tools/libxen/src/xen_vbd.c
index b14a52d043..58338ab78b 100644
--- a/tools/libxen/src/xen_vbd.c
+++ b/tools/libxen/src/xen_vbd.c
@@ -270,12 +270,12 @@ xen_vbd_get_io_write_kbs(xen_session *session, double *result, xen_vbd vbd)
 
 
 bool
-xen_vbd_set_vm(xen_session *session, xen_vbd xen_vbd, xen_vm vm)
+xen_vbd_set_vm(xen_session *session, xen_vbd vbd, xen_vm vm)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vbd },
+              .u.string_val = vbd },
             { .type = &abstract_type_string,
               .u.string_val = vm }
         };
@@ -286,12 +286,12 @@ xen_vbd_set_vm(xen_session *session, xen_vbd xen_vbd, xen_vm vm)
 
 
 bool
-xen_vbd_set_vdi(xen_session *session, xen_vbd xen_vbd, xen_vdi vdi)
+xen_vbd_set_vdi(xen_session *session, xen_vbd vbd, xen_vdi vdi)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vbd },
+              .u.string_val = vbd },
             { .type = &abstract_type_string,
               .u.string_val = vdi }
         };
@@ -302,12 +302,12 @@ xen_vbd_set_vdi(xen_session *session, xen_vbd xen_vbd, xen_vdi vdi)
 
 
 bool
-xen_vbd_set_device(xen_session *session, xen_vbd xen_vbd, char *device)
+xen_vbd_set_device(xen_session *session, xen_vbd vbd, char *device)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vbd },
+              .u.string_val = vbd },
             { .type = &abstract_type_string,
               .u.string_val = device }
         };
@@ -318,12 +318,12 @@ xen_vbd_set_device(xen_session *session, xen_vbd xen_vbd, char *device)
 
 
 bool
-xen_vbd_set_mode(xen_session *session, xen_vbd xen_vbd, enum xen_vbd_mode mode)
+xen_vbd_set_mode(xen_session *session, xen_vbd vbd, enum xen_vbd_mode mode)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vbd },
+              .u.string_val = vbd },
             { .type = &xen_vbd_mode_abstract_type_,
               .u.string_val = xen_vbd_mode_to_string(mode) }
         };
@@ -334,12 +334,12 @@ xen_vbd_set_mode(xen_session *session, xen_vbd xen_vbd, enum xen_vbd_mode mode)
 
 
 bool
-xen_vbd_set_driver(xen_session *session, xen_vbd xen_vbd, enum xen_driver_type driver)
+xen_vbd_set_driver(xen_session *session, xen_vbd vbd, enum xen_driver_type driver)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vbd },
+              .u.string_val = vbd },
             { .type = &xen_driver_type_abstract_type_,
               .u.string_val = xen_driver_type_to_string(driver) }
         };
diff --git a/tools/libxen/src/xen_vdi.c b/tools/libxen/src/xen_vdi.c
index 1f2df416f5..bb3ae378b7 100644
--- a/tools/libxen/src/xen_vdi.c
+++ b/tools/libxen/src/xen_vdi.c
@@ -383,12 +383,12 @@ xen_vdi_get_read_only(xen_session *session, bool *result, xen_vdi vdi)
 
 
 bool
-xen_vdi_set_name_label(xen_session *session, xen_vdi xen_vdi, char *label)
+xen_vdi_set_name_label(xen_session *session, xen_vdi vdi, char *label)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vdi },
+              .u.string_val = vdi },
             { .type = &abstract_type_string,
               .u.string_val = label }
         };
@@ -399,12 +399,12 @@ xen_vdi_set_name_label(xen_session *session, xen_vdi xen_vdi, char *label)
 
 
 bool
-xen_vdi_set_name_description(xen_session *session, xen_vdi xen_vdi, char *description)
+xen_vdi_set_name_description(xen_session *session, xen_vdi vdi, char *description)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vdi },
+              .u.string_val = vdi },
             { .type = &abstract_type_string,
               .u.string_val = description }
         };
@@ -415,12 +415,12 @@ xen_vdi_set_name_description(xen_session *session, xen_vdi xen_vdi, char *descri
 
 
 bool
-xen_vdi_set_sr(xen_session *session, xen_vdi xen_vdi, xen_sr sr)
+xen_vdi_set_sr(xen_session *session, xen_vdi vdi, xen_sr sr)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vdi },
+              .u.string_val = vdi },
             { .type = &abstract_type_string,
               .u.string_val = sr }
         };
@@ -431,12 +431,12 @@ xen_vdi_set_sr(xen_session *session, xen_vdi xen_vdi, xen_sr sr)
 
 
 bool
-xen_vdi_set_virtual_size(xen_session *session, xen_vdi xen_vdi, int64_t virtual_size)
+xen_vdi_set_virtual_size(xen_session *session, xen_vdi vdi, int64_t virtual_size)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vdi },
+              .u.string_val = vdi },
             { .type = &abstract_type_int,
               .u.int_val = virtual_size }
         };
@@ -447,12 +447,12 @@ xen_vdi_set_virtual_size(xen_session *session, xen_vdi xen_vdi, int64_t virtual_
 
 
 bool
-xen_vdi_set_sharable(xen_session *session, xen_vdi xen_vdi, bool sharable)
+xen_vdi_set_sharable(xen_session *session, xen_vdi vdi, bool sharable)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vdi },
+              .u.string_val = vdi },
             { .type = &abstract_type_bool,
               .u.bool_val = sharable }
         };
@@ -463,12 +463,12 @@ xen_vdi_set_sharable(xen_session *session, xen_vdi xen_vdi, bool sharable)
 
 
 bool
-xen_vdi_set_read_only(xen_session *session, xen_vdi xen_vdi, bool read_only)
+xen_vdi_set_read_only(xen_session *session, xen_vdi vdi, bool read_only)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vdi },
+              .u.string_val = vdi },
             { .type = &abstract_type_bool,
               .u.bool_val = read_only }
         };
diff --git a/tools/libxen/src/xen_vif.c b/tools/libxen/src/xen_vif.c
index b50e2d81bc..b04623458a 100644
--- a/tools/libxen/src/xen_vif.c
+++ b/tools/libxen/src/xen_vif.c
@@ -307,12 +307,12 @@ xen_vif_get_io_write_kbs(xen_session *session, double *result, xen_vif vif)
 
 
 bool
-xen_vif_set_name(xen_session *session, xen_vif xen_vif, char *name)
+xen_vif_set_name(xen_session *session, xen_vif vif, char *name)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &abstract_type_string,
               .u.string_val = name }
         };
@@ -323,12 +323,12 @@ xen_vif_set_name(xen_session *session, xen_vif xen_vif, char *name)
 
 
 bool
-xen_vif_set_type(xen_session *session, xen_vif xen_vif, enum xen_driver_type type)
+xen_vif_set_type(xen_session *session, xen_vif vif, enum xen_driver_type type)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &xen_driver_type_abstract_type_,
               .u.string_val = xen_driver_type_to_string(type) }
         };
@@ -339,12 +339,12 @@ xen_vif_set_type(xen_session *session, xen_vif xen_vif, enum xen_driver_type typ
 
 
 bool
-xen_vif_set_device(xen_session *session, xen_vif xen_vif, char *device)
+xen_vif_set_device(xen_session *session, xen_vif vif, char *device)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &abstract_type_string,
               .u.string_val = device }
         };
@@ -355,12 +355,12 @@ xen_vif_set_device(xen_session *session, xen_vif xen_vif, char *device)
 
 
 bool
-xen_vif_set_network(xen_session *session, xen_vif xen_vif, xen_network network)
+xen_vif_set_network(xen_session *session, xen_vif vif, xen_network network)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &abstract_type_string,
               .u.string_val = network }
         };
@@ -371,12 +371,12 @@ xen_vif_set_network(xen_session *session, xen_vif xen_vif, xen_network network)
 
 
 bool
-xen_vif_set_vm(xen_session *session, xen_vif xen_vif, xen_vm vm)
+xen_vif_set_vm(xen_session *session, xen_vif vif, xen_vm vm)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &abstract_type_string,
               .u.string_val = vm }
         };
@@ -387,12 +387,12 @@ xen_vif_set_vm(xen_session *session, xen_vif xen_vif, xen_vm vm)
 
 
 bool
-xen_vif_set_mac(xen_session *session, xen_vif xen_vif, char *mac)
+xen_vif_set_mac(xen_session *session, xen_vif vif, char *mac)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &abstract_type_string,
               .u.string_val = mac }
         };
@@ -403,12 +403,12 @@ xen_vif_set_mac(xen_session *session, xen_vif xen_vif, char *mac)
 
 
 bool
-xen_vif_set_mtu(xen_session *session, xen_vif xen_vif, int64_t mtu)
+xen_vif_set_mtu(xen_session *session, xen_vif vif, int64_t mtu)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vif },
+              .u.string_val = vif },
             { .type = &abstract_type_int,
               .u.int_val = mtu }
         };
diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c
index d55b07c3a9..4bd9796eb1 100644
--- a/tools/libxen/src/xen_vm.c
+++ b/tools/libxen/src/xen_vm.c
@@ -982,12 +982,12 @@ xen_vm_get_otherconfig(xen_session *session, xen_string_string_map **result, xen
 
 
 bool
-xen_vm_set_name_label(xen_session *session, xen_vm xen_vm, char *label)
+xen_vm_set_name_label(xen_session *session, xen_vm vm, char *label)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = label }
         };
@@ -998,12 +998,12 @@ xen_vm_set_name_label(xen_session *session, xen_vm xen_vm, char *label)
 
 
 bool
-xen_vm_set_name_description(xen_session *session, xen_vm xen_vm, char *description)
+xen_vm_set_name_description(xen_session *session, xen_vm vm, char *description)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = description }
         };
@@ -1014,12 +1014,12 @@ xen_vm_set_name_description(xen_session *session, xen_vm xen_vm, char *descripti
 
 
 bool
-xen_vm_set_user_version(xen_session *session, xen_vm xen_vm, int64_t user_version)
+xen_vm_set_user_version(xen_session *session, xen_vm vm, int64_t user_version)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_int,
               .u.int_val = user_version }
         };
@@ -1030,12 +1030,12 @@ xen_vm_set_user_version(xen_session *session, xen_vm xen_vm, int64_t user_versio
 
 
 bool
-xen_vm_set_is_a_template(xen_session *session, xen_vm xen_vm, bool is_a_template)
+xen_vm_set_is_a_template(xen_session *session, xen_vm vm, bool is_a_template)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_bool,
               .u.bool_val = is_a_template }
         };
@@ -1046,12 +1046,12 @@ xen_vm_set_is_a_template(xen_session *session, xen_vm xen_vm, bool is_a_template
 
 
 bool
-xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm xen_vm, int64_t dynamic_max)
+xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm vm, int64_t dynamic_max)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_int,
               .u.int_val = dynamic_max }
         };
@@ -1062,12 +1062,12 @@ xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm xen_vm, int64_t dynam
 
 
 bool
-xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm xen_vm, int64_t dynamic_min)
+xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm vm, int64_t dynamic_min)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_int,
               .u.int_val = dynamic_min }
         };
@@ -1078,12 +1078,12 @@ xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm xen_vm, int64_t dynam
 
 
 bool
-xen_vm_set_vcpus_policy(xen_session *session, xen_vm xen_vm, char *policy)
+xen_vm_set_vcpus_policy(xen_session *session, xen_vm vm, char *policy)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = policy }
         };
@@ -1094,12 +1094,12 @@ xen_vm_set_vcpus_policy(xen_session *session, xen_vm xen_vm, char *policy)
 
 
 bool
-xen_vm_set_vcpus_params(xen_session *session, xen_vm xen_vm, char *params)
+xen_vm_set_vcpus_params(xen_session *session, xen_vm vm, char *params)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = params }
         };
@@ -1110,12 +1110,12 @@ xen_vm_set_vcpus_params(xen_session *session, xen_vm xen_vm, char *params)
 
 
 bool
-xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_on)
+xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_on)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_cpu_feature_set_abstract_type_,
               .u.set_val = (arbitrary_set *)force_on }
         };
@@ -1126,12 +1126,12 @@ xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm xen_vm, struct x
 
 
 bool
-xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_off)
+xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_off)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_cpu_feature_set_abstract_type_,
               .u.set_val = (arbitrary_set *)force_off }
         };
@@ -1142,12 +1142,12 @@ xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm xen_vm, struct
 
 
 bool
-xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_shutdown)
+xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_shutdown)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_on_normal_exit_abstract_type_,
               .u.string_val = xen_on_normal_exit_to_string(after_shutdown) }
         };
@@ -1158,12 +1158,12 @@ xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm xen_vm, enum xen_
 
 
 bool
-xen_vm_set_actions_after_reboot(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_reboot)
+xen_vm_set_actions_after_reboot(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_reboot)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_on_normal_exit_abstract_type_,
               .u.string_val = xen_on_normal_exit_to_string(after_reboot) }
         };
@@ -1174,12 +1174,12 @@ xen_vm_set_actions_after_reboot(xen_session *session, xen_vm xen_vm, enum xen_on
 
 
 bool
-xen_vm_set_actions_after_suspend(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_suspend)
+xen_vm_set_actions_after_suspend(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_suspend)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_on_normal_exit_abstract_type_,
               .u.string_val = xen_on_normal_exit_to_string(after_suspend) }
         };
@@ -1190,12 +1190,12 @@ xen_vm_set_actions_after_suspend(xen_session *session, xen_vm xen_vm, enum xen_o
 
 
 bool
-xen_vm_set_actions_after_crash(xen_session *session, xen_vm xen_vm, enum xen_on_crash_behaviour after_crash)
+xen_vm_set_actions_after_crash(xen_session *session, xen_vm vm, enum xen_on_crash_behaviour after_crash)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_on_crash_behaviour_abstract_type_,
               .u.string_val = xen_on_crash_behaviour_to_string(after_crash) }
         };
@@ -1206,12 +1206,12 @@ xen_vm_set_actions_after_crash(xen_session *session, xen_vm xen_vm, enum xen_on_
 
 
 bool
-xen_vm_set_bios_boot(xen_session *session, xen_vm xen_vm, char *boot)
+xen_vm_set_bios_boot(xen_session *session, xen_vm vm, char *boot)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = boot }
         };
@@ -1222,12 +1222,12 @@ xen_vm_set_bios_boot(xen_session *session, xen_vm xen_vm, char *boot)
 
 
 bool
-xen_vm_set_platform_std_vga(xen_session *session, xen_vm xen_vm, bool std_vga)
+xen_vm_set_platform_std_vga(xen_session *session, xen_vm vm, bool std_vga)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_bool,
               .u.bool_val = std_vga }
         };
@@ -1238,12 +1238,12 @@ xen_vm_set_platform_std_vga(xen_session *session, xen_vm xen_vm, bool std_vga)
 
 
 bool
-xen_vm_set_platform_serial(xen_session *session, xen_vm xen_vm, char *serial)
+xen_vm_set_platform_serial(xen_session *session, xen_vm vm, char *serial)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = serial }
         };
@@ -1254,12 +1254,12 @@ xen_vm_set_platform_serial(xen_session *session, xen_vm xen_vm, char *serial)
 
 
 bool
-xen_vm_set_platform_localtime(xen_session *session, xen_vm xen_vm, bool localtime)
+xen_vm_set_platform_localtime(xen_session *session, xen_vm vm, bool localtime)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_bool,
               .u.bool_val = localtime }
         };
@@ -1270,12 +1270,12 @@ xen_vm_set_platform_localtime(xen_session *session, xen_vm xen_vm, bool localtim
 
 
 bool
-xen_vm_set_platform_clock_offset(xen_session *session, xen_vm xen_vm, bool clock_offset)
+xen_vm_set_platform_clock_offset(xen_session *session, xen_vm vm, bool clock_offset)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_bool,
               .u.bool_val = clock_offset }
         };
@@ -1286,12 +1286,12 @@ xen_vm_set_platform_clock_offset(xen_session *session, xen_vm xen_vm, bool clock
 
 
 bool
-xen_vm_set_platform_enable_audio(xen_session *session, xen_vm xen_vm, bool enable_audio)
+xen_vm_set_platform_enable_audio(xen_session *session, xen_vm vm, bool enable_audio)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_bool,
               .u.bool_val = enable_audio }
         };
@@ -1302,12 +1302,12 @@ xen_vm_set_platform_enable_audio(xen_session *session, xen_vm xen_vm, bool enabl
 
 
 bool
-xen_vm_set_builder(xen_session *session, xen_vm xen_vm, char *builder)
+xen_vm_set_builder(xen_session *session, xen_vm vm, char *builder)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = builder }
         };
@@ -1318,12 +1318,12 @@ xen_vm_set_builder(xen_session *session, xen_vm xen_vm, char *builder)
 
 
 bool
-xen_vm_set_boot_method(xen_session *session, xen_vm xen_vm, enum xen_boot_type boot_method)
+xen_vm_set_boot_method(xen_session *session, xen_vm vm, enum xen_boot_type boot_method)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &xen_boot_type_abstract_type_,
               .u.string_val = xen_boot_type_to_string(boot_method) }
         };
@@ -1334,12 +1334,12 @@ xen_vm_set_boot_method(xen_session *session, xen_vm xen_vm, enum xen_boot_type b
 
 
 bool
-xen_vm_set_kernel_kernel(xen_session *session, xen_vm xen_vm, char *kernel)
+xen_vm_set_kernel_kernel(xen_session *session, xen_vm vm, char *kernel)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = kernel }
         };
@@ -1350,12 +1350,12 @@ xen_vm_set_kernel_kernel(xen_session *session, xen_vm xen_vm, char *kernel)
 
 
 bool
-xen_vm_set_kernel_initrd(xen_session *session, xen_vm xen_vm, char *initrd)
+xen_vm_set_kernel_initrd(xen_session *session, xen_vm vm, char *initrd)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = initrd }
         };
@@ -1366,12 +1366,12 @@ xen_vm_set_kernel_initrd(xen_session *session, xen_vm xen_vm, char *initrd)
 
 
 bool
-xen_vm_set_kernel_args(xen_session *session, xen_vm xen_vm, char *args)
+xen_vm_set_kernel_args(xen_session *session, xen_vm vm, char *args)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = args }
         };
@@ -1382,12 +1382,12 @@ xen_vm_set_kernel_args(xen_session *session, xen_vm xen_vm, char *args)
 
 
 bool
-xen_vm_set_grub_cmdline(xen_session *session, xen_vm xen_vm, char *cmdline)
+xen_vm_set_grub_cmdline(xen_session *session, xen_vm vm, char *cmdline)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string,
               .u.string_val = cmdline }
         };
@@ -1398,12 +1398,12 @@ xen_vm_set_grub_cmdline(xen_session *session, xen_vm xen_vm, char *cmdline)
 
 
 bool
-xen_vm_set_otherconfig(xen_session *session, xen_vm xen_vm, xen_string_string_map *otherconfig)
+xen_vm_set_otherconfig(xen_session *session, xen_vm vm, xen_string_string_map *otherconfig)
 {
     abstract_value param_values[] =
         {
             { .type = &abstract_type_string,
-              .u.string_val = xen_vm },
+              .u.string_val = vm },
             { .type = &abstract_type_string_string_map,
               .u.set_val = (arbitrary_set *)otherconfig }
         };
-- 
2.30.2