# HG changeset patch
# User Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
# Date 1305649692 -3600
# Node ID c152b707f87638d0b4f827d66eb583f08c0ebdb4
# Parent 3e8e1800d4720f6e91d042ff97aa67a4465c9b40
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>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
diff -r 3e8e1800d472 -r c152b707f876 tools/libxl/libxl.idl
--- a/tools/libxl/libxl.idl Tue May 17 13:55:45 2011 +0100
+++ b/tools/libxl/libxl.idl Tue May 17 17:28:12 2011 +0100
@@ -217,7 +217,7 @@
("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 3e8e1800d472 -r c152b707f876 tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Tue May 17 13:55:45 2011 +0100
+++ b/tools/libxl/libxl_create.c Tue May 17 17:28:12 2011 +0100
@@ -113,7 +113,7 @@
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 3e8e1800d472 -r c152b707f876 tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c Tue May 17 13:55:45 2011 +0100
+++ b/tools/libxl/libxl_dm.c Tue May 17 17:28:12 2011 +0100
@@ -162,7 +162,7 @@
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 @@
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 3e8e1800d472 -r c152b707f876 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Tue May 17 13:55:45 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c Tue May 17 17:28:12 2011 +0100
@@ -366,7 +366,7 @@
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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home