xc_domain_disable_migrate takes a domid as a parameter, not a boolean:
you should call xc_domain_disable_migrate only when
info->disable_migrate is set.
Also the name of the config file parameter is not called disable_migrate
but nomigrate (0 is the default and means migration enabled, 1 means
migration disabled).
On Tue, 6 Jul 2010, Gianni Tedesco (3P) wrote:
> I'll feel bad taking a free beer off you for this one Dan :)
>
> libxl.h | 1 +
> libxl_dom.c | 1 +
> xl_cmdimpl.c | 5 +++++
> 3 files changed, 7 insertions(+)
>
> Signed-off-by: Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>
>
> diff -r a29ebc288d0e tools/libxl/libxl.h
> --- a/tools/libxl/libxl.h Mon Jul 05 16:12:59 2010 +0100
> +++ b/tools/libxl/libxl.h Tue Jul 06 15:38:48 2010 +0100
> @@ -97,6 +97,7 @@
> uint32_t target_memkb;
> uint32_t video_memkb;
> uint32_t shadow_memkb;
> + bool disable_migrate;
> const char *kernel;
> int hvm;
> union {
> diff -r a29ebc288d0e tools/libxl/libxl_dom.c
> --- a/tools/libxl/libxl_dom.c Mon Jul 05 16:12:59 2010 +0100
> +++ b/tools/libxl/libxl_dom.c Tue Jul 06 15:38:48 2010 +0100
> @@ -68,6 +68,7 @@
> (info->hvm) ? info->max_memkb :
> (info->max_memkb + info->u.pv.slack_memkb));
> xc_domain_set_tsc_info(ctx->xch, domid, info->tsc_mode, 0, 0, 0);
> + xc_domain_disable_migrate(ctx->xch, info->disable_migrate);
>
> if (info->hvm) {
> unsigned long shadow;
> diff -r a29ebc288d0e tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c Mon Jul 05 16:12:59 2010 +0100
> +++ b/tools/libxl/xl_cmdimpl.c Tue Jul 06 15:38:48 2010 +0100
> @@ -192,6 +192,7 @@
> b_info->max_vcpus = 1;
> b_info->max_memkb = 32 * 1024;
> b_info->target_memkb = b_info->max_memkb;
> + b_info->disable_migrate = 0;
> if (c_info->hvm) {
> b_info->shadow_memkb = 0; /* Set later */
> b_info->video_memkb = 8 * 1024;
> @@ -360,6 +361,7 @@
> printf("\t(tsc_mode %d)\n", b_info->tsc_mode);
> printf("\t(max_memkb %d)\n", b_info->max_memkb);
> printf("\t(target_memkb %d)\n", b_info->target_memkb);
> + printf("\t(disable_migrate %d)\n", b_info->disable_migrate);
>
> printf("\t(image\n");
> if (c_info->hvm) {
> @@ -551,6 +553,9 @@
> : libxl_get_required_shadow_memory(b_info->max_memkb,
> b_info->max_vcpus);
>
> + if (!xlu_cfg_get_long (config, "disable_migrate", &l))
> + b_info->disable_migrate = l;
> +
> if (!xlu_cfg_get_long(config, "tsc_mode", &l))
> b_info->tsc_mode = l;
>
>
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|