1.1 --- a/docs/xen-api/xenapi-datamodel.tex	Tue Jan 30 00:10:05 2007 +0000
     1.2 +++ b/docs/xen-api/xenapi-datamodel.tex	Tue Jan 30 00:34:31 2007 +0000
     1.3 @@ -1034,7 +1034,6 @@ Quals & Field & Type & Description \\
     1.4  $\mathit{RO}_\mathit{run}$ &  {\tt VCPUs/utilisation} & (int $\rightarrow$ float) Map & Utilisation for all of guest's current VCPUs \\
     1.5  $\mathit{RW}$ &  {\tt actions/after\_shutdown} & on\_normal\_exit & action to take after the guest has shutdown itself \\
     1.6  $\mathit{RW}$ &  {\tt actions/after\_reboot} & on\_normal\_exit & action to take after the guest has rebooted itself \\
     1.7 -$\mathit{RW}$ &  {\tt actions/after\_suspend} & on\_normal\_exit & action to take after the guest has suspended itself \\
     1.8  $\mathit{RW}$ &  {\tt actions/after\_crash} & on\_crash\_behaviour & action to take if the guest crashes \\
     1.9  $\mathit{RO}_\mathit{run}$ &  {\tt consoles} & (console ref) Set & virtual console devices \\
    1.10  $\mathit{RO}_\mathit{run}$ &  {\tt VIFs} & (VIF ref) Set & virtual network interfaces \\
    1.11 @@ -2458,72 +2457,6 @@ void
    1.12  \vspace{0.3cm}
    1.13  \vspace{0.3cm}
    1.14  \vspace{0.3cm}
    1.15 -\subsubsection{RPC name:~get\_actions\_after\_suspend}
    1.16 -
    1.17 -{\bf Overview:} 
    1.18 -Get the actions/after\_suspend field of the given VM.
    1.19 -
    1.20 - \noindent {\bf Signature:} 
    1.21 -\begin{verbatim} (on_normal_exit) get_actions_after_suspend (session_id s, VM ref self)\end{verbatim}
    1.22 -
    1.23 -
    1.24 -\noindent{\bf Arguments:}
    1.25 -
    1.26 - 
    1.27 -\vspace{0.3cm}
    1.28 -\begin{tabular}{|c|c|p{7cm}|}
    1.29 - \hline
    1.30 -{\bf type} & {\bf name} & {\bf description} \\ \hline
    1.31 -{\tt VM ref } & self & reference to the object \\ \hline 
    1.32 -
    1.33 -\end{tabular}
    1.34 -
    1.35 -\vspace{0.3cm}
    1.36 -
    1.37 - \noindent {\bf Return Type:} 
    1.38 -{\tt 
    1.39 -on\_normal\_exit
    1.40 -}
    1.41 -
    1.42 -
    1.43 -value of the field
    1.44 -\vspace{0.3cm}
    1.45 -\vspace{0.3cm}
    1.46 -\vspace{0.3cm}
    1.47 -\subsubsection{RPC name:~set\_actions\_after\_suspend}
    1.48 -
    1.49 -{\bf Overview:} 
    1.50 -Set the actions/after\_suspend field of the given VM.
    1.51 -
    1.52 - \noindent {\bf Signature:} 
    1.53 -\begin{verbatim} void set_actions_after_suspend (session_id s, VM ref self, on_normal_exit value)\end{verbatim}
    1.54 -
    1.55 -
    1.56 -\noindent{\bf Arguments:}
    1.57 -
    1.58 - 
    1.59 -\vspace{0.3cm}
    1.60 -\begin{tabular}{|c|c|p{7cm}|}
    1.61 - \hline
    1.62 -{\bf type} & {\bf name} & {\bf description} \\ \hline
    1.63 -{\tt VM ref } & self & reference to the object \\ \hline 
    1.64 -
    1.65 -{\tt on\_normal\_exit } & value & New value to set \\ \hline 
    1.66 -
    1.67 -\end{tabular}
    1.68 -
    1.69 -\vspace{0.3cm}
    1.70 -
    1.71 - \noindent {\bf Return Type:} 
    1.72 -{\tt 
    1.73 -void
    1.74 -}
    1.75 -
    1.76 -
    1.77 -
    1.78 -\vspace{0.3cm}
    1.79 -\vspace{0.3cm}
    1.80 -\vspace{0.3cm}
    1.81  \subsubsection{RPC name:~get\_actions\_after\_crash}
    1.82  
    1.83  {\bf Overview:} 

     2.1 --- a/tools/libxen/include/xen_vm.h	Tue Jan 30 00:10:05 2007 +0000
     2.2 +++ b/tools/libxen/include/xen_vm.h	Tue Jan 30 00:34:31 2007 +0000
     2.3 @@ -120,7 +120,6 @@ typedef struct xen_vm_record
     2.4      xen_int_float_map *vcpus_utilisation;
     2.5      enum xen_on_normal_exit actions_after_shutdown;
     2.6      enum xen_on_normal_exit actions_after_reboot;
     2.7 -    enum xen_on_normal_exit actions_after_suspend;
     2.8      enum xen_on_crash_behaviour actions_after_crash;
     2.9      struct xen_console_record_opt_set *consoles;
    2.10      struct xen_vif_record_opt_set *vifs;
    2.11 @@ -392,13 +391,6 @@ xen_vm_get_actions_after_reboot(xen_sess
    2.12  
    2.13  
    2.14  /**
    2.15 - * Get the actions/after_suspend field of the given VM.
    2.16 - */
    2.17 -extern bool
    2.18 -xen_vm_get_actions_after_suspend(xen_session *session, enum xen_on_normal_exit *result, xen_vm vm);
    2.19 -
    2.20 -
    2.21 -/**
    2.22   * Get the actions/after_crash field of the given VM.
    2.23   */
    2.24  extern bool
    2.25 @@ -616,13 +608,6 @@ xen_vm_set_actions_after_reboot(xen_sess
    2.26  
    2.27  
    2.28  /**
    2.29 - * Set the actions/after_suspend field of the given VM.
    2.30 - */
    2.31 -extern bool
    2.32 -xen_vm_set_actions_after_suspend(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_suspend);
    2.33 -
    2.34 -
    2.35 -/**
    2.36   * Set the actions/after_crash field of the given VM.
    2.37   */
    2.38  extern bool

     3.1 --- a/tools/libxen/src/xen_vm.c	Tue Jan 30 00:10:05 2007 +0000
     3.2 +++ b/tools/libxen/src/xen_vm.c	Tue Jan 30 00:34:31 2007 +0000
     3.3 @@ -103,9 +103,6 @@ static const struct_member xen_vm_record
     3.4          { .key = "actions_after_reboot",
     3.5            .type = &xen_on_normal_exit_abstract_type_,
     3.6            .offset = offsetof(xen_vm_record, actions_after_reboot) },
     3.7 -        { .key = "actions_after_suspend",
     3.8 -          .type = &xen_on_normal_exit_abstract_type_,
     3.9 -          .offset = offsetof(xen_vm_record, actions_after_suspend) },
    3.10          { .key = "actions_after_crash",
    3.11            .type = &xen_on_crash_behaviour_abstract_type_,
    3.12            .offset = offsetof(xen_vm_record, actions_after_crash) },
    3.13 @@ -588,21 +585,6 @@ xen_vm_get_actions_after_reboot(xen_sess
    3.14  
    3.15  
    3.16  bool
    3.17 -xen_vm_get_actions_after_suspend(xen_session *session, enum xen_on_normal_exit *result, xen_vm vm)
    3.18 -{
    3.19 -    abstract_value param_values[] =
    3.20 -        {
    3.21 -            { .type = &abstract_type_string,
    3.22 -              .u.string_val = vm }
    3.23 -        };
    3.24 -
    3.25 -    abstract_type result_type = xen_on_normal_exit_abstract_type_;
    3.26 -    XEN_CALL_("VM.get_actions_after_suspend");
    3.27 -    return session->ok;
    3.28 -}
    3.29 -
    3.30 -
    3.31 -bool
    3.32  xen_vm_get_actions_after_crash(xen_session *session, enum xen_on_crash_behaviour *result, xen_vm vm)
    3.33  {
    3.34      abstract_value param_values[] =
    3.35 @@ -1112,22 +1094,6 @@ xen_vm_set_actions_after_reboot(xen_sess
    3.36  
    3.37  
    3.38  bool
    3.39 -xen_vm_set_actions_after_suspend(xen_session *session, xen_vm vm, enum xen_on_normal_exit after_suspend)
    3.40 -{
    3.41 -    abstract_value param_values[] =
    3.42 -        {
    3.43 -            { .type = &abstract_type_string,
    3.44 -              .u.string_val = vm },
    3.45 -            { .type = &xen_on_normal_exit_abstract_type_,
    3.46 -              .u.string_val = xen_on_normal_exit_to_string(after_suspend) }
    3.47 -        };
    3.48 -
    3.49 -    xen_call_(session, "VM.set_actions_after_suspend", param_values, 2, NULL, NULL);
    3.50 -    return session->ok;
    3.51 -}
    3.52 -
    3.53 -
    3.54 -bool
    3.55  xen_vm_set_actions_after_crash(xen_session *session, xen_vm vm, enum xen_on_crash_behaviour after_crash)
    3.56  {
    3.57      abstract_value param_values[] =

     4.1 --- a/tools/libxen/test/test_bindings.c	Tue Jan 30 00:10:05 2007 +0000
     4.2 +++ b/tools/libxen/test/test_bindings.c	Tue Jan 30 00:34:31 2007 +0000
     4.3 @@ -277,13 +277,6 @@ int main(int argc, char **argv)
     4.4   */
     4.5  static xen_vm create_new_vm(xen_session *session)
     4.6  {
     4.7 -    xen_cpu_feature_set *empty_cpu_feature_set =
     4.8 -        xen_cpu_feature_set_alloc(0);
     4.9 -
    4.10 -    xen_cpu_feature_set *force_off_cpu_feature_set =
    4.11 -        xen_cpu_feature_set_alloc(1);
    4.12 -    force_off_cpu_feature_set->contents[0] = XEN_CPU_FEATURE_MMX;
    4.13 -
    4.14      xen_vm_record vm_record =
    4.15          {
    4.16              .name_label = "NewVM",
    4.17 @@ -297,13 +290,8 @@ static xen_vm create_new_vm(xen_session 
    4.18              .vcpus_policy = "credit",
    4.19              .vcpus_params = "",
    4.20              .vcpus_number = 2,
    4.21 -            .vcpus_features_required = empty_cpu_feature_set,
    4.22 -            .vcpus_features_can_use = empty_cpu_feature_set,
    4.23 -            .vcpus_features_force_on = empty_cpu_feature_set,
    4.24 -            .vcpus_features_force_off = force_off_cpu_feature_set,
    4.25              .actions_after_shutdown = XEN_ON_NORMAL_EXIT_DESTROY,
    4.26              .actions_after_reboot = XEN_ON_NORMAL_EXIT_RESTART,
    4.27 -            .actions_after_suspend = XEN_ON_NORMAL_EXIT_DESTROY,
    4.28              .actions_after_crash = XEN_ON_CRASH_BEHAVIOUR_PRESERVE,
    4.29              .hvm_boot = "",
    4.30              .pv_bootloader = "pygrub",
    4.31 @@ -317,9 +305,6 @@ static xen_vm create_new_vm(xen_session 
    4.32      xen_vm vm;
    4.33      xen_vm_create(session, &vm, &vm_record);
    4.34  
    4.35 -    xen_cpu_feature_set_free(empty_cpu_feature_set);
    4.36 -    xen_cpu_feature_set_free(force_off_cpu_feature_set);
    4.37 -
    4.38      if (!session->ok)
    4.39      {
    4.40          fprintf(stderr, "VM creation failed.\n");