Re: [Xen-devel] [PATCH 3/5] Fixup dummy cpu setup.

[Simon Horman <horms@xxxxxxxxxxxx>]

On Fri, Mar 20, 2009 at 05:02:49PM +0100, Gerd Hoffmann wrote:
> Passing NULL to cpu_init() doesn't work in upstream qemu.
> Also make sure the dummy cpu is in halted mode.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> ---
>  hw/xen_machine_pv.c |   10 +++++++++-
>  1 files changed, 9 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
> index 624d8dd..df28be9 100644
> --- a/hw/xen_machine_pv.c
> +++ b/hw/xen_machine_pv.c
> @@ -51,7 +51,15 @@ static void xen_init_pv(ram_addr_t ram_size, int 
> vga_ram_size,
>  #endif
>  
>      /* Initialize a dummy CPU */
> -    env = cpu_init(NULL);
> +    if (cpu_model == NULL) {
> +#ifdef TARGET_X86_64
> +        cpu_model = "qemu64";
> +#else
> +        cpu_model = "qemu32";
> +#endif
> +    }
> +    env = cpu_init(cpu_model);
> +    env->halted = 1;
>  
>      /* Initialize backend core & drivers */
>      if (-1 == xen_be_init()) {

Is there a way to achieve this without ifdef nastiness?

-- 
Simon Horman
  VA Linux Systems Japan K.K., Sydney, Australia Satellite Office
  H: www.vergenet.net/~horms/             W: www.valinux.co.jp/en


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel