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-changelog

[Xen-changelog] [xen-unstable] libxl/xl: Use "firmware" rather than "hvm

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] libxl/xl: Use "firmware" rather than "hvmloader" in API.
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Thu, 16 Jun 2011 11:11:45 +0100
Delivery-date: Thu, 16 Jun 2011 03:15:58 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1306257898 -3600
# Node ID 3cca0eb037664fccafc0fb289632d54ea10918fc
# Parent  f62ef47cc5912deb2e3fa77b2b932373047c646b
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>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r f62ef47cc591 -r 3cca0eb03766 tools/libxl/libxl.idl
--- a/tools/libxl/libxl.idl     Tue May 24 18:24:05 2011 +0100
+++ b/tools/libxl/libxl.idl     Tue May 24 18:24:58 2011 +0100
@@ -160,7 +160,7 @@
     ("hvm",             bool),
     ("u", KeyedUnion(None, "hvm",
                 [("hvm", "%s", Struct(None,
-                                       [("hvmloader", string),
+                                       [("firmware", string),
                                         ("pae", bool),
                                         ("apic", bool),
                                         ("acpi", bool),
diff -r f62ef47cc591 -r 3cca0eb03766 tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c        Tue May 24 18:24:05 2011 +0100
+++ b/tools/libxl/libxl_create.c        Tue May 24 18:24:58 2011 +0100
@@ -85,7 +85,7 @@
     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 f62ef47cc591 -r 3cca0eb03766 tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c   Tue May 24 18:24:05 2011 +0100
+++ b/tools/libxl/libxl_dom.c   Tue May 24 18:24:58 2011 +0100
@@ -269,11 +269,11 @@
     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 @@
         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 f62ef47cc591 -r 3cca0eb03766 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Tue May 24 18:24:05 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c  Tue May 24 18:24:58 2011 +0100
@@ -337,7 +337,7 @@
     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 @@
     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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] libxl/xl: Use "firmware" rather than "hvmloader" in API., Xen patchbot-unstable <=