diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-07-18 14:52:29 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-07-18 14:52:29 +0100 |
| commit | 78316010702aebe9937fd49dfed0d110acbd7782 (patch) | |
| tree | 26b191dd1b5f151697362b7ccaf5fb3264417bea | |
| parent | 259fa325581a3dd91f16106057d5f9b40007478f (diff) | |
| download | xen-78316010702aebe9937fd49dfed0d110acbd7782.tar.gz xen-78316010702aebe9937fd49dfed0d110acbd7782.tar.bz2 xen-78316010702aebe9937fd49dfed0d110acbd7782.zip | |
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@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
| -rw-r--r-- | tools/libxl/libxl.idl | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_dm.c | 10 | ||||
| -rw-r--r-- | tools/libxl/xl_cmdimpl.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/libxl/libxl.idl b/tools/libxl/libxl.idl index f7249b17b0..f0bc72393b 100644 --- a/tools/libxl/libxl.idl +++ b/tools/libxl/libxl.idl @@ -21,7 +21,7 @@ libxl_hwcap = Builtin("hwcap") # libxl_domain_type = Enumeration("domain_type", [ - (1, "FV"), + (1, "HVM"), (2, "PV"), ]) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b9bf4b0209..2f2836871f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -140,7 +140,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, 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 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, 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 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, 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 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, 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 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, 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 --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 28adcef86c..ecff457578 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1083,7 +1083,7 @@ skip_vfb: } dm_info->type = c_info->hvm ? - LIBXL_DOMAIN_TYPE_FV : + LIBXL_DOMAIN_TYPE_HVM : LIBXL_DOMAIN_TYPE_PV; xlu_cfg_destroy(config); |