[libvirt] [PATCH] libxl: Support PV consoles

Currently the driver only exposes the ability to connect to the serial console of a Xen guest, which doesn't work for a PV guest. Instead look for a PV console first and a serial console second, if an HVM guest has a PV console then it is a good bet that it is preferred, I think. Tested with the following bit of config XML: <domain type='xen'> ... <devices> <console type='pty'> <target type='xen'/> </console> </devices> </domain> I have observed and tested this on ARM but I believe it also applies to x86 PV guests. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com&gt; Cc: Jim Fehlig <jfehlig(a)suse.com&gt; Cc: Dario Faggioli <dario.faggioli(a)citrix.com&gt; Cc: Clark Laughlin <clark.laughlin(a)linaro.org&gt; --- src/libxl/libxl_driver.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a6ae8a1..bcf3595 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3780,6 +3780,7 @@ libxlDomainOpenConsole(virDomainPtr dom, { virDomainObjPtr vm = NULL; int ret = -1; + libxl_console_type console_type = LIBXL_CONSOLE_TYPE_UNKNOWN; virDomainChrDefPtr chr = NULL; libxlDomainObjPrivatePtr priv; char *console = NULL; @@ -3807,8 +3808,15 @@ libxlDomainOpenConsole(virDomainPtr dom, priv = vm->privateData; - if (vm->def->nserials) + if (!chr && vm->def->nconsoles) { + chr = vm->def->consoles[0]; + console_type = LIBXL_CONSOLE_TYPE_PV; + } + + if (!chr && vm->def->nserials) { chr = vm->def->serials[0]; + console_type = LIBXL_CONSOLE_TYPE_SERIAL; + } if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3824,7 +3832,8 @@ libxlDomainOpenConsole(virDomainPtr dom, goto cleanup; } - ret = libxl_primary_console_get_tty(priv->ctx, vm->def->id, &console); + ret = libxl_console_get_tty(priv->ctx, vm->def->id, chr->target.port, + console_type, &console); if (ret) goto cleanup; -- 1.7.10.4