Re: [Xen-devel] [PATCH] tool/libxl: mistake apic for acpi in libxl__build_device_model_args_old/new

[Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>]

On Mon, 2011-05-09 at 09:20 +0100, Ian Jackson wrote:
> ZhouPeng writes ("[Xen-devel] [PATCH] tool/libxl: mistake apic for acpi in 
> libxl__build_device_model_args_old/new"):
> > diff -r 6871474a2a09 -r 01f8b29dda8e tools/libxl/libxl_dm.c
> > --- a/tools/libxl/libxl_dm.c    Fri Apr 15 10:06:59 2011 +0800
> > +++ b/tools/libxl/libxl_dm.c    Fri Apr 15 15:17:42 2011 +0800
> > @@ -120,7 +120,7 @@ static char ** libxl__build_device_model
> >          if (info->soundhw) {
> >              flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
> >          }
> > -        if (info->apic) {
> > +        if (info->acpi) {
> >              flexarray_append(dm_args, "-acpi");
> >          }
> >          if (info->vcpus > 1) {
> 
> Sorry for sitting on this.  There is obviously a problem here but your
> patch didn't compile (whether on 4.1 or unstable).
> 
> I think I've fixed it up.  Please comment on the proposed patch below.
> 
> Thanks,
> Ian.
> 
> 
> libxl: Fix apic/acpi confusion
> 
> "apic" was written a couple of times where "acpi" was meant.

I was initially confused since xm/xend supports both acpi and apic
options so I suspected just switching to using acpi consistently wasn't
quite right. However looking closer I see that only acpi needs
propagating to the device model and that libxl_domain_build_info
correctly contains and propagates both acpi and apic settings. So, looks
good to me.

> Signed-off-by: Zhou Peng <zhoupeng@xxxxxxxxxxxxxxx>
> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> 
> 
> diff -r 4b0692880dfa tools/libxl/libxl.idl
> --- a/tools/libxl/libxl.idl   Thu May 05 17:40:34 2011 +0100
> +++ b/tools/libxl/libxl.idl   Mon May 09 09:18:32 2011 +0100
> @@ -217,7 +217,7 @@ libxl_device_model_info = Struct("device
>      ("usb",              bool,              False, "usb support enabled or 
> disabled"),
>      ("usbdevice",        string,            False, "enable usb mouse: tablet 
> for absolute mouse, mouse for PS/2 protocol relative mouse"),
>      ("soundhw",          string,            False, "enable sound hardware"),
> -    ("apic",             bool,              False, "apic enabled or 
> disabled"),
> +    ("acpi",             bool,              False, "acpi enabled or 
> disabled"),
>      ("vcpus",            integer,           False, "max number of vcpus"),
>      ("vcpu_avail",       integer,           False, "vcpus actually 
> available"),
>      ("xen_platform_pci", bool,              False, "enable/disable the xen 
> platform pci device"),
> diff -r 4b0692880dfa tools/libxl/libxl_create.c
> --- a/tools/libxl/libxl_create.c      Thu May 05 17:40:34 2011 +0100
> +++ b/tools/libxl/libxl_create.c      Mon May 09 09:18:32 2011 +0100
> @@ -113,7 +113,7 @@ void libxl_init_dm_info(libxl_device_mod
>      dm_info->device_model = NULL;
>      dm_info->target_ram = libxl__sizekb_to_mb(b_info->target_memkb);
>      dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb);
> -    dm_info->apic = b_info->u.hvm.apic;
> +    dm_info->acpi = b_info->u.hvm.acpi;
>      dm_info->vcpus = b_info->max_vcpus;
>      dm_info->vcpu_avail = b_info->cur_vcpus;
>  
> diff -r 4b0692880dfa tools/libxl/libxl_dm.c
> --- a/tools/libxl/libxl_dm.c  Thu May 05 17:40:34 2011 +0100
> +++ b/tools/libxl/libxl_dm.c  Mon May 09 09:18:32 2011 +0100
> @@ -162,7 +162,7 @@ static char ** libxl__build_device_model
>          if (info->soundhw) {
>              flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
>          }
> -        if (info->apic) {
> +        if (info->acpi) {
>              flexarray_append(dm_args, "-acpi");
>          }
>          if (info->vcpus > 1) {
> @@ -315,7 +315,7 @@ static char ** libxl__build_device_model
>          if (info->soundhw) {
>              flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
>          }
> -        if (!info->apic) {
> +        if (!info->acpi) {
>              flexarray_append(dm_args, "-no-acpi");
>          }
>          if (info->vcpus > 1) {
> diff -r 4b0692880dfa tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c        Thu May 05 17:40:34 2011 +0100
> +++ b/tools/libxl/xl_cmdimpl.c        Mon May 09 09:18:32 2011 +0100
> @@ -366,7 +366,7 @@ static void printf_info(int domid,
>          printf("\t\t\t(boot %s)\n", dm_info->boot);
>          printf("\t\t\t(usb %d)\n", dm_info->usb);
>          printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice);
> -        printf("\t\t\t(apic %d)\n", dm_info->apic);
> +        printf("\t\t\t(acpi %d)\n", dm_info->acpi);
>          printf("\t\t)\n");
>      } else {
>          printf("\t\t(linux %d)\n", b_info->hvm);



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