Commit 359970fd8b ("tools/libxl: Switch Arm guest type to PVH") missed
changing the type field in c_info. This issue didn't surface until
ef72c93df9 which made creating PV guest on Arm unusable.Signed-off-by: Wei Liu <[email protected]> --- Cc: Stefano Stabellini <[email protected]> Cc: Julien Grall <[email protected]> Julien, can you give this a quick test? Put type='pv' in your Arm guest xl cfg and note the difference before and after this patch. This should fix libvirt breakage. --- tools/libxl/libxl_create.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 4bb750e951..311957f87c 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -35,6 +35,16 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, return ERROR_INVAL; } +#if defined(__arm__) || defined(__aarch64__) + if (c_info->type == LIBXL_DOMAIN_TYPE_PV) { + LOG(WARN, "Converting PV guest to PVH."); + LOG(WARN, "Arm guest are now PVH."); + LOG(WARN, "Please fix your configuration file/toolstack."); + + c_info->type = LIBXL_DOMAIN_TYPE_PVH; + } +#endif + if (c_info->type != LIBXL_DOMAIN_TYPE_PV) { libxl_defbool_setdefault(&c_info->hap, true); libxl_defbool_setdefault(&c_info->oos, true); -- 2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
