[Xen-changelog] [xen-unstable] libxl: Give the HVM domain type the name "HVM"

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1310997149 -3600
# Node ID 6efc1985c010ecbccde4f21223850a4227f3f4a2
# Parent  e298ce67777eb45187d6581a0c51c2dbe7161000
libxl: Give the HVM domain type the name "HVM"

This is generally used in the Xen universe, rather than "FV" which is
not used elsewhere.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r e298ce67777e -r 6efc1985c010 tools/libxl/libxl.idl
--- a/tools/libxl/libxl.idl     Mon Jul 18 14:38:31 2011 +0100
+++ b/tools/libxl/libxl.idl     Mon Jul 18 14:52:29 2011 +0100
@@ -21,7 +21,7 @@
 #
 
 libxl_domain_type = Enumeration("domain_type", [
-    (1, "FV"),
+    (1, "HVM"),
     (2, "PV"),
     ])
 
diff -r e298ce67777e -r 6efc1985c010 tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c    Mon Jul 18 14:38:31 2011 +0100
+++ b/tools/libxl/libxl_dm.c    Mon Jul 18 14:52:29 2011 +0100
@@ -140,7 +140,7 @@
     if (info->serial) {
         flexarray_vappend(dm_args, "-serial", info->serial, NULL);
     }
-    if (info->type == LIBXL_DOMAIN_TYPE_FV) {
+    if (info->type == LIBXL_DOMAIN_TYPE_HVM) {
         int ioemu_vifs = 0;
 
         if (info->videoram) {
@@ -207,7 +207,7 @@
     case LIBXL_DOMAIN_TYPE_PV:
         flexarray_append(dm_args, "xenpv");
         break;
-    case LIBXL_DOMAIN_TYPE_FV:
+    case LIBXL_DOMAIN_TYPE_HVM:
         flexarray_append(dm_args, "xenfv");
         break;
     }
@@ -332,7 +332,7 @@
     if (info->serial) {
         flexarray_vappend(dm_args, "-serial", info->serial, NULL);
     }
-    if (info->type == LIBXL_DOMAIN_TYPE_FV) {
+    if (info->type == LIBXL_DOMAIN_TYPE_HVM) {
         int ioemu_vifs = 0;
 
         if (info->stdvga) {
@@ -404,7 +404,7 @@
     case LIBXL_DOMAIN_TYPE_PV:
         flexarray_append(dm_args, "xenpv");
         break;
-    case LIBXL_DOMAIN_TYPE_FV:
+    case LIBXL_DOMAIN_TYPE_HVM:
         flexarray_append(dm_args, "xenfv");
         break;
     }
@@ -413,7 +413,7 @@
     flexarray_append(dm_args, "-m");
     flexarray_append(dm_args, libxl__sprintf(gc, "%d", info->target_ram));
 
-    if (info->type == LIBXL_DOMAIN_TYPE_FV) {
+    if (info->type == LIBXL_DOMAIN_TYPE_HVM) {
         for (i = 0; i < num_disks; i++) {
             int disk, part;
             int dev_number =
diff -r e298ce67777e -r 6efc1985c010 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Mon Jul 18 14:38:31 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c  Mon Jul 18 14:52:29 2011 +0100
@@ -1083,7 +1083,7 @@
     }
 
     dm_info->type = c_info->hvm ?
-        LIBXL_DOMAIN_TYPE_FV :
+        LIBXL_DOMAIN_TYPE_HVM :
         LIBXL_DOMAIN_TYPE_PV;
 
     xlu_cfg_destroy(config);

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