From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: xl: Enable 'xl console' in 'x86_64'
Date: Wed, 28 Apr 2010 08:40:38 -0700
Message-ID: <4BD856F6.4010503@goop.org>
References: <4BD80DF4.6000804@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <4BD80DF4.6000804@cn.fujitsu.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Yu Zhiguo <yuzg@cn.fujitsu.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Keir Fraser <keir.fraser@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

On 04/28/2010 03:29 AM, Yu Zhiguo wrote:
> 'xl console' cannot be used on arch 'x86_64',
> because the path of 'xenconsole' is wrong.
> Fix this bug.
>
> Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com>
>
> diff -r c87ec146229a -r bb537e15d23a tools/libxl/libxl.c
> --- a/tools/libxl/libxl.c	Fri Apr 23 15:04:26 2010 +0100
> +++ b/tools/libxl/libxl.c	Thu Apr 29 02:23:21 2010 +0800
> @@ -28,6 +28,7 @@
>  #include <stdint.h>
>  #include <inttypes.h>
>  #include <assert.h>
> +#include <sys/utsname.h>
>  
>  #include "libxl.h"
>  #include "libxl_utils.h"
> @@ -741,8 +742,13 @@
>  {
>      struct stat st;
>      const char *XENCONSOLE = "/usr/lib/xen/bin/xenconsole";
> +    struct utsname utsbuf;
>      char *cmd;
>  
> +    if (uname(&utsbuf) != -1) {
> +        if (!strcmp(utsbuf.machine, "x86_64") || !strcmp(utsbuf.machine, "ia64"))
> +            XENCONSOLE = "/usr/lib64/xen/bin/xenconsole";
> +    }
>   

Won't this fail if the tools were build 32bit, but being run on a 64bit
machine?  Why not just look in both places?  Or fix the xenconsole to
install in /usr/lib regardless of architecture (it isn't a library, so
nothing will care about its architecture).

    J