direct-io.hg

changeset 12339:08b38d041269

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>
author Ewan Mellor <ewan@xensource.com>
date Thu Nov 09 11:02:48 2006 +0000 (2006-11-09)
parents 452010ddef24
children 329818f11f35
files tools/libxen/include/xen_host.h tools/libxen/include/xen_network.h tools/libxen/include/xen_pif.h tools/libxen/include/xen_sr.h tools/libxen/include/xen_user.h tools/libxen/include/xen_vbd.h tools/libxen/include/xen_vdi.h tools/libxen/include/xen_vif.h tools/libxen/include/xen_vm.h tools/libxen/src/xen_host.c tools/libxen/src/xen_network.c tools/libxen/src/xen_pif.c tools/libxen/src/xen_sr.c tools/libxen/src/xen_user.c tools/libxen/src/xen_vbd.c tools/libxen/src/xen_vdi.c tools/libxen/src/xen_vif.c tools/libxen/src/xen_vm.c
line diff
     1.1 --- a/tools/libxen/include/xen_host.h	Thu Nov 09 18:14:53 2006 +0000
     1.2 +++ b/tools/libxen/include/xen_host.h	Thu Nov 09 11:02:48 2006 +0000
     1.3 @@ -234,14 +234,14 @@ xen_host_get_host_cpus(xen_session *sess
     1.4   * Set the name/label field of the given host.
     1.5   */
     1.6  extern bool
     1.7 -xen_host_set_name_label(xen_session *session, xen_host xen_host, char *label);
     1.8 +xen_host_set_name_label(xen_session *session, xen_host host, char *label);
     1.9  
    1.10  
    1.11  /**
    1.12   * Set the name/description field of the given host.
    1.13   */
    1.14  extern bool
    1.15 -xen_host_set_name_description(xen_session *session, xen_host xen_host, char *description);
    1.16 +xen_host_set_name_description(xen_session *session, xen_host host, char *description);
    1.17  
    1.18  
    1.19  /**
     2.1 --- a/tools/libxen/include/xen_network.h	Thu Nov 09 18:14:53 2006 +0000
     2.2 +++ b/tools/libxen/include/xen_network.h	Thu Nov 09 11:02:48 2006 +0000
     2.3 @@ -232,28 +232,28 @@ xen_network_get_default_netmask(xen_sess
     2.4   * Set the name/label field of the given network.
     2.5   */
     2.6  extern bool
     2.7 -xen_network_set_name_label(xen_session *session, xen_network xen_network, char *label);
     2.8 +xen_network_set_name_label(xen_session *session, xen_network network, char *label);
     2.9  
    2.10  
    2.11  /**
    2.12   * Set the name/description field of the given network.
    2.13   */
    2.14  extern bool
    2.15 -xen_network_set_name_description(xen_session *session, xen_network xen_network, char *description);
    2.16 +xen_network_set_name_description(xen_session *session, xen_network network, char *description);
    2.17  
    2.18  
    2.19  /**
    2.20   * Set the default_gateway field of the given network.
    2.21   */
    2.22  extern bool
    2.23 -xen_network_set_default_gateway(xen_session *session, xen_network xen_network, char *default_gateway);
    2.24 +xen_network_set_default_gateway(xen_session *session, xen_network network, char *default_gateway);
    2.25  
    2.26  
    2.27  /**
    2.28   * Set the default_netmask field of the given network.
    2.29   */
    2.30  extern bool
    2.31 -xen_network_set_default_netmask(xen_session *session, xen_network xen_network, char *default_netmask);
    2.32 +xen_network_set_default_netmask(xen_session *session, xen_network network, char *default_netmask);
    2.33  
    2.34  
    2.35  /**
     3.1 --- a/tools/libxen/include/xen_pif.h	Thu Nov 09 18:14:53 2006 +0000
     3.2 +++ b/tools/libxen/include/xen_pif.h	Thu Nov 09 11:02:48 2006 +0000
     3.3 @@ -242,42 +242,42 @@ xen_pif_get_io_write_kbs(xen_session *se
     3.4   * Set the name field of the given PIF.
     3.5   */
     3.6  extern bool
     3.7 -xen_pif_set_name(xen_session *session, xen_pif xen_pif, char *name);
     3.8 +xen_pif_set_name(xen_session *session, xen_pif pif, char *name);
     3.9  
    3.10  
    3.11  /**
    3.12   * Set the network field of the given PIF.
    3.13   */
    3.14  extern bool
    3.15 -xen_pif_set_network(xen_session *session, xen_pif xen_pif, xen_network network);
    3.16 +xen_pif_set_network(xen_session *session, xen_pif pif, xen_network network);
    3.17  
    3.18  
    3.19  /**
    3.20   * Set the host field of the given PIF.
    3.21   */
    3.22  extern bool
    3.23 -xen_pif_set_host(xen_session *session, xen_pif xen_pif, xen_host host);
    3.24 +xen_pif_set_host(xen_session *session, xen_pif pif, xen_host host);
    3.25  
    3.26  
    3.27  /**
    3.28   * Set the MAC field of the given PIF.
    3.29   */
    3.30  extern bool
    3.31 -xen_pif_set_mac(xen_session *session, xen_pif xen_pif, char *mac);
    3.32 +xen_pif_set_mac(xen_session *session, xen_pif pif, char *mac);
    3.33  
    3.34  
    3.35  /**
    3.36   * Set the MTU field of the given PIF.
    3.37   */
    3.38  extern bool
    3.39 -xen_pif_set_mtu(xen_session *session, xen_pif xen_pif, int64_t mtu);
    3.40 +xen_pif_set_mtu(xen_session *session, xen_pif pif, int64_t mtu);
    3.41  
    3.42  
    3.43  /**
    3.44   * Set the VLAN field of the given PIF.
    3.45   */
    3.46  extern bool
    3.47 -xen_pif_set_vlan(xen_session *session, xen_pif xen_pif, char *vlan);
    3.48 +xen_pif_set_vlan(xen_session *session, xen_pif pif, char *vlan);
    3.49  
    3.50  
    3.51  #endif
     4.1 --- a/tools/libxen/include/xen_sr.h	Thu Nov 09 18:14:53 2006 +0000
     4.2 +++ b/tools/libxen/include/xen_sr.h	Thu Nov 09 11:02:48 2006 +0000
     4.3 @@ -247,26 +247,26 @@ xen_sr_get_location(xen_session *session
     4.4   * Set the name/label field of the given SR.
     4.5   */
     4.6  extern bool
     4.7 -xen_sr_set_name_label(xen_session *session, xen_sr xen_sr, char *label);
     4.8 +xen_sr_set_name_label(xen_session *session, xen_sr sr, char *label);
     4.9  
    4.10  
    4.11  /**
    4.12   * Set the name/description field of the given SR.
    4.13   */
    4.14  extern bool
    4.15 -xen_sr_set_name_description(xen_session *session, xen_sr xen_sr, char *description);
    4.16 +xen_sr_set_name_description(xen_session *session, xen_sr sr, char *description);
    4.17  
    4.18  
    4.19  /**
    4.20 - * Take an exact copy of the Storage Repository; 
    4.21 - *         the cloned storage repository has the same type as its parent
    4.22 + * Take an exact copy of the Storage Repository; the cloned storage
    4.23 + * repository has the same type as its parent
    4.24   */
    4.25  extern bool
    4.26  xen_sr_clone(xen_session *session, xen_sr *result, xen_sr sr, char *loc, char *name);
    4.27  
    4.28  
    4.29  /**
    4.30 - * Return a list of all the Storage Repositories known to the system
    4.31 + * Return a list of all the SRs known to the system
    4.32   */
    4.33  extern bool
    4.34  xen_sr_get_all(xen_session *session, struct xen_sr_set **result);
     5.1 --- a/tools/libxen/include/xen_user.h	Thu Nov 09 18:14:53 2006 +0000
     5.2 +++ b/tools/libxen/include/xen_user.h	Thu Nov 09 11:02:48 2006 +0000
     5.3 @@ -191,7 +191,7 @@ xen_user_get_fullname(xen_session *sessi
     5.4   * Set the fullname field of the given user.
     5.5   */
     5.6  extern bool
     5.7 -xen_user_set_fullname(xen_session *session, xen_user xen_user, char *fullname);
     5.8 +xen_user_set_fullname(xen_session *session, xen_user user, char *fullname);
     5.9  
    5.10  
    5.11  #endif
     6.1 --- a/tools/libxen/include/xen_vbd.h	Thu Nov 09 18:14:53 2006 +0000
     6.2 +++ b/tools/libxen/include/xen_vbd.h	Thu Nov 09 11:02:48 2006 +0000
     6.3 @@ -236,35 +236,35 @@ xen_vbd_get_io_write_kbs(xen_session *se
     6.4   * Set the VM field of the given VBD.
     6.5   */
     6.6  extern bool
     6.7 -xen_vbd_set_vm(xen_session *session, xen_vbd xen_vbd, xen_vm vm);
     6.8 +xen_vbd_set_vm(xen_session *session, xen_vbd vbd, xen_vm vm);
     6.9  
    6.10  
    6.11  /**
    6.12   * Set the VDI field of the given VBD.
    6.13   */
    6.14  extern bool
    6.15 -xen_vbd_set_vdi(xen_session *session, xen_vbd xen_vbd, xen_vdi vdi);
    6.16 +xen_vbd_set_vdi(xen_session *session, xen_vbd vbd, xen_vdi vdi);
    6.17  
    6.18  
    6.19  /**
    6.20   * Set the device field of the given VBD.
    6.21   */
    6.22  extern bool
    6.23 -xen_vbd_set_device(xen_session *session, xen_vbd xen_vbd, char *device);
    6.24 +xen_vbd_set_device(xen_session *session, xen_vbd vbd, char *device);
    6.25  
    6.26  
    6.27  /**
    6.28   * Set the mode field of the given VBD.
    6.29   */
    6.30  extern bool
    6.31 -xen_vbd_set_mode(xen_session *session, xen_vbd xen_vbd, enum xen_vbd_mode mode);
    6.32 +xen_vbd_set_mode(xen_session *session, xen_vbd vbd, enum xen_vbd_mode mode);
    6.33  
    6.34  
    6.35  /**
    6.36   * Set the driver field of the given VBD.
    6.37   */
    6.38  extern bool
    6.39 -xen_vbd_set_driver(xen_session *session, xen_vbd xen_vbd, enum xen_driver_type driver);
    6.40 +xen_vbd_set_driver(xen_session *session, xen_vbd vbd, enum xen_driver_type driver);
    6.41  
    6.42  
    6.43  /**
     7.1 --- a/tools/libxen/include/xen_vdi.h	Thu Nov 09 18:14:53 2006 +0000
     7.2 +++ b/tools/libxen/include/xen_vdi.h	Thu Nov 09 11:02:48 2006 +0000
     7.3 @@ -281,42 +281,42 @@ xen_vdi_get_read_only(xen_session *sessi
     7.4   * Set the name/label field of the given VDI.
     7.5   */
     7.6  extern bool
     7.7 -xen_vdi_set_name_label(xen_session *session, xen_vdi xen_vdi, char *label);
     7.8 +xen_vdi_set_name_label(xen_session *session, xen_vdi vdi, char *label);
     7.9  
    7.10  
    7.11  /**
    7.12   * Set the name/description field of the given VDI.
    7.13   */
    7.14  extern bool
    7.15 -xen_vdi_set_name_description(xen_session *session, xen_vdi xen_vdi, char *description);
    7.16 +xen_vdi_set_name_description(xen_session *session, xen_vdi vdi, char *description);
    7.17  
    7.18  
    7.19  /**
    7.20   * Set the SR field of the given VDI.
    7.21   */
    7.22  extern bool
    7.23 -xen_vdi_set_sr(xen_session *session, xen_vdi xen_vdi, xen_sr sr);
    7.24 +xen_vdi_set_sr(xen_session *session, xen_vdi vdi, xen_sr sr);
    7.25  
    7.26  
    7.27  /**
    7.28   * Set the virtual_size field of the given VDI.
    7.29   */
    7.30  extern bool
    7.31 -xen_vdi_set_virtual_size(xen_session *session, xen_vdi xen_vdi, int64_t virtual_size);
    7.32 +xen_vdi_set_virtual_size(xen_session *session, xen_vdi vdi, int64_t virtual_size);
    7.33  
    7.34  
    7.35  /**
    7.36   * Set the sharable field of the given VDI.
    7.37   */
    7.38  extern bool
    7.39 -xen_vdi_set_sharable(xen_session *session, xen_vdi xen_vdi, bool sharable);
    7.40 +xen_vdi_set_sharable(xen_session *session, xen_vdi vdi, bool sharable);
    7.41  
    7.42  
    7.43  /**
    7.44   * Set the read_only field of the given VDI.
    7.45   */
    7.46  extern bool
    7.47 -xen_vdi_set_read_only(xen_session *session, xen_vdi xen_vdi, bool read_only);
    7.48 +xen_vdi_set_read_only(xen_session *session, xen_vdi vdi, bool read_only);
    7.49  
    7.50  
    7.51  /**
     8.1 --- a/tools/libxen/include/xen_vif.h	Thu Nov 09 18:14:53 2006 +0000
     8.2 +++ b/tools/libxen/include/xen_vif.h	Thu Nov 09 11:02:48 2006 +0000
     8.3 @@ -250,49 +250,49 @@ xen_vif_get_io_write_kbs(xen_session *se
     8.4   * Set the name field of the given VIF.
     8.5   */
     8.6  extern bool
     8.7 -xen_vif_set_name(xen_session *session, xen_vif xen_vif, char *name);
     8.8 +xen_vif_set_name(xen_session *session, xen_vif vif, char *name);
     8.9  
    8.10  
    8.11  /**
    8.12   * Set the type field of the given VIF.
    8.13   */
    8.14  extern bool
    8.15 -xen_vif_set_type(xen_session *session, xen_vif xen_vif, enum xen_driver_type type);
    8.16 +xen_vif_set_type(xen_session *session, xen_vif vif, enum xen_driver_type type);
    8.17  
    8.18  
    8.19  /**
    8.20   * Set the device field of the given VIF.
    8.21   */
    8.22  extern bool
    8.23 -xen_vif_set_device(xen_session *session, xen_vif xen_vif, char *device);
    8.24 +xen_vif_set_device(xen_session *session, xen_vif vif, char *device);
    8.25  
    8.26  
    8.27  /**
    8.28   * Set the network field of the given VIF.
    8.29   */
    8.30  extern bool
    8.31 -xen_vif_set_network(xen_session *session, xen_vif xen_vif, xen_network network);
    8.32 +xen_vif_set_network(xen_session *session, xen_vif vif, xen_network network);
    8.33  
    8.34  
    8.35  /**
    8.36   * Set the VM field of the given VIF.
    8.37   */
    8.38  extern bool
    8.39 -xen_vif_set_vm(xen_session *session, xen_vif xen_vif, xen_vm vm);
    8.40 +xen_vif_set_vm(xen_session *session, xen_vif vif, xen_vm vm);
    8.41  
    8.42  
    8.43  /**
    8.44   * Set the MAC field of the given VIF.
    8.45   */
    8.46  extern bool
    8.47 -xen_vif_set_mac(xen_session *session, xen_vif xen_vif, char *mac);
    8.48 +xen_vif_set_mac(xen_session *session, xen_vif vif, char *mac);
    8.49  
    8.50  
    8.51  /**
    8.52   * Set the MTU field of the given VIF.
    8.53   */
    8.54  extern bool
    8.55 -xen_vif_set_mtu(xen_session *session, xen_vif xen_vif, int64_t mtu);
    8.56 +xen_vif_set_mtu(xen_session *session, xen_vif vif, int64_t mtu);
    8.57  
    8.58  
    8.59  #endif
     9.1 --- a/tools/libxen/include/xen_vm.h	Thu Nov 09 18:14:53 2006 +0000
     9.2 +++ b/tools/libxen/include/xen_vm.h	Thu Nov 09 11:02:48 2006 +0000
     9.3 @@ -521,189 +521,189 @@ xen_vm_get_otherconfig(xen_session *sess
     9.4   * Set the name/label field of the given VM.
     9.5   */
     9.6  extern bool
     9.7 -xen_vm_set_name_label(xen_session *session, xen_vm xen_vm, char *label);
     9.8 +xen_vm_set_name_label(xen_session *session, xen_vm vm, char *label);
     9.9  
    9.10  
    9.11  /**
    9.12   * Set the name/description field of the given VM.
    9.13   */
    9.14  extern bool
    9.15 -xen_vm_set_name_description(xen_session *session, xen_vm xen_vm, char *description);
    9.16 +xen_vm_set_name_description(xen_session *session, xen_vm vm, char *description);
    9.17  
    9.18  
    9.19  /**
    9.20   * Set the user_version field of the given VM.
    9.21   */
    9.22  extern bool
    9.23 -xen_vm_set_user_version(xen_session *session, xen_vm xen_vm, int64_t user_version);
    9.24 +xen_vm_set_user_version(xen_session *session, xen_vm vm, int64_t user_version);
    9.25  
    9.26  
    9.27  /**
    9.28   * Set the is_a_template field of the given VM.
    9.29   */
    9.30  extern bool
    9.31 -xen_vm_set_is_a_template(xen_session *session, xen_vm xen_vm, bool is_a_template);
    9.32 +xen_vm_set_is_a_template(xen_session *session, xen_vm vm, bool is_a_template);
    9.33  
    9.34  
    9.35  /**
    9.36   * Set the memory/dynamic_max field of the given VM.
    9.37   */
    9.38  extern bool
    9.39 -xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm xen_vm, int64_t dynamic_max);
    9.40 +xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm vm, int64_t dynamic_max);
    9.41  
    9.42  
    9.43  /**
    9.44   * Set the memory/dynamic_min field of the given VM.
    9.45   */
    9.46  extern bool
    9.47 -xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm xen_vm, int64_t dynamic_min);
    9.48 +xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm vm, int64_t dynamic_min);
    9.49  
    9.50  
    9.51  /**
    9.52   * Set the VCPUs/policy field of the given VM.
    9.53   */
    9.54  extern bool
    9.55 -xen_vm_set_vcpus_policy(xen_session *session, xen_vm xen_vm, char *policy);
    9.56 +xen_vm_set_vcpus_policy(xen_session *session, xen_vm vm, char *policy);
    9.57  
    9.58  
    9.59  /**
    9.60   * Set the VCPUs/params field of the given VM.
    9.61   */
    9.62  extern bool
    9.63 -xen_vm_set_vcpus_params(xen_session *session, xen_vm xen_vm, char *params);
    9.64 +xen_vm_set_vcpus_params(xen_session *session, xen_vm vm, char *params);
    9.65  
    9.66  
    9.67  /**
    9.68   * Set the VCPUs/features/force_on field of the given VM.
    9.69   */
    9.70  extern bool
    9.71 -xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_on);
    9.72 +xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_on);
    9.73  
    9.74  
    9.75  /**
    9.76   * Set the VCPUs/features/force_off field of the given VM.
    9.77   */
    9.78  extern bool
    9.79 -xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_off);
    9.80 +xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_off);
    9.81  
    9.82  
    9.83  /**
    9.84   * Set the actions/after_shutdown field of the given VM.
    9.85   */
    9.86  extern bool
    9.87 -xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_shutdown);
    9.88 +xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_shutdown);
    9.89  
    9.90  
    9.91  /**
    9.92   * Set the actions/after_reboot field of the given VM.
    9.93   */
    9.94  extern bool
    9.95 -xen_vm_set_actions_after_reboot(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_reboot);
    9.96 +xen_vm_set_actions_after_reboot(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_reboot);
    9.97  
    9.98  
    9.99  /**
   9.100   * Set the actions/after_suspend field of the given VM.
   9.101   */
   9.102  extern bool
   9.103 -xen_vm_set_actions_after_suspend(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_suspend);
   9.104 +xen_vm_set_actions_after_suspend(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_suspend);
   9.105  
   9.106  
   9.107  /**
   9.108   * Set the actions/after_crash field of the given VM.
   9.109   */
   9.110  extern bool
   9.111 -xen_vm_set_actions_after_crash(xen_session *session, xen_vm xen_vm, enum xen_on_crash_behaviour after_crash);
   9.112 +xen_vm_set_actions_after_crash(xen_session *session, xen_vm vm, enum xen_on_crash_behaviour after_crash);
   9.113  
   9.114  
   9.115  /**
   9.116   * Set the bios/boot field of the given VM.
   9.117   */
   9.118  extern bool
   9.119 -xen_vm_set_bios_boot(xen_session *session, xen_vm xen_vm, char *boot);
   9.120 +xen_vm_set_bios_boot(xen_session *session, xen_vm vm, char *boot);
   9.121  
   9.122  
   9.123  /**
   9.124   * Set the platform/std_VGA field of the given VM.
   9.125   */
   9.126  extern bool
   9.127 -xen_vm_set_platform_std_vga(xen_session *session, xen_vm xen_vm, bool std_vga);
   9.128 +xen_vm_set_platform_std_vga(xen_session *session, xen_vm vm, bool std_vga);
   9.129  
   9.130  
   9.131  /**
   9.132   * Set the platform/serial field of the given VM.
   9.133   */
   9.134  extern bool
   9.135 -xen_vm_set_platform_serial(xen_session *session, xen_vm xen_vm, char *serial);
   9.136 +xen_vm_set_platform_serial(xen_session *session, xen_vm vm, char *serial);
   9.137  
   9.138  
   9.139  /**
   9.140   * Set the platform/localtime field of the given VM.
   9.141   */
   9.142  extern bool
   9.143 -xen_vm_set_platform_localtime(xen_session *session, xen_vm xen_vm, bool localtime);
   9.144 +xen_vm_set_platform_localtime(xen_session *session, xen_vm vm, bool localtime);
   9.145  
   9.146  
   9.147  /**
   9.148   * Set the platform/clock_offset field of the given VM.
   9.149   */
   9.150  extern bool
   9.151 -xen_vm_set_platform_clock_offset(xen_session *session, xen_vm xen_vm, bool clock_offset);
   9.152 +xen_vm_set_platform_clock_offset(xen_session *session, xen_vm vm, bool clock_offset);
   9.153  
   9.154  
   9.155  /**
   9.156   * Set the platform/enable_audio field of the given VM.
   9.157   */
   9.158  extern bool
   9.159 -xen_vm_set_platform_enable_audio(xen_session *session, xen_vm xen_vm, bool enable_audio);
   9.160 +xen_vm_set_platform_enable_audio(xen_session *session, xen_vm vm, bool enable_audio);
   9.161  
   9.162  
   9.163  /**
   9.164   * Set the builder field of the given VM.
   9.165   */
   9.166  extern bool
   9.167 -xen_vm_set_builder(xen_session *session, xen_vm xen_vm, char *builder);
   9.168 +xen_vm_set_builder(xen_session *session, xen_vm vm, char *builder);
   9.169  
   9.170  
   9.171  /**
   9.172   * Set the boot_method field of the given VM.
   9.173   */
   9.174  extern bool
   9.175 -xen_vm_set_boot_method(xen_session *session, xen_vm xen_vm, enum xen_boot_type boot_method);
   9.176 +xen_vm_set_boot_method(xen_session *session, xen_vm vm, enum xen_boot_type boot_method);
   9.177  
   9.178  
   9.179  /**
   9.180   * Set the kernel/kernel field of the given VM.
   9.181   */
   9.182  extern bool
   9.183 -xen_vm_set_kernel_kernel(xen_session *session, xen_vm xen_vm, char *kernel);
   9.184 +xen_vm_set_kernel_kernel(xen_session *session, xen_vm vm, char *kernel);
   9.185  
   9.186  
   9.187  /**
   9.188   * Set the kernel/initrd field of the given VM.
   9.189   */
   9.190  extern bool
   9.191 -xen_vm_set_kernel_initrd(xen_session *session, xen_vm xen_vm, char *initrd);
   9.192 +xen_vm_set_kernel_initrd(xen_session *session, xen_vm vm, char *initrd);
   9.193  
   9.194  
   9.195  /**
   9.196   * Set the kernel/args field of the given VM.
   9.197   */
   9.198  extern bool
   9.199 -xen_vm_set_kernel_args(xen_session *session, xen_vm xen_vm, char *args);
   9.200 +xen_vm_set_kernel_args(xen_session *session, xen_vm vm, char *args);
   9.201  
   9.202  
   9.203  /**
   9.204   * Set the grub/cmdline field of the given VM.
   9.205   */
   9.206  extern bool
   9.207 -xen_vm_set_grub_cmdline(xen_session *session, xen_vm xen_vm, char *cmdline);
   9.208 +xen_vm_set_grub_cmdline(xen_session *session, xen_vm vm, char *cmdline);
   9.209  
   9.210  
   9.211  /**
   9.212   * Set the otherConfig field of the given VM.
   9.213   */
   9.214  extern bool
   9.215 -xen_vm_set_otherconfig(xen_session *session, xen_vm xen_vm, xen_string_string_map *otherconfig);
   9.216 +xen_vm_set_otherconfig(xen_session *session, xen_vm vm, xen_string_string_map *otherconfig);
   9.217  
   9.218  
   9.219  /**
    10.1 --- a/tools/libxen/src/xen_host.c	Thu Nov 09 18:14:53 2006 +0000
    10.2 +++ b/tools/libxen/src/xen_host.c	Thu Nov 09 11:02:48 2006 +0000
    10.3 @@ -269,12 +269,12 @@ xen_host_get_host_cpus(xen_session *sess
    10.4  
    10.5  
    10.6  bool
    10.7 -xen_host_set_name_label(xen_session *session, xen_host xen_host, char *label)
    10.8 +xen_host_set_name_label(xen_session *session, xen_host host, char *label)
    10.9  {
   10.10      abstract_value param_values[] =
   10.11          {
   10.12              { .type = &abstract_type_string,
   10.13 -              .u.string_val = xen_host },
   10.14 +              .u.string_val = host },
   10.15              { .type = &abstract_type_string,
   10.16                .u.string_val = label }
   10.17          };
   10.18 @@ -285,12 +285,12 @@ xen_host_set_name_label(xen_session *ses
   10.19  
   10.20  
   10.21  bool
   10.22 -xen_host_set_name_description(xen_session *session, xen_host xen_host, char *description)
   10.23 +xen_host_set_name_description(xen_session *session, xen_host host, char *description)
   10.24  {
   10.25      abstract_value param_values[] =
   10.26          {
   10.27              { .type = &abstract_type_string,
   10.28 -              .u.string_val = xen_host },
   10.29 +              .u.string_val = host },
   10.30              { .type = &abstract_type_string,
   10.31                .u.string_val = description }
   10.32          };
    11.1 --- a/tools/libxen/src/xen_network.c	Thu Nov 09 18:14:53 2006 +0000
    11.2 +++ b/tools/libxen/src/xen_network.c	Thu Nov 09 11:02:48 2006 +0000
    11.3 @@ -267,12 +267,12 @@ xen_network_get_default_netmask(xen_sess
    11.4  
    11.5  
    11.6  bool
    11.7 -xen_network_set_name_label(xen_session *session, xen_network xen_network, char *label)
    11.8 +xen_network_set_name_label(xen_session *session, xen_network network, char *label)
    11.9  {
   11.10      abstract_value param_values[] =
   11.11          {
   11.12              { .type = &abstract_type_string,
   11.13 -              .u.string_val = xen_network },
   11.14 +              .u.string_val = network },
   11.15              { .type = &abstract_type_string,
   11.16                .u.string_val = label }
   11.17          };
   11.18 @@ -283,12 +283,12 @@ xen_network_set_name_label(xen_session *
   11.19  
   11.20  
   11.21  bool
   11.22 -xen_network_set_name_description(xen_session *session, xen_network xen_network, char *description)
   11.23 +xen_network_set_name_description(xen_session *session, xen_network network, char *description)
   11.24  {
   11.25      abstract_value param_values[] =
   11.26          {
   11.27              { .type = &abstract_type_string,
   11.28 -              .u.string_val = xen_network },
   11.29 +              .u.string_val = network },
   11.30              { .type = &abstract_type_string,
   11.31                .u.string_val = description }
   11.32          };
   11.33 @@ -299,12 +299,12 @@ xen_network_set_name_description(xen_ses
   11.34  
   11.35  
   11.36  bool
   11.37 -xen_network_set_default_gateway(xen_session *session, xen_network xen_network, char *default_gateway)
   11.38 +xen_network_set_default_gateway(xen_session *session, xen_network network, char *default_gateway)
   11.39  {
   11.40      abstract_value param_values[] =
   11.41          {
   11.42              { .type = &abstract_type_string,
   11.43 -              .u.string_val = xen_network },
   11.44 +              .u.string_val = network },
   11.45              { .type = &abstract_type_string,
   11.46                .u.string_val = default_gateway }
   11.47          };
   11.48 @@ -315,12 +315,12 @@ xen_network_set_default_gateway(xen_sess
   11.49  
   11.50  
   11.51  bool
   11.52 -xen_network_set_default_netmask(xen_session *session, xen_network xen_network, char *default_netmask)
   11.53 +xen_network_set_default_netmask(xen_session *session, xen_network network, char *default_netmask)
   11.54  {
   11.55      abstract_value param_values[] =
   11.56          {
   11.57              { .type = &abstract_type_string,
   11.58 -              .u.string_val = xen_network },
   11.59 +              .u.string_val = network },
   11.60              { .type = &abstract_type_string,
   11.61                .u.string_val = default_netmask }
   11.62          };
    12.1 --- a/tools/libxen/src/xen_pif.c	Thu Nov 09 18:14:53 2006 +0000
    12.2 +++ b/tools/libxen/src/xen_pif.c	Thu Nov 09 11:02:48 2006 +0000
    12.3 @@ -286,12 +286,12 @@ xen_pif_get_io_write_kbs(xen_session *se
    12.4  
    12.5  
    12.6  bool
    12.7 -xen_pif_set_name(xen_session *session, xen_pif xen_pif, char *name)
    12.8 +xen_pif_set_name(xen_session *session, xen_pif pif, char *name)
    12.9  {
   12.10      abstract_value param_values[] =
   12.11          {
   12.12              { .type = &abstract_type_string,
   12.13 -              .u.string_val = xen_pif },
   12.14 +              .u.string_val = pif },
   12.15              { .type = &abstract_type_string,
   12.16                .u.string_val = name }
   12.17          };
   12.18 @@ -302,12 +302,12 @@ xen_pif_set_name(xen_session *session, x
   12.19  
   12.20  
   12.21  bool
   12.22 -xen_pif_set_network(xen_session *session, xen_pif xen_pif, xen_network network)
   12.23 +xen_pif_set_network(xen_session *session, xen_pif pif, xen_network network)
   12.24  {
   12.25      abstract_value param_values[] =
   12.26          {
   12.27              { .type = &abstract_type_string,
   12.28 -              .u.string_val = xen_pif },
   12.29 +              .u.string_val = pif },
   12.30              { .type = &abstract_type_string,
   12.31                .u.string_val = network }
   12.32          };
   12.33 @@ -318,12 +318,12 @@ xen_pif_set_network(xen_session *session
   12.34  
   12.35  
   12.36  bool
   12.37 -xen_pif_set_host(xen_session *session, xen_pif xen_pif, xen_host host)
   12.38 +xen_pif_set_host(xen_session *session, xen_pif pif, xen_host host)
   12.39  {
   12.40      abstract_value param_values[] =
   12.41          {
   12.42              { .type = &abstract_type_string,
   12.43 -              .u.string_val = xen_pif },
   12.44 +              .u.string_val = pif },
   12.45              { .type = &abstract_type_string,
   12.46                .u.string_val = host }
   12.47          };
   12.48 @@ -334,12 +334,12 @@ xen_pif_set_host(xen_session *session, x
   12.49  
   12.50  
   12.51  bool
   12.52 -xen_pif_set_mac(xen_session *session, xen_pif xen_pif, char *mac)
   12.53 +xen_pif_set_mac(xen_session *session, xen_pif pif, char *mac)
   12.54  {
   12.55      abstract_value param_values[] =
   12.56          {
   12.57              { .type = &abstract_type_string,
   12.58 -              .u.string_val = xen_pif },
   12.59 +              .u.string_val = pif },
   12.60              { .type = &abstract_type_string,
   12.61                .u.string_val = mac }
   12.62          };
   12.63 @@ -350,12 +350,12 @@ xen_pif_set_mac(xen_session *session, xe
   12.64  
   12.65  
   12.66  bool
   12.67 -xen_pif_set_mtu(xen_session *session, xen_pif xen_pif, int64_t mtu)
   12.68 +xen_pif_set_mtu(xen_session *session, xen_pif pif, int64_t mtu)
   12.69  {
   12.70      abstract_value param_values[] =
   12.71          {
   12.72              { .type = &abstract_type_string,
   12.73 -              .u.string_val = xen_pif },
   12.74 +              .u.string_val = pif },
   12.75              { .type = &abstract_type_int,
   12.76                .u.int_val = mtu }
   12.77          };
   12.78 @@ -366,12 +366,12 @@ xen_pif_set_mtu(xen_session *session, xe
   12.79  
   12.80  
   12.81  bool
   12.82 -xen_pif_set_vlan(xen_session *session, xen_pif xen_pif, char *vlan)
   12.83 +xen_pif_set_vlan(xen_session *session, xen_pif pif, char *vlan)
   12.84  {
   12.85      abstract_value param_values[] =
   12.86          {
   12.87              { .type = &abstract_type_string,
   12.88 -              .u.string_val = xen_pif },
   12.89 +              .u.string_val = pif },
   12.90              { .type = &abstract_type_string,
   12.91                .u.string_val = vlan }
   12.92          };
    13.1 --- a/tools/libxen/src/xen_sr.c	Thu Nov 09 18:14:53 2006 +0000
    13.2 +++ b/tools/libxen/src/xen_sr.c	Thu Nov 09 11:02:48 2006 +0000
    13.3 @@ -302,12 +302,12 @@ xen_sr_get_location(xen_session *session
    13.4  
    13.5  
    13.6  bool
    13.7 -xen_sr_set_name_label(xen_session *session, xen_sr xen_sr, char *label)
    13.8 +xen_sr_set_name_label(xen_session *session, xen_sr sr, char *label)
    13.9  {
   13.10      abstract_value param_values[] =
   13.11          {
   13.12              { .type = &abstract_type_string,
   13.13 -              .u.string_val = xen_sr },
   13.14 +              .u.string_val = sr },
   13.15              { .type = &abstract_type_string,
   13.16                .u.string_val = label }
   13.17          };
   13.18 @@ -318,12 +318,12 @@ xen_sr_set_name_label(xen_session *sessi
   13.19  
   13.20  
   13.21  bool
   13.22 -xen_sr_set_name_description(xen_session *session, xen_sr xen_sr, char *description)
   13.23 +xen_sr_set_name_description(xen_session *session, xen_sr sr, char *description)
   13.24  {
   13.25      abstract_value param_values[] =
   13.26          {
   13.27              { .type = &abstract_type_string,
   13.28 -              .u.string_val = xen_sr },
   13.29 +              .u.string_val = sr },
   13.30              { .type = &abstract_type_string,
   13.31                .u.string_val = description }
   13.32          };
    14.1 --- a/tools/libxen/src/xen_user.c	Thu Nov 09 18:14:53 2006 +0000
    14.2 +++ b/tools/libxen/src/xen_user.c	Thu Nov 09 11:02:48 2006 +0000
    14.3 @@ -164,12 +164,12 @@ xen_user_get_fullname(xen_session *sessi
    14.4  
    14.5  
    14.6  bool
    14.7 -xen_user_set_fullname(xen_session *session, xen_user xen_user, char *fullname)
    14.8 +xen_user_set_fullname(xen_session *session, xen_user user, char *fullname)
    14.9  {
   14.10      abstract_value param_values[] =
   14.11          {
   14.12              { .type = &abstract_type_string,
   14.13 -              .u.string_val = xen_user },
   14.14 +              .u.string_val = user },
   14.15              { .type = &abstract_type_string,
   14.16                .u.string_val = fullname }
   14.17          };
    15.1 --- a/tools/libxen/src/xen_vbd.c	Thu Nov 09 18:14:53 2006 +0000
    15.2 +++ b/tools/libxen/src/xen_vbd.c	Thu Nov 09 11:02:48 2006 +0000
    15.3 @@ -270,12 +270,12 @@ xen_vbd_get_io_write_kbs(xen_session *se
    15.4  
    15.5  
    15.6  bool
    15.7 -xen_vbd_set_vm(xen_session *session, xen_vbd xen_vbd, xen_vm vm)
    15.8 +xen_vbd_set_vm(xen_session *session, xen_vbd vbd, xen_vm vm)
    15.9  {
   15.10      abstract_value param_values[] =
   15.11          {
   15.12              { .type = &abstract_type_string,
   15.13 -              .u.string_val = xen_vbd },
   15.14 +              .u.string_val = vbd },
   15.15              { .type = &abstract_type_string,
   15.16                .u.string_val = vm }
   15.17          };
   15.18 @@ -286,12 +286,12 @@ xen_vbd_set_vm(xen_session *session, xen
   15.19  
   15.20  
   15.21  bool
   15.22 -xen_vbd_set_vdi(xen_session *session, xen_vbd xen_vbd, xen_vdi vdi)
   15.23 +xen_vbd_set_vdi(xen_session *session, xen_vbd vbd, xen_vdi vdi)
   15.24  {
   15.25      abstract_value param_values[] =
   15.26          {
   15.27              { .type = &abstract_type_string,
   15.28 -              .u.string_val = xen_vbd },
   15.29 +              .u.string_val = vbd },
   15.30              { .type = &abstract_type_string,
   15.31                .u.string_val = vdi }
   15.32          };
   15.33 @@ -302,12 +302,12 @@ xen_vbd_set_vdi(xen_session *session, xe
   15.34  
   15.35  
   15.36  bool
   15.37 -xen_vbd_set_device(xen_session *session, xen_vbd xen_vbd, char *device)
   15.38 +xen_vbd_set_device(xen_session *session, xen_vbd vbd, char *device)
   15.39  {
   15.40      abstract_value param_values[] =
   15.41          {
   15.42              { .type = &abstract_type_string,
   15.43 -              .u.string_val = xen_vbd },
   15.44 +              .u.string_val = vbd },
   15.45              { .type = &abstract_type_string,
   15.46                .u.string_val = device }
   15.47          };
   15.48 @@ -318,12 +318,12 @@ xen_vbd_set_device(xen_session *session,
   15.49  
   15.50  
   15.51  bool
   15.52 -xen_vbd_set_mode(xen_session *session, xen_vbd xen_vbd, enum xen_vbd_mode mode)
   15.53 +xen_vbd_set_mode(xen_session *session, xen_vbd vbd, enum xen_vbd_mode mode)
   15.54  {
   15.55      abstract_value param_values[] =
   15.56          {
   15.57              { .type = &abstract_type_string,
   15.58 -              .u.string_val = xen_vbd },
   15.59 +              .u.string_val = vbd },
   15.60              { .type = &xen_vbd_mode_abstract_type_,
   15.61                .u.string_val = xen_vbd_mode_to_string(mode) }
   15.62          };
   15.63 @@ -334,12 +334,12 @@ xen_vbd_set_mode(xen_session *session, x
   15.64  
   15.65  
   15.66  bool
   15.67 -xen_vbd_set_driver(xen_session *session, xen_vbd xen_vbd, enum xen_driver_type driver)
   15.68 +xen_vbd_set_driver(xen_session *session, xen_vbd vbd, enum xen_driver_type driver)
   15.69  {
   15.70      abstract_value param_values[] =
   15.71          {
   15.72              { .type = &abstract_type_string,
   15.73 -              .u.string_val = xen_vbd },
   15.74 +              .u.string_val = vbd },
   15.75              { .type = &xen_driver_type_abstract_type_,
   15.76                .u.string_val = xen_driver_type_to_string(driver) }
   15.77          };
    16.1 --- a/tools/libxen/src/xen_vdi.c	Thu Nov 09 18:14:53 2006 +0000
    16.2 +++ b/tools/libxen/src/xen_vdi.c	Thu Nov 09 11:02:48 2006 +0000
    16.3 @@ -383,12 +383,12 @@ xen_vdi_get_read_only(xen_session *sessi
    16.4  
    16.5  
    16.6  bool
    16.7 -xen_vdi_set_name_label(xen_session *session, xen_vdi xen_vdi, char *label)
    16.8 +xen_vdi_set_name_label(xen_session *session, xen_vdi vdi, char *label)
    16.9  {
   16.10      abstract_value param_values[] =
   16.11          {
   16.12              { .type = &abstract_type_string,
   16.13 -              .u.string_val = xen_vdi },
   16.14 +              .u.string_val = vdi },
   16.15              { .type = &abstract_type_string,
   16.16                .u.string_val = label }
   16.17          };
   16.18 @@ -399,12 +399,12 @@ xen_vdi_set_name_label(xen_session *sess
   16.19  
   16.20  
   16.21  bool
   16.22 -xen_vdi_set_name_description(xen_session *session, xen_vdi xen_vdi, char *description)
   16.23 +xen_vdi_set_name_description(xen_session *session, xen_vdi vdi, char *description)
   16.24  {
   16.25      abstract_value param_values[] =
   16.26          {
   16.27              { .type = &abstract_type_string,
   16.28 -              .u.string_val = xen_vdi },
   16.29 +              .u.string_val = vdi },
   16.30              { .type = &abstract_type_string,
   16.31                .u.string_val = description }
   16.32          };
   16.33 @@ -415,12 +415,12 @@ xen_vdi_set_name_description(xen_session
   16.34  
   16.35  
   16.36  bool
   16.37 -xen_vdi_set_sr(xen_session *session, xen_vdi xen_vdi, xen_sr sr)
   16.38 +xen_vdi_set_sr(xen_session *session, xen_vdi vdi, xen_sr sr)
   16.39  {
   16.40      abstract_value param_values[] =
   16.41          {
   16.42              { .type = &abstract_type_string,
   16.43 -              .u.string_val = xen_vdi },
   16.44 +              .u.string_val = vdi },
   16.45              { .type = &abstract_type_string,
   16.46                .u.string_val = sr }
   16.47          };
   16.48 @@ -431,12 +431,12 @@ xen_vdi_set_sr(xen_session *session, xen
   16.49  
   16.50  
   16.51  bool
   16.52 -xen_vdi_set_virtual_size(xen_session *session, xen_vdi xen_vdi, int64_t virtual_size)
   16.53 +xen_vdi_set_virtual_size(xen_session *session, xen_vdi vdi, int64_t virtual_size)
   16.54  {
   16.55      abstract_value param_values[] =
   16.56          {
   16.57              { .type = &abstract_type_string,
   16.58 -              .u.string_val = xen_vdi },
   16.59 +              .u.string_val = vdi },
   16.60              { .type = &abstract_type_int,
   16.61                .u.int_val = virtual_size }
   16.62          };
   16.63 @@ -447,12 +447,12 @@ xen_vdi_set_virtual_size(xen_session *se
   16.64  
   16.65  
   16.66  bool
   16.67 -xen_vdi_set_sharable(xen_session *session, xen_vdi xen_vdi, bool sharable)
   16.68 +xen_vdi_set_sharable(xen_session *session, xen_vdi vdi, bool sharable)
   16.69  {
   16.70      abstract_value param_values[] =
   16.71          {
   16.72              { .type = &abstract_type_string,
   16.73 -              .u.string_val = xen_vdi },
   16.74 +              .u.string_val = vdi },
   16.75              { .type = &abstract_type_bool,
   16.76                .u.bool_val = sharable }
   16.77          };
   16.78 @@ -463,12 +463,12 @@ xen_vdi_set_sharable(xen_session *sessio
   16.79  
   16.80  
   16.81  bool
   16.82 -xen_vdi_set_read_only(xen_session *session, xen_vdi xen_vdi, bool read_only)
   16.83 +xen_vdi_set_read_only(xen_session *session, xen_vdi vdi, bool read_only)
   16.84  {
   16.85      abstract_value param_values[] =
   16.86          {
   16.87              { .type = &abstract_type_string,
   16.88 -              .u.string_val = xen_vdi },
   16.89 +              .u.string_val = vdi },
   16.90              { .type = &abstract_type_bool,
   16.91                .u.bool_val = read_only }
   16.92          };
    17.1 --- a/tools/libxen/src/xen_vif.c	Thu Nov 09 18:14:53 2006 +0000
    17.2 +++ b/tools/libxen/src/xen_vif.c	Thu Nov 09 11:02:48 2006 +0000
    17.3 @@ -307,12 +307,12 @@ xen_vif_get_io_write_kbs(xen_session *se
    17.4  
    17.5  
    17.6  bool
    17.7 -xen_vif_set_name(xen_session *session, xen_vif xen_vif, char *name)
    17.8 +xen_vif_set_name(xen_session *session, xen_vif vif, char *name)
    17.9  {
   17.10      abstract_value param_values[] =
   17.11          {
   17.12              { .type = &abstract_type_string,
   17.13 -              .u.string_val = xen_vif },
   17.14 +              .u.string_val = vif },
   17.15              { .type = &abstract_type_string,
   17.16                .u.string_val = name }
   17.17          };
   17.18 @@ -323,12 +323,12 @@ xen_vif_set_name(xen_session *session, x
   17.19  
   17.20  
   17.21  bool
   17.22 -xen_vif_set_type(xen_session *session, xen_vif xen_vif, enum xen_driver_type type)
   17.23 +xen_vif_set_type(xen_session *session, xen_vif vif, enum xen_driver_type type)
   17.24  {
   17.25      abstract_value param_values[] =
   17.26          {
   17.27              { .type = &abstract_type_string,
   17.28 -              .u.string_val = xen_vif },
   17.29 +              .u.string_val = vif },
   17.30              { .type = &xen_driver_type_abstract_type_,
   17.31                .u.string_val = xen_driver_type_to_string(type) }
   17.32          };
   17.33 @@ -339,12 +339,12 @@ xen_vif_set_type(xen_session *session, x
   17.34  
   17.35  
   17.36  bool
   17.37 -xen_vif_set_device(xen_session *session, xen_vif xen_vif, char *device)
   17.38 +xen_vif_set_device(xen_session *session, xen_vif vif, char *device)
   17.39  {
   17.40      abstract_value param_values[] =
   17.41          {
   17.42              { .type = &abstract_type_string,
   17.43 -              .u.string_val = xen_vif },
   17.44 +              .u.string_val = vif },
   17.45              { .type = &abstract_type_string,
   17.46                .u.string_val = device }
   17.47          };
   17.48 @@ -355,12 +355,12 @@ xen_vif_set_device(xen_session *session,
   17.49  
   17.50  
   17.51  bool
   17.52 -xen_vif_set_network(xen_session *session, xen_vif xen_vif, xen_network network)
   17.53 +xen_vif_set_network(xen_session *session, xen_vif vif, xen_network network)
   17.54  {
   17.55      abstract_value param_values[] =
   17.56          {
   17.57              { .type = &abstract_type_string,
   17.58 -              .u.string_val = xen_vif },
   17.59 +              .u.string_val = vif },
   17.60              { .type = &abstract_type_string,
   17.61                .u.string_val = network }
   17.62          };
   17.63 @@ -371,12 +371,12 @@ xen_vif_set_network(xen_session *session
   17.64  
   17.65  
   17.66  bool
   17.67 -xen_vif_set_vm(xen_session *session, xen_vif xen_vif, xen_vm vm)
   17.68 +xen_vif_set_vm(xen_session *session, xen_vif vif, xen_vm vm)
   17.69  {
   17.70      abstract_value param_values[] =
   17.71          {
   17.72              { .type = &abstract_type_string,
   17.73 -              .u.string_val = xen_vif },
   17.74 +              .u.string_val = vif },
   17.75              { .type = &abstract_type_string,
   17.76                .u.string_val = vm }
   17.77          };
   17.78 @@ -387,12 +387,12 @@ xen_vif_set_vm(xen_session *session, xen
   17.79  
   17.80  
   17.81  bool
   17.82 -xen_vif_set_mac(xen_session *session, xen_vif xen_vif, char *mac)
   17.83 +xen_vif_set_mac(xen_session *session, xen_vif vif, char *mac)
   17.84  {
   17.85      abstract_value param_values[] =
   17.86          {
   17.87              { .type = &abstract_type_string,
   17.88 -              .u.string_val = xen_vif },
   17.89 +              .u.string_val = vif },
   17.90              { .type = &abstract_type_string,
   17.91                .u.string_val = mac }
   17.92          };
   17.93 @@ -403,12 +403,12 @@ xen_vif_set_mac(xen_session *session, xe
   17.94  
   17.95  
   17.96  bool
   17.97 -xen_vif_set_mtu(xen_session *session, xen_vif xen_vif, int64_t mtu)
   17.98 +xen_vif_set_mtu(xen_session *session, xen_vif vif, int64_t mtu)
   17.99  {
  17.100      abstract_value param_values[] =
  17.101          {
  17.102              { .type = &abstract_type_string,
  17.103 -              .u.string_val = xen_vif },
  17.104 +              .u.string_val = vif },
  17.105              { .type = &abstract_type_int,
  17.106                .u.int_val = mtu }
  17.107          };
    18.1 --- a/tools/libxen/src/xen_vm.c	Thu Nov 09 18:14:53 2006 +0000
    18.2 +++ b/tools/libxen/src/xen_vm.c	Thu Nov 09 11:02:48 2006 +0000
    18.3 @@ -982,12 +982,12 @@ xen_vm_get_otherconfig(xen_session *sess
    18.4  
    18.5  
    18.6  bool
    18.7 -xen_vm_set_name_label(xen_session *session, xen_vm xen_vm, char *label)
    18.8 +xen_vm_set_name_label(xen_session *session, xen_vm vm, char *label)
    18.9  {
   18.10      abstract_value param_values[] =
   18.11          {
   18.12              { .type = &abstract_type_string,
   18.13 -              .u.string_val = xen_vm },
   18.14 +              .u.string_val = vm },
   18.15              { .type = &abstract_type_string,
   18.16                .u.string_val = label }
   18.17          };
   18.18 @@ -998,12 +998,12 @@ xen_vm_set_name_label(xen_session *sessi
   18.19  
   18.20  
   18.21  bool
   18.22 -xen_vm_set_name_description(xen_session *session, xen_vm xen_vm, char *description)
   18.23 +xen_vm_set_name_description(xen_session *session, xen_vm vm, char *description)
   18.24  {
   18.25      abstract_value param_values[] =
   18.26          {
   18.27              { .type = &abstract_type_string,
   18.28 -              .u.string_val = xen_vm },
   18.29 +              .u.string_val = vm },
   18.30              { .type = &abstract_type_string,
   18.31                .u.string_val = description }
   18.32          };
   18.33 @@ -1014,12 +1014,12 @@ xen_vm_set_name_description(xen_session 
   18.34  
   18.35  
   18.36  bool
   18.37 -xen_vm_set_user_version(xen_session *session, xen_vm xen_vm, int64_t user_version)
   18.38 +xen_vm_set_user_version(xen_session *session, xen_vm vm, int64_t user_version)
   18.39  {
   18.40      abstract_value param_values[] =
   18.41          {
   18.42              { .type = &abstract_type_string,
   18.43 -              .u.string_val = xen_vm },
   18.44 +              .u.string_val = vm },
   18.45              { .type = &abstract_type_int,
   18.46                .u.int_val = user_version }
   18.47          };
   18.48 @@ -1030,12 +1030,12 @@ xen_vm_set_user_version(xen_session *ses
   18.49  
   18.50  
   18.51  bool
   18.52 -xen_vm_set_is_a_template(xen_session *session, xen_vm xen_vm, bool is_a_template)
   18.53 +xen_vm_set_is_a_template(xen_session *session, xen_vm vm, bool is_a_template)
   18.54  {
   18.55      abstract_value param_values[] =
   18.56          {
   18.57              { .type = &abstract_type_string,
   18.58 -              .u.string_val = xen_vm },
   18.59 +              .u.string_val = vm },
   18.60              { .type = &abstract_type_bool,
   18.61                .u.bool_val = is_a_template }
   18.62          };
   18.63 @@ -1046,12 +1046,12 @@ xen_vm_set_is_a_template(xen_session *se
   18.64  
   18.65  
   18.66  bool
   18.67 -xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm xen_vm, int64_t dynamic_max)
   18.68 +xen_vm_set_memory_dynamic_max(xen_session *session, xen_vm vm, int64_t dynamic_max)
   18.69  {
   18.70      abstract_value param_values[] =
   18.71          {
   18.72              { .type = &abstract_type_string,
   18.73 -              .u.string_val = xen_vm },
   18.74 +              .u.string_val = vm },
   18.75              { .type = &abstract_type_int,
   18.76                .u.int_val = dynamic_max }
   18.77          };
   18.78 @@ -1062,12 +1062,12 @@ xen_vm_set_memory_dynamic_max(xen_sessio
   18.79  
   18.80  
   18.81  bool
   18.82 -xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm xen_vm, int64_t dynamic_min)
   18.83 +xen_vm_set_memory_dynamic_min(xen_session *session, xen_vm vm, int64_t dynamic_min)
   18.84  {
   18.85      abstract_value param_values[] =
   18.86          {
   18.87              { .type = &abstract_type_string,
   18.88 -              .u.string_val = xen_vm },
   18.89 +              .u.string_val = vm },
   18.90              { .type = &abstract_type_int,
   18.91                .u.int_val = dynamic_min }
   18.92          };
   18.93 @@ -1078,12 +1078,12 @@ xen_vm_set_memory_dynamic_min(xen_sessio
   18.94  
   18.95  
   18.96  bool
   18.97 -xen_vm_set_vcpus_policy(xen_session *session, xen_vm xen_vm, char *policy)
   18.98 +xen_vm_set_vcpus_policy(xen_session *session, xen_vm vm, char *policy)
   18.99  {
  18.100      abstract_value param_values[] =
  18.101          {
  18.102              { .type = &abstract_type_string,
  18.103 -              .u.string_val = xen_vm },
  18.104 +              .u.string_val = vm },
  18.105              { .type = &abstract_type_string,
  18.106                .u.string_val = policy }
  18.107          };
  18.108 @@ -1094,12 +1094,12 @@ xen_vm_set_vcpus_policy(xen_session *ses
  18.109  
  18.110  
  18.111  bool
  18.112 -xen_vm_set_vcpus_params(xen_session *session, xen_vm xen_vm, char *params)
  18.113 +xen_vm_set_vcpus_params(xen_session *session, xen_vm vm, char *params)
  18.114  {
  18.115      abstract_value param_values[] =
  18.116          {
  18.117              { .type = &abstract_type_string,
  18.118 -              .u.string_val = xen_vm },
  18.119 +              .u.string_val = vm },
  18.120              { .type = &abstract_type_string,
  18.121                .u.string_val = params }
  18.122          };
  18.123 @@ -1110,12 +1110,12 @@ xen_vm_set_vcpus_params(xen_session *ses
  18.124  
  18.125  
  18.126  bool
  18.127 -xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_on)
  18.128 +xen_vm_set_vcpus_features_force_on(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_on)
  18.129  {
  18.130      abstract_value param_values[] =
  18.131          {
  18.132              { .type = &abstract_type_string,
  18.133 -              .u.string_val = xen_vm },
  18.134 +              .u.string_val = vm },
  18.135              { .type = &xen_cpu_feature_set_abstract_type_,
  18.136                .u.set_val = (arbitrary_set *)force_on }
  18.137          };
  18.138 @@ -1126,12 +1126,12 @@ xen_vm_set_vcpus_features_force_on(xen_s
  18.139  
  18.140  
  18.141  bool
  18.142 -xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm xen_vm, struct xen_cpu_feature_set *force_off)
  18.143 +xen_vm_set_vcpus_features_force_off(xen_session *session, xen_vm vm, struct xen_cpu_feature_set *force_off)
  18.144  {
  18.145      abstract_value param_values[] =
  18.146          {
  18.147              { .type = &abstract_type_string,
  18.148 -              .u.string_val = xen_vm },
  18.149 +              .u.string_val = vm },
  18.150              { .type = &xen_cpu_feature_set_abstract_type_,
  18.151                .u.set_val = (arbitrary_set *)force_off }
  18.152          };
  18.153 @@ -1142,12 +1142,12 @@ xen_vm_set_vcpus_features_force_off(xen_
  18.154  
  18.155  
  18.156  bool
  18.157 -xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_shutdown)
  18.158 +xen_vm_set_actions_after_shutdown(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_shutdown)
  18.159  {
  18.160      abstract_value param_values[] =
  18.161          {
  18.162              { .type = &abstract_type_string,
  18.163 -              .u.string_val = xen_vm },
  18.164 +              .u.string_val = vm },
  18.165              { .type = &xen_on_normal_exit_abstract_type_,
  18.166                .u.string_val = xen_on_normal_exit_to_string(after_shutdown) }
  18.167          };
  18.168 @@ -1158,12 +1158,12 @@ xen_vm_set_actions_after_shutdown(xen_se
  18.169  
  18.170  
  18.171  bool
  18.172 -xen_vm_set_actions_after_reboot(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_reboot)
  18.173 +xen_vm_set_actions_after_reboot(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_reboot)
  18.174  {
  18.175      abstract_value param_values[] =
  18.176          {
  18.177              { .type = &abstract_type_string,
  18.178 -              .u.string_val = xen_vm },
  18.179 +              .u.string_val = vm },
  18.180              { .type = &xen_on_normal_exit_abstract_type_,
  18.181                .u.string_val = xen_on_normal_exit_to_string(after_reboot) }
  18.182          };
  18.183 @@ -1174,12 +1174,12 @@ xen_vm_set_actions_after_reboot(xen_sess
  18.184  
  18.185  
  18.186  bool
  18.187 -xen_vm_set_actions_after_suspend(xen_session *session, xen_vm xen_vm, enum xen_on_normal_exit after_suspend)
  18.188 +xen_vm_set_actions_after_suspend(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_suspend)
  18.189  {
  18.190      abstract_value param_values[] =
  18.191          {
  18.192              { .type = &abstract_type_string,
  18.193 -              .u.string_val = xen_vm },
  18.194 +              .u.string_val = vm },
  18.195              { .type = &xen_on_normal_exit_abstract_type_,
  18.196                .u.string_val = xen_on_normal_exit_to_string(after_suspend) }
  18.197          };
  18.198 @@ -1190,12 +1190,12 @@ xen_vm_set_actions_after_suspend(xen_ses
  18.199  
  18.200  
  18.201  bool
  18.202 -xen_vm_set_actions_after_crash(xen_session *session, xen_vm xen_vm, enum xen_on_crash_behaviour after_crash)
  18.203 +xen_vm_set_actions_after_crash(xen_session *session, xen_vm vm, enum xen_on_crash_behaviour after_crash)
  18.204  {
  18.205      abstract_value param_values[] =
  18.206          {
  18.207              { .type = &abstract_type_string,
  18.208 -              .u.string_val = xen_vm },
  18.209 +              .u.string_val = vm },
  18.210              { .type = &xen_on_crash_behaviour_abstract_type_,
  18.211                .u.string_val = xen_on_crash_behaviour_to_string(after_crash) }
  18.212          };
  18.213 @@ -1206,12 +1206,12 @@ xen_vm_set_actions_after_crash(xen_sessi
  18.214  
  18.215  
  18.216  bool
  18.217 -xen_vm_set_bios_boot(xen_session *session, xen_vm xen_vm, char *boot)
  18.218 +xen_vm_set_bios_boot(xen_session *session, xen_vm vm, char *boot)
  18.219  {
  18.220      abstract_value param_values[] =
  18.221          {
  18.222              { .type = &abstract_type_string,
  18.223 -              .u.string_val = xen_vm },
  18.224 +              .u.string_val = vm },
  18.225              { .type = &abstract_type_string,
  18.226                .u.string_val = boot }
  18.227          };
  18.228 @@ -1222,12 +1222,12 @@ xen_vm_set_bios_boot(xen_session *sessio
  18.229  
  18.230  
  18.231  bool
  18.232 -xen_vm_set_platform_std_vga(xen_session *session, xen_vm xen_vm, bool std_vga)
  18.233 +xen_vm_set_platform_std_vga(xen_session *session, xen_vm vm, bool std_vga)
  18.234  {
  18.235      abstract_value param_values[] =
  18.236          {
  18.237              { .type = &abstract_type_string,
  18.238 -              .u.string_val = xen_vm },
  18.239 +              .u.string_val = vm },
  18.240              { .type = &abstract_type_bool,
  18.241                .u.bool_val = std_vga }
  18.242          };
  18.243 @@ -1238,12 +1238,12 @@ xen_vm_set_platform_std_vga(xen_session 
  18.244  
  18.245  
  18.246  bool
  18.247 -xen_vm_set_platform_serial(xen_session *session, xen_vm xen_vm, char *serial)
  18.248 +xen_vm_set_platform_serial(xen_session *session, xen_vm vm, char *serial)
  18.249  {
  18.250      abstract_value param_values[] =
  18.251          {
  18.252              { .type = &abstract_type_string,
  18.253 -              .u.string_val = xen_vm },
  18.254 +              .u.string_val = vm },
  18.255              { .type = &abstract_type_string,
  18.256                .u.string_val = serial }
  18.257          };
  18.258 @@ -1254,12 +1254,12 @@ xen_vm_set_platform_serial(xen_session *
  18.259  
  18.260  
  18.261  bool
  18.262 -xen_vm_set_platform_localtime(xen_session *session, xen_vm xen_vm, bool localtime)
  18.263 +xen_vm_set_platform_localtime(xen_session *session, xen_vm vm, bool localtime)
  18.264  {
  18.265      abstract_value param_values[] =
  18.266          {
  18.267              { .type = &abstract_type_string,
  18.268 -              .u.string_val = xen_vm },
  18.269 +              .u.string_val = vm },
  18.270              { .type = &abstract_type_bool,
  18.271                .u.bool_val = localtime }
  18.272          };
  18.273 @@ -1270,12 +1270,12 @@ xen_vm_set_platform_localtime(xen_sessio
  18.274  
  18.275  
  18.276  bool
  18.277 -xen_vm_set_platform_clock_offset(xen_session *session, xen_vm xen_vm, bool clock_offset)
  18.278 +xen_vm_set_platform_clock_offset(xen_session *session, xen_vm vm, bool clock_offset)
  18.279  {
  18.280      abstract_value param_values[] =
  18.281          {
  18.282              { .type = &abstract_type_string,
  18.283 -              .u.string_val = xen_vm },
  18.284 +              .u.string_val = vm },
  18.285              { .type = &abstract_type_bool,
  18.286                .u.bool_val = clock_offset }
  18.287          };
  18.288 @@ -1286,12 +1286,12 @@ xen_vm_set_platform_clock_offset(xen_ses
  18.289  
  18.290  
  18.291  bool
  18.292 -xen_vm_set_platform_enable_audio(xen_session *session, xen_vm xen_vm, bool enable_audio)
  18.293 +xen_vm_set_platform_enable_audio(xen_session *session, xen_vm vm, bool enable_audio)
  18.294  {
  18.295      abstract_value param_values[] =
  18.296          {
  18.297              { .type = &abstract_type_string,
  18.298 -              .u.string_val = xen_vm },
  18.299 +              .u.string_val = vm },
  18.300              { .type = &abstract_type_bool,
  18.301                .u.bool_val = enable_audio }
  18.302          };
  18.303 @@ -1302,12 +1302,12 @@ xen_vm_set_platform_enable_audio(xen_ses
  18.304  
  18.305  
  18.306  bool
  18.307 -xen_vm_set_builder(xen_session *session, xen_vm xen_vm, char *builder)
  18.308 +xen_vm_set_builder(xen_session *session, xen_vm vm, char *builder)
  18.309  {
  18.310      abstract_value param_values[] =
  18.311          {
  18.312              { .type = &abstract_type_string,
  18.313 -              .u.string_val = xen_vm },
  18.314 +              .u.string_val = vm },
  18.315              { .type = &abstract_type_string,
  18.316                .u.string_val = builder }
  18.317          };
  18.318 @@ -1318,12 +1318,12 @@ xen_vm_set_builder(xen_session *session,
  18.319  
  18.320  
  18.321  bool
  18.322 -xen_vm_set_boot_method(xen_session *session, xen_vm xen_vm, enum xen_boot_type boot_method)
  18.323 +xen_vm_set_boot_method(xen_session *session, xen_vm vm, enum xen_boot_type boot_method)
  18.324  {
  18.325      abstract_value param_values[] =
  18.326          {
  18.327              { .type = &abstract_type_string,
  18.328 -              .u.string_val = xen_vm },
  18.329 +              .u.string_val = vm },
  18.330              { .type = &xen_boot_type_abstract_type_,
  18.331                .u.string_val = xen_boot_type_to_string(boot_method) }
  18.332          };
  18.333 @@ -1334,12 +1334,12 @@ xen_vm_set_boot_method(xen_session *sess
  18.334  
  18.335  
  18.336  bool
  18.337 -xen_vm_set_kernel_kernel(xen_session *session, xen_vm xen_vm, char *kernel)
  18.338 +xen_vm_set_kernel_kernel(xen_session *session, xen_vm vm, char *kernel)
  18.339  {
  18.340      abstract_value param_values[] =
  18.341          {
  18.342              { .type = &abstract_type_string,
  18.343 -              .u.string_val = xen_vm },
  18.344 +              .u.string_val = vm },
  18.345              { .type = &abstract_type_string,
  18.346                .u.string_val = kernel }
  18.347          };
  18.348 @@ -1350,12 +1350,12 @@ xen_vm_set_kernel_kernel(xen_session *se
  18.349  
  18.350  
  18.351  bool
  18.352 -xen_vm_set_kernel_initrd(xen_session *session, xen_vm xen_vm, char *initrd)
  18.353 +xen_vm_set_kernel_initrd(xen_session *session, xen_vm vm, char *initrd)
  18.354  {
  18.355      abstract_value param_values[] =
  18.356          {
  18.357              { .type = &abstract_type_string,
  18.358 -              .u.string_val = xen_vm },
  18.359 +              .u.string_val = vm },
  18.360              { .type = &abstract_type_string,
  18.361                .u.string_val = initrd }
  18.362          };
  18.363 @@ -1366,12 +1366,12 @@ xen_vm_set_kernel_initrd(xen_session *se
  18.364  
  18.365  
  18.366  bool
  18.367 -xen_vm_set_kernel_args(xen_session *session, xen_vm xen_vm, char *args)
  18.368 +xen_vm_set_kernel_args(xen_session *session, xen_vm vm, char *args)
  18.369  {
  18.370      abstract_value param_values[] =
  18.371          {
  18.372              { .type = &abstract_type_string,
  18.373 -              .u.string_val = xen_vm },
  18.374 +              .u.string_val = vm },
  18.375              { .type = &abstract_type_string,
  18.376                .u.string_val = args }
  18.377          };
  18.378 @@ -1382,12 +1382,12 @@ xen_vm_set_kernel_args(xen_session *sess
  18.379  
  18.380  
  18.381  bool
  18.382 -xen_vm_set_grub_cmdline(xen_session *session, xen_vm xen_vm, char *cmdline)
  18.383 +xen_vm_set_grub_cmdline(xen_session *session, xen_vm vm, char *cmdline)
  18.384  {
  18.385      abstract_value param_values[] =
  18.386          {
  18.387              { .type = &abstract_type_string,
  18.388 -              .u.string_val = xen_vm },
  18.389 +              .u.string_val = vm },
  18.390              { .type = &abstract_type_string,
  18.391                .u.string_val = cmdline }
  18.392          };
  18.393 @@ -1398,12 +1398,12 @@ xen_vm_set_grub_cmdline(xen_session *ses
  18.394  
  18.395  
  18.396  bool
  18.397 -xen_vm_set_otherconfig(xen_session *session, xen_vm xen_vm, xen_string_string_map *otherconfig)
  18.398 +xen_vm_set_otherconfig(xen_session *session, xen_vm vm, xen_string_string_map *otherconfig)
  18.399  {
  18.400      abstract_value param_values[] =
  18.401          {
  18.402              { .type = &abstract_type_string,
  18.403 -              .u.string_val = xen_vm },
  18.404 +              .u.string_val = vm },
  18.405              { .type = &abstract_type_string_string_map,
  18.406                .u.set_val = (arbitrary_set *)otherconfig }
  18.407          };