ia64/xen-unstable

changeset 14043:be35eed950da

Rename Console.uri to location. Xend already uses the latter.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Tue Feb 20 19:23:28 2007 +0000 (2007-02-20)
parents 8773b1a38c83
children 988b90c6b4f3
files docs/xen-api/xenapi-datamodel.tex tools/libxen/include/xen_console.h tools/libxen/src/xen_console.c
line diff
     1.1 --- a/docs/xen-api/xenapi-datamodel.tex	Tue Feb 20 16:30:24 2007 +0000
     1.2 +++ b/docs/xen-api/xenapi-datamodel.tex	Tue Feb 20 19:23:28 2007 +0000
     1.3 @@ -10885,7 +10885,7 @@ Quals & Field & Type & Description \\
     1.4  \hline
     1.5  $\mathit{RO}_\mathit{run}$ &  {\tt uuid} & string & unique identifier/object reference \\
     1.6  $\mathit{RO}_\mathit{run}$ &  {\tt protocol} & console\_protocol & the protocol used by this console \\
     1.7 -$\mathit{RO}_\mathit{run}$ &  {\tt uri} & string & URI for the console service \\
     1.8 +$\mathit{RO}_\mathit{run}$ &  {\tt location} & string & URI for the console service \\
     1.9  $\mathit{RO}_\mathit{run}$ &  {\tt VM} & VM ref & VM to which this console is attached \\
    1.10  \hline
    1.11  \end{longtable}
    1.12 @@ -10954,13 +10954,13 @@ value of the field
    1.13  \vspace{0.3cm}
    1.14  \vspace{0.3cm}
    1.15  \vspace{0.3cm}
    1.16 -\subsubsection{RPC name:~get\_uri}
    1.17 -
    1.18 -{\bf Overview:} 
    1.19 -Get the uri field of the given console.
    1.20 -
    1.21 - \noindent {\bf Signature:} 
    1.22 -\begin{verbatim} string get_uri (session_id s, console ref self)\end{verbatim}
    1.23 +\subsubsection{RPC name:~get\_location}
    1.24 +
    1.25 +{\bf Overview:} 
    1.26 +Get the location field of the given console.
    1.27 +
    1.28 + \noindent {\bf Signature:} 
    1.29 +\begin{verbatim} string get_location (session_id s, console ref self)\end{verbatim}
    1.30  
    1.31  
    1.32  \noindent{\bf Arguments:}
     2.1 --- a/tools/libxen/include/xen_console.h	Tue Feb 20 16:30:24 2007 +0000
     2.2 +++ b/tools/libxen/include/xen_console.h	Tue Feb 20 19:23:28 2007 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2006, XenSource Inc.
     2.6 + * Copyright (c) 2006-2007, XenSource Inc.
     2.7   *
     2.8   * This library is free software; you can redistribute it and/or
     2.9   * modify it under the terms of the GNU Lesser General Public
    2.10 @@ -26,8 +26,8 @@
    2.11  
    2.12  
    2.13  /*
    2.14 - * The console class. 
    2.15 - *  
    2.16 + * The console class.
    2.17 + * 
    2.18   * A console.
    2.19   */
    2.20  
    2.21 @@ -65,7 +65,7 @@ typedef struct xen_console_record
    2.22      xen_console handle;
    2.23      char *uuid;
    2.24      enum xen_console_protocol protocol;
    2.25 -    char *uri;
    2.26 +    char *location;
    2.27      struct xen_vm_record_opt *vm;
    2.28  } xen_console_record;
    2.29  
    2.30 @@ -191,10 +191,10 @@ xen_console_get_protocol(xen_session *se
    2.31  
    2.32  
    2.33  /**
    2.34 - * Get the uri field of the given console.
    2.35 + * Get the location field of the given console.
    2.36   */
    2.37  extern bool
    2.38 -xen_console_get_uri(xen_session *session, char **result, xen_console console);
    2.39 +xen_console_get_location(xen_session *session, char **result, xen_console console);
    2.40  
    2.41  
    2.42  /**
     3.1 --- a/tools/libxen/src/xen_console.c	Tue Feb 20 16:30:24 2007 +0000
     3.2 +++ b/tools/libxen/src/xen_console.c	Tue Feb 20 19:23:28 2007 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2006, XenSource Inc.
     3.6 + * Copyright (c) 2006-2007, XenSource Inc.
     3.7   *
     3.8   * This library is free software; you can redistribute it and/or
     3.9   * modify it under the terms of the GNU Lesser General Public
    3.10 @@ -44,9 +44,9 @@ static const struct_member xen_console_r
    3.11          { .key = "protocol",
    3.12            .type = &xen_console_protocol_abstract_type_,
    3.13            .offset = offsetof(xen_console_record, protocol) },
    3.14 -        { .key = "uri",
    3.15 +        { .key = "location",
    3.16            .type = &abstract_type_string,
    3.17 -          .offset = offsetof(xen_console_record, uri) },
    3.18 +          .offset = offsetof(xen_console_record, location) },
    3.19          { .key = "VM",
    3.20            .type = &abstract_type_ref,
    3.21            .offset = offsetof(xen_console_record, vm) }
    3.22 @@ -71,7 +71,7 @@ xen_console_record_free(xen_console_reco
    3.23      }
    3.24      free(record->handle);
    3.25      free(record->uuid);
    3.26 -    free(record->uri);
    3.27 +    free(record->location);
    3.28      xen_vm_record_opt_free(record->vm);
    3.29      free(record);
    3.30  }
    3.31 @@ -164,7 +164,7 @@ xen_console_get_protocol(xen_session *se
    3.32  
    3.33  
    3.34  bool
    3.35 -xen_console_get_uri(xen_session *session, char **result, xen_console console)
    3.36 +xen_console_get_location(xen_session *session, char **result, xen_console console)
    3.37  {
    3.38      abstract_value param_values[] =
    3.39          {
    3.40 @@ -175,7 +175,7 @@ xen_console_get_uri(xen_session *session
    3.41      abstract_type result_type = abstract_type_string;
    3.42  
    3.43      *result = NULL;
    3.44 -    XEN_CALL_("console.get_uri");
    3.45 +    XEN_CALL_("console.get_location");
    3.46      return session->ok;
    3.47  }
    3.48