On Mon, 2011-07-18 at 14:57 +0100, Ian Campbell wrote:
> # HG changeset patch
> # User Ian Campbell <ian.campbell@xxxxxxxxxx>
> # Date 1310997149 -3600
> # Node ID 90e2ae994ebbc37ba6279b9071ab2e76c2ebeec2
> # Parent b18728227bf9e45058a4cc22425d1d35317e2c8d
> 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>
>
> diff -r b18728227bf9 -r 90e2ae994ebb tools/libxl/libxl.idl
> --- a/tools/libxl/libxl.idl Mon Jul 18 14:52:29 2011 +0100
> +++ b/tools/libxl/libxl.idl Mon Jul 18 14:52:29 2011 +0100
> @@ -21,7 +21,7 @@ libxl_hwcap = Builtin("hwcap")
> #
>
> libxl_domain_type = Enumeration("domain_type", [
> - (1, "FV"),
> + (1, "HVM"),
> (2, "PV"),
> ])
>
> diff -r b18728227bf9 -r 90e2ae994ebb tools/libxl/libxl_dm.c
> --- a/tools/libxl/libxl_dm.c Mon Jul 18 14:52:29 2011 +0100
> +++ b/tools/libxl/libxl_dm.c Mon Jul 18 14:52:29 2011 +0100
> @@ -144,7 +144,7 @@ static char ** libxl__build_device_model
> 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) {
> @@ -211,7 +211,7 @@ static char ** libxl__build_device_model
> 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;
> }
> @@ -336,7 +336,7 @@ static char ** libxl__build_device_model
> 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) {
> @@ -408,7 +408,7 @@ static char ** libxl__build_device_model
> 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");
QEMU uses the term "xenfv", this is a terminology mismatch between QEMU
and Xen...
Wei.
> break;
> }
> @@ -417,7 +417,7 @@ static char ** libxl__build_device_model
> 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 b18728227bf9 -r 90e2ae994ebb tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c Mon Jul 18 14:52:29 2011 +0100
> +++ b/tools/libxl/xl_cmdimpl.c Mon Jul 18 14:52:29 2011 +0100
> @@ -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);
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home