WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

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

To: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
Subject: Re: [Xen-devel] [PATCH] tool/libxl: mistake apic for acpi in libxl__build_device_model_args_old/new
From: ZhouPeng <zpengxen@xxxxxxxxx>
Date: Wed, 11 May 2011 10:11:06 +0800
Cc: "Xen-Devel \(E-mail\)" <xen-devel@xxxxxxxxxxxxxxxxxxx>, Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Delivery-date: Tue, 10 May 2011 19:14:44 -0700
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=C1Ca2nxcAgF4EY220DKFBszK2OMt+A4ybHk7pTTf7Pc=; b=YUedM3BAdya6evII6fGbLxp6D8DJ3C0SkJX9Hqr3DeKRRgMjyZzY5mcgUV1ZeRDHEY mfy20sfrlpTWOsdjQHvQcU6AIdmIdPIpRjCiOLv6MtVhpC39t/TvfZRovcJ/9u8bbQvA zMMEhFV+qzgwpxZ+yMvGn8Ke8kukGXODE+6r4=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=blqIzlzniItOm3iY9IhhouUgI75Mj3j9K8W6MrEhuHEFlHF/r8OeBKOndridv/pPHv eV/qjVcUulFazW2ndT+mIk8aJQ9ggpcKX1cQ2okaTSmdqTbcrok18NHufJ7EvWzOJ994 V5ZF2NJYRmEjaGAc1v8341Pm0tqPjPZDRBak4=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1305030216.26692.274.camel@xxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <BANLkTikHD2HOYzzV0ci6TBF5=tVSau6zfg@xxxxxxxxxxxxxx> <19911.41961.195937.439643@xxxxxxxxxxxxxxxxxxxxxxxx> <BANLkTim_ct6doiDs4vQ2KTsJwDqHtEY_Hw@xxxxxxxxxxxxxx> <1305030216.26692.274.camel@xxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
2011/5/10 Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>:
> I think that already exists and it looks like it should work (although I
> didn't actually try it).
>
> libxl_domain_build_info->u.hvm.apic is parsed in parse_config_data in xl
> and eventually makes its way to hvm_build_set_params in libxl where it
> is propagated into the hvminfo page.
So, you are right, and the patch is enough without omiting apic.
My glimpse of the patch ignored that libxl_domain_build_info is there.

I think there is no problem now.  How about you?

libxl: Fix apic/acpi confusion

"apic" was written a couple of times where "acpi" was meant.

Signed-off-by: Zhou Peng <zhoupeng@xxxxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
Acked-by: "Stefano Stabellini" <stefano.stabellini@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);

-- 
Zhou Peng
Operating System Technology Group
Institute of Software, the Chinese Academy of Sciences (ISCAS)

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