Re: [Xen-devel] [PATCH v4 27/31] xenconsole: try to attach to PV console if HVM fails

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Fri, Aug 07, 2015 at 12:18:04PM +0200, Roger Pau Monne wrote:
> HVM guests have always used the emulated serial console by default, but if
> the emulated serial pty cannot be fetched from xenstore try to use the PV
> console instead.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>

Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>

> ---
> Changes since v3:
>  - Drop the usage of a label and instead use if conditions.
> ---
>  tools/console/client/main.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/console/client/main.c b/tools/console/client/main.c
> index f130a60..d006fdc 100644
> --- a/tools/console/client/main.c
> +++ b/tools/console/client/main.c
> @@ -333,7 +333,7 @@ int main(int argc, char **argv)
>               { 0 },
>  
>       };
> -     char *dom_path = NULL, *path = NULL;
> +     char *dom_path = NULL, *path = NULL, *test = NULL;
>       int spty, xsfd;
>       struct xs_handle *xs;
>       char *end;
> @@ -415,9 +415,15 @@ int main(int argc, char **argv)
>       path = malloc(strlen(dom_path) + strlen("/device/console/0/tty") + 5);
>       if (path == NULL)
>               err(ENOMEM, "malloc");
> -     if (type == CONSOLE_SERIAL)
> +     if (type == CONSOLE_SERIAL) {
>               snprintf(path, strlen(dom_path) + strlen("/serial/0/tty") + 5, 
> "%s/serial/%d/tty", dom_path, num);
> -     else {
> +             test = xs_read(xs, XBT_NULL, path, NULL);
> +             free(test);
> +             if (test == NULL)
> +                     type = CONSOLE_PV;
> +     }
> +     if (type == CONSOLE_PV) {
> +
>               if (num == 0)
>                       snprintf(path, strlen(dom_path) + 
> strlen("/console/tty") + 1, "%s/console/tty", dom_path);
>               else
> -- 
> 1.9.5 (Apple Git-50.3)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel