diff -r 99263132665b tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 18 12:38:55 2012 +0200 +++ b/tools/libxl/libxl.c Fri May 18 14:10:47 2012 +0200 @@ -1230,7 +1230,7 @@ int libxl_primary_console_exec(libxl_ctx case LIBXL_DOMAIN_TYPE_PV: rc = libxl_console_exec(ctx, domid_vm, 0, LIBXL_CONSOLE_TYPE_PV); break; - case -1: + case LIBXL_DOMAIN_TYPE_INVALID: LOG(ERROR,"unable to get domain type for domid=%"PRIu32,domid_vm); rc = ERROR_FAIL; break; diff -r 99263132665b tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 18 12:38:55 2012 +0200 +++ b/tools/libxl/libxl_dm.c Fri May 18 14:10:47 2012 +0200 @@ -257,6 +257,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + case LIBXL_DOMAIN_TYPE_INVALID: + break; } flexarray_append(dm_args, NULL); return (char **) flexarray_contents(dm_args); @@ -505,6 +507,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + case LIBXL_DOMAIN_TYPE_INVALID: + break; } ram_size = libxl__sizekb_to_mb(b_info->max_memkb - b_info->video_memkb); diff -r 99263132665b tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 18 12:38:55 2012 +0200 +++ b/tools/libxl/libxl_dom.c Fri May 18 14:10:47 2012 +0200 @@ -33,9 +33,9 @@ libxl_domain_type libxl__domain_type(lib ret = xc_domain_getinfolist(ctx->xch, domid, 1, &info); if (ret != 1) - return -1; + return LIBXL_DOMAIN_TYPE_INVALID; if (info.domain != domid) - return -1; + return LIBXL_DOMAIN_TYPE_INVALID; if (info.flags & XEN_DOMINF_hvm_guest) return LIBXL_DOMAIN_TYPE_HVM; else