1.1 --- a/docs/xen-api/xenapi-datamodel.tex	Wed Mar 14 21:37:00 2007 +0000
     1.2 +++ b/docs/xen-api/xenapi-datamodel.tex	Wed Mar 14 21:59:11 2007 +0000
     1.3 @@ -1039,7 +1039,6 @@ Quals & Field & Type & Description \\
     1.4  $\mathit{RW}$ &  {\tt memory/dynamic\_max} & int & Dynamic maximum (bytes) \\
     1.5  $\mathit{RW}$ &  {\tt memory/dynamic\_min} & int & Dynamic minimum (bytes) \\
     1.6  $\mathit{RW}$ &  {\tt memory/static\_min} & int & Statically-set (i.e. absolute) mininum (bytes) \\
     1.7 -$\mathit{RW}$ &  {\tt VCPUs/policy} & string & the name of the VCPU scheduling policy to be applied \\
     1.8  $\mathit{RW}$ &  {\tt VCPUs/params} & (string $\rightarrow$ string) Map & configuration parameters for the selected VCPU policy \\
     1.9  $\mathit{RW}$ &  {\tt VCPUs/max} & int & Max number of VCPUs \\
    1.10  $\mathit{RW}$ &  {\tt VCPUs/at\_startup} & int & Boot number of VCPUs \\
    1.11 @@ -2178,72 +2177,6 @@ void
    1.12  \vspace{0.3cm}
    1.13  \vspace{0.3cm}
    1.14  \vspace{0.3cm}
    1.15 -\subsubsection{RPC name:~get\_VCPUs\_policy}
    1.16 -
    1.17 -{\bf Overview:} 
    1.18 -Get the VCPUs/policy field of the given VM.
    1.19 -
    1.20 - \noindent {\bf Signature:} 
    1.21 -\begin{verbatim} string get_VCPUs_policy (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 -string
    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\_VCPUs\_policy}
    1.48 -
    1.49 -{\bf Overview:} 
    1.50 -Set the VCPUs/policy field of the given VM.
    1.51 -
    1.52 - \noindent {\bf Signature:} 
    1.53 -\begin{verbatim} void set_VCPUs_policy (session_id s, VM ref self, string 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 string } & 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\_VCPUs\_params}
    1.82  
    1.83  {\bf Overview:} 

     2.1 --- a/tools/libxen/include/xen_vm.h	Wed Mar 14 21:37:00 2007 +0000
     2.2 +++ b/tools/libxen/include/xen_vm.h	Wed Mar 14 21:59:11 2007 +0000
     2.3 @@ -87,7 +87,6 @@ typedef struct xen_vm_record
     2.4      int64_t memory_dynamic_max;
     2.5      int64_t memory_dynamic_min;
     2.6      int64_t memory_static_min;
     2.7 -    char *vcpus_policy;
     2.8      xen_string_string_map *vcpus_params;
     2.9      int64_t vcpus_max;
    2.10      int64_t vcpus_at_startup;
    2.11 @@ -323,13 +322,6 @@ xen_vm_get_memory_static_min(xen_session
    2.12  
    2.13  
    2.14  /**
    2.15 - * Get the VCPUs/policy field of the given VM.
    2.16 - */
    2.17 -extern bool
    2.18 -xen_vm_get_vcpus_policy(xen_session *session, char **result, xen_vm vm);
    2.19 -
    2.20 -
    2.21 -/**
    2.22   * Get the VCPUs/params field of the given VM.
    2.23   */
    2.24  extern bool
    2.25 @@ -568,13 +560,6 @@ xen_vm_set_memory_static_min(xen_session
    2.26  
    2.27  
    2.28  /**
    2.29 - * Set the VCPUs/policy field of the given VM.
    2.30 - */
    2.31 -extern bool
    2.32 -xen_vm_set_vcpus_policy(xen_session *session, xen_vm vm, char *policy);
    2.33 -
    2.34 -
    2.35 -/**
    2.36   * Set the VCPUs/params field of the given VM.
    2.37   */
    2.38  extern bool

     3.1 --- a/tools/libxen/src/xen_vm.c	Wed Mar 14 21:37:00 2007 +0000
     3.2 +++ b/tools/libxen/src/xen_vm.c	Wed Mar 14 21:59:11 2007 +0000
     3.3 @@ -88,9 +88,6 @@ static const struct_member xen_vm_record
     3.4          { .key = "memory_static_min",
     3.5            .type = &abstract_type_int,
     3.6            .offset = offsetof(xen_vm_record, memory_static_min) },
     3.7 -        { .key = "VCPUs_policy",
     3.8 -          .type = &abstract_type_string,
     3.9 -          .offset = offsetof(xen_vm_record, vcpus_policy) },
    3.10          { .key = "VCPUs_params",
    3.11            .type = &abstract_type_string_string_map,
    3.12            .offset = offsetof(xen_vm_record, vcpus_params) },
    3.13 @@ -191,7 +188,6 @@ xen_vm_record_free(xen_vm_record *record
    3.14      free(record->name_description);
    3.15      xen_vdi_record_opt_free(record->suspend_vdi);
    3.16      xen_host_record_opt_free(record->resident_on);
    3.17 -    free(record->vcpus_policy);
    3.18      xen_string_string_map_free(record->vcpus_params);
    3.19      xen_console_record_opt_set_free(record->consoles);
    3.20      xen_vif_record_opt_set_free(record->vifs);
    3.21 @@ -498,23 +494,6 @@ xen_vm_get_memory_static_min(xen_session
    3.22  
    3.23  
    3.24  bool
    3.25 -xen_vm_get_vcpus_policy(xen_session *session, char **result, xen_vm vm)
    3.26 -{
    3.27 -    abstract_value param_values[] =
    3.28 -        {
    3.29 -            { .type = &abstract_type_string,
    3.30 -              .u.string_val = vm }
    3.31 -        };
    3.32 -
    3.33 -    abstract_type result_type = abstract_type_string;
    3.34 -
    3.35 -    *result = NULL;
    3.36 -    XEN_CALL_("VM.get_VCPUs_policy");
    3.37 -    return session->ok;
    3.38 -}
    3.39 -
    3.40 -
    3.41 -bool
    3.42  xen_vm_get_vcpus_params(xen_session *session, xen_string_string_map **result, xen_vm vm)
    3.43  {
    3.44      abstract_value param_values[] =
    3.45 @@ -1074,22 +1053,6 @@ xen_vm_set_memory_static_min(xen_session
    3.46  
    3.47  
    3.48  bool
    3.49 -xen_vm_set_vcpus_policy(xen_session *session, xen_vm vm, char *policy)
    3.50 -{
    3.51 -    abstract_value param_values[] =
    3.52 -        {
    3.53 -            { .type = &abstract_type_string,
    3.54 -              .u.string_val = vm },
    3.55 -            { .type = &abstract_type_string,
    3.56 -              .u.string_val = policy }
    3.57 -        };
    3.58 -
    3.59 -    xen_call_(session, "VM.set_VCPUs_policy", param_values, 2, NULL, NULL);
    3.60 -    return session->ok;
    3.61 -}
    3.62 -
    3.63 -
    3.64 -bool
    3.65  xen_vm_set_vcpus_params(xen_session *session, xen_vm vm, xen_string_string_map *params)
    3.66  {
    3.67      abstract_value param_values[] =

     4.1 --- a/tools/libxen/test/test_bindings.c	Wed Mar 14 21:37:00 2007 +0000
     4.2 +++ b/tools/libxen/test/test_bindings.c	Wed Mar 14 21:59:11 2007 +0000
     4.3 @@ -373,7 +373,6 @@ static xen_vm create_new_vm(xen_session 
     4.4              .memory_dynamic_max = 256,
     4.5              .memory_dynamic_min = 128,
     4.6              .memory_static_min = 128,
     4.7 -            .vcpus_policy = "credit",
     4.8              .vcpus_params = vcpus_params,
     4.9              .vcpus_max = 4,
    4.10              .vcpus_at_startup = 2,