From mboxrd@z Thu Jan  1 00:00:00 1970
From: ZhouPeng <zpengxen@gmail.com>
Subject: [PATCH] tool/libxl: mistake apic for acpi in
	libxl__build_device_model_args_old/new
Date: Fri, 15 Apr 2011 16:41:50 +0800
Message-ID: <BANLkTikHD2HOYzzV0ci6TBF5=tVSau6zfg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary=bcaec544ec82568f3d04a0f103a6
Return-path: <xen-devel-bounces@lists.xensource.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: "Xen-Devel (E-mail)" <xen-devel@lists.xensource.com>, Ian Campbell <Ian.Campbell@citrix.com>, "ian.jackson" <ian.jackson@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

--bcaec544ec82568f3d04a0f103a6
Content-Type: multipart/alternative; boundary=bcaec544ec82568f3204a0f103a4

--bcaec544ec82568f3204a0f103a4
Content-Type: text/plain; charset=ISO-8859-1

Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>

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) {
@@ -268,7 +268,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) {

-- 
Zhou Peng
Operating System Technology Group
Institute of Software, the Chinese Academy of Sciences (ISCAS)
<ailvpeng25@gmail.com>

--bcaec544ec82568f3204a0f103a4
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Zhou Peng &lt;<a href=3D"mailto:zhoupeng@nfs.iscas.ac.cn">zh=
oupeng@nfs.iscas.ac.cn</a>&gt;<br><br>tool/libxl: mistake apic for acpi in =
libxl__build_device_model_args_old/new<br><br>diff -r 6871474a2a09 -r 01f8b=
29dda8e tools/libxl/libxl_dm.c<br>
--- a/tools/libxl/libxl_dm.c=A0=A0=A0 Fri Apr 15 10:06:59 2011 +0800<br>+++=
 b/tools/libxl/libxl_dm.c=A0=A0=A0 Fri Apr 15 15:17:42 2011 +0800<br>@@ -12=
0,7 +120,7 @@ static char ** libxl__build_device_model<br>=A0=A0=A0=A0=A0=
=A0=A0=A0 if (info-&gt;soundhw) {<br>
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 flexarray_vappend(dm_args, &quot;-soun=
dhw&quot;, info-&gt;soundhw, NULL);<br>=A0=A0=A0=A0=A0=A0=A0=A0 }<br>-=A0=
=A0=A0=A0=A0=A0=A0 if (info-&gt;apic) {<br>+=A0=A0=A0=A0=A0=A0=A0 if (info-=
&gt;acpi) {<br>=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 flexarray_append(dm_arg=
s, &quot;-acpi&quot;);<br>
=A0=A0=A0=A0=A0=A0=A0=A0 }<br>=A0=A0=A0=A0=A0=A0=A0=A0 if (info-&gt;vcpus &=
gt; 1) {<br>@@ -268,7 +268,7 @@ static char ** libxl__build_device_model<br=
>=A0=A0=A0=A0=A0=A0=A0=A0 if (info-&gt;soundhw) {<br>=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0 flexarray_vappend(dm_args, &quot;-soundhw&quot;, info-&gt;s=
oundhw, NULL);<br>
=A0=A0=A0=A0=A0=A0=A0=A0 }<br>-=A0=A0=A0=A0=A0=A0=A0 if (!info-&gt;apic) {<=
br>+=A0=A0=A0=A0=A0=A0=A0 if (!info-&gt;acpi) {<br>=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0 flexarray_append(dm_args, &quot;-no-acpi&quot;);<br>=A0=A0=A0=
=A0=A0=A0=A0=A0 }<br>=A0=A0=A0=A0=A0=A0=A0=A0 if (info-&gt;vcpus &gt; 1) {<=
br clear=3D"all"><br>-- <br>
Zhou Peng<br>Operating System Technology Group<br>Institute of Software, th=
e Chinese Academy of Sciences (ISCAS)<br><a href=3D"mailto:ailvpeng25@gmail=
.com" target=3D"_blank"></a><br>

--bcaec544ec82568f3204a0f103a4--

--bcaec544ec82568f3d04a0f103a6
Content-Type: text/x-patch; charset=US-ASCII; name="apic-acpi.diff"
Content-Disposition: attachment; filename="apic-acpi.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gmivckw20

U2lnbmVkLW9mZi1ieTogWmhvdSBQZW5nIDx6aG91cGVuZ0BuZnMuaXNjYXMuYWMuY24+Cgp0b29s
L2xpYnhsOiBtaXN0YWtlIGFwaWMgZm9yIGFjcGkgaW4gbGlieGxfX2J1aWxkX2RldmljZV9tb2Rl
bF9hcmdzX29sZC9uZXcKCmRpZmYgLXIgNjg3MTQ3NGEyYTA5IC1yIDAxZjhiMjlkZGE4ZSB0b29s
cy9saWJ4bC9saWJ4bF9kbS5jCi0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMJRnJpIEFwciAx
NSAxMDowNjo1OSAyMDExICswODAwCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMJRnJpIEFw
ciAxNSAxNToxNzo0MiAyMDExICswODAwCkBAIC0xMjAsNyArMTIwLDcgQEAgc3RhdGljIGNoYXIg
KiogbGlieGxfX2J1aWxkX2RldmljZV9tb2RlbAogICAgICAgICBpZiAoaW5mby0+c291bmRodykg
ewogICAgICAgICAgICAgZmxleGFycmF5X3ZhcHBlbmQoZG1fYXJncywgIi1zb3VuZGh3IiwgaW5m
by0+c291bmRodywgTlVMTCk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGluZm8tPmFwaWMpIHsK
KyAgICAgICAgaWYgKGluZm8tPmFjcGkpIHsKICAgICAgICAgICAgIGZsZXhhcnJheV9hcHBlbmQo
ZG1fYXJncywgIi1hY3BpIik7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGluZm8tPnZjcHVzID4g
MSkgewpAQCAtMjY4LDcgKzI2OCw3IEBAIHN0YXRpYyBjaGFyICoqIGxpYnhsX19idWlsZF9kZXZp
Y2VfbW9kZWwKICAgICAgICAgaWYgKGluZm8tPnNvdW5kaHcpIHsKICAgICAgICAgICAgIGZsZXhh
cnJheV92YXBwZW5kKGRtX2FyZ3MsICItc291bmRodyIsIGluZm8tPnNvdW5kaHcsIE5VTEwpOwog
ICAgICAgICB9Ci0gICAgICAgIGlmICghaW5mby0+YXBpYykgeworICAgICAgICBpZiAoIWluZm8t
PmFjcGkpIHsKICAgICAgICAgICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywgIi1uby1hY3Bp
Iik7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGluZm8tPnZjcHVzID4gMSkgewo=
--bcaec544ec82568f3d04a0f103a6
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--bcaec544ec82568f3d04a0f103a6--