libxl: correct xenstore entry for empty cdrom
PATCH 1/1 libxl: correct xenstore entry for empty cdrom
Specifying an empty cdrom device will result in a Xenstore entry
params = aio:(null)
as the physical device path isn't existing. This lets a domain booted via OVMF hang as OVMF is checking for "aio:" only in order to detect the empty cdrom case.
Use an empty string for the physical device path in this case. As a cdrom device for HVM is always backed by qdisk we only need to cover this backend.
Signed-off-by Juergen Gross <[email protected]>
---
This is a backport candidate.
--- tools/libxl/libxl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/libxl/libxl.c +2 -1
@@ -2254,7 +2254,8 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid,case LIBXL_DISK_BACKEND_QDISK :flexarray_append (back,"params" );flexarray_append (back,GCSPRINTF ("%s:%s" , -libxl__device_disk_string_of_format (disk->format), disk->pdev_path)); +libxl__device_disk_string_of_format (disk->format), + disk->pdev_path ? :"" ));if (libxl_defbool_val (disk->colo_enable)) {flexarray_append (back,"colo-host" );flexarray_append (back,libxl__sprintf (gc,"%s" , disk->colo_host));
Signature · 7 lines
2.10.2 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel