From: Jim Fehlig Date: Mon, 26 Feb 2018 18:28:39 +0000 (-0700) Subject: libxl: set channel devid when not provided by application X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~490 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a667963476664ea50956d72e04bafdd4bef31b2;p=xen.git libxl: set channel devid when not provided by application Applications like libvirt may not populate a device devid field, delegating that to libxl. If needed, the application can later retrieve the libxl-produced devid. Indeed most devices are handled this way in libvirt, channel devices included. This works well when only one channel device is defined, but more than one results in qemu-system-i386: -chardev socket,id=libxl-channel-1,\ path=/tmp/test-org.qemu.guest_agent.00,server,nowait: Duplicate ID 'libxl-channel-1' for chardev Besides the odd '-1' value in the id, multiple channels have the same id, causing qemu to fail. A simple fix is to set an uninitialized devid (-1) to the dev_num passed to libxl__init_console_from_channel(). Signed-off-by: Jim Fehlig Acked-by: Wei Liu Reviewed-by: Roger Pau Monné --- diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 39d8430df8..9a02a23c2a 100644 --- a/tools/libxl/libxl_console.c +++ b/tools/libxl/libxl_console.c @@ -401,6 +401,9 @@ int libxl__init_console_from_channel(libxl__gc *gc, /* Perform validation first, allocate second. */ + if (channel->devid == -1) + channel->devid = dev_num; + if (!channel->name) { LOG(ERROR, "channel %d has no name", channel->devid); return ERROR_INVAL; @@ -446,7 +449,7 @@ int libxl__init_console_from_channel(libxl__gc *gc, abort(); } - console->devid = dev_num; + console->devid = channel->devid; console->consback = LIBXL__CONSOLE_BACKEND_IOEMU; console->backend_domid = channel->backend_domid; console->name = libxl__strdup(NOGC, channel->name);