# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1305294079 -3600
# Node ID 84c3d1d16ddc3bc674354e5da8e97bac2ac9cc14
# Parent 996d74359377c4c0c15c1e988a017613f872af65
tools: libxl/xl: Use "firmware" rather than "hvmloader" in API.
23251:0710f53cef4a turned build_info.kernel into
build_info.hvm.hvmloader however this is a rather specific name for a
field which may be used to load things which aren't hvmloader in the
future. Switch to calling the field and associated configuration itmes
"firmware" instead.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 996d74359377 -r 84c3d1d16ddc tools/libxl/libxl.idl
--- a/tools/libxl/libxl.idl Fri May 13 14:41:19 2011 +0100
+++ b/tools/libxl/libxl.idl Fri May 13 14:41:19 2011 +0100
@@ -160,7 +160,7 @@ libxl_domain_build_info = Struct("domain
("hvm", bool),
("u", KeyedUnion(None, "hvm",
[("hvm", "%s", Struct(None,
- [("hvmloader", string),
+ [("firmware", string),
("pae", bool),
("apic", bool),
("acpi", bool),
diff -r 996d74359377 -r 84c3d1d16ddc tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Fri May 13 14:41:19 2011 +0100
+++ b/tools/libxl/libxl_create.c Fri May 13 14:41:19 2011 +0100
@@ -85,7 +85,7 @@ void libxl_init_build_info(libxl_domain_
if (c_info->hvm) {
b_info->video_memkb = 8 * 1024;
b_info->hvm = 1;
- b_info->u.hvm.hvmloader = NULL;
+ b_info->u.hvm.firmware = NULL;
b_info->u.hvm.pae = 1;
b_info->u.hvm.apic = 1;
b_info->u.hvm.acpi = 1;
diff -r 996d74359377 -r 84c3d1d16ddc tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c Fri May 13 14:41:19 2011 +0100
+++ b/tools/libxl/libxl_dom.c Fri May 13 14:41:19 2011 +0100
@@ -269,11 +269,11 @@ static int hvm_build_set_params(xc_inter
return 0;
}
-static const char *libxl__domain_hvmloader(libxl__gc *gc,
+static const char *libxl__domain_firmware(libxl__gc *gc,
libxl_domain_build_info *info)
{
return libxl__abs_path(gc,
- info->u.hvm.hvmloader ? : "hvmloader",
+ info->u.hvm.firmware ? : "hvmloader",
libxl_xenfirmwaredir_path());
}
@@ -289,7 +289,7 @@ int libxl__build_hvm(libxl__gc *gc, uint
domid,
(info->max_memkb - info->video_memkb) / 1024,
(info->target_memkb - info->video_memkb) / 1024,
- libxl__domain_hvmloader(gc, info));
+ libxl__domain_firmware(gc, info));
if (ret) {
LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, ret, "hvm building failed");
goto out;
diff -r 996d74359377 -r 84c3d1d16ddc tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Fri May 13 14:41:19 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c Fri May 13 14:41:19 2011 +0100
@@ -337,7 +337,7 @@ static void printf_info(int domid,
printf("\t(image\n");
if (c_info->hvm) {
printf("\t\t(hvm\n");
- printf("\t\t\t(loader %s)\n", b_info->u.hvm.hvmloader);
+ printf("\t\t\t(firmware %s)\n", b_info->u.hvm.firmware);
printf("\t\t\t(video_memkb %d)\n", b_info->video_memkb);
printf("\t\t\t(shadow_memkb %d)\n", b_info->shadow_memkb);
printf("\t\t\t(pae %d)\n", b_info->u.hvm.pae);
@@ -748,10 +748,10 @@ static void parse_config_data(const char
if (c_info->hvm == 1) {
if (!xlu_cfg_get_string (config, "kernel", &buf))
fprintf(stderr, "WARNING: ignoring \"kernel\" directive for HVM
guest. "
- "Use \"hvmloader_override\" instead if you really want a
non-default hvmloader\n");
-
- xlu_cfg_replace_string (config, "hvmloader_override",
- &b_info->u.hvm.hvmloader);
+ "Use \"firmware_override\" instead if you really want a
non-default firmware\n");
+
+ xlu_cfg_replace_string (config, "firmware_override",
+ &b_info->u.hvm.firmware);
if (!xlu_cfg_get_long (config, "pae", &l))
b_info->u.hvm.pae = l;
if (!xlu_cfg_get_long (config, "apic", &l))
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home