From: Roger Pau Monne Date: Thu, 26 Jul 2012 15:47:28 +0000 (+0100) Subject: libxl: fix removal of secondary consoles X-Git-Tag: 4.2.0-rc1~18 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=af5ef322304bb7e1017c06c32211529f0ea33601;p=xen.git libxl: fix removal of secondary consoles Secondary consoles are processed by libxl with the rest of the devices by calling libxl__initiate_device_remove that waits for the device to reach state 6 before procceeding with the removal. When libxl is destroying the console devices, Qemu is already dead or dying, and xenconsoled completely ignores the state backend entry for console devices, since it performs the cleanup based on the result of reads/writes to the tty. Since we don't want to execute hotplug scripts for consoles, leave the behaviour as it was previously, and just nuke the backend/frontend xenstore entries by calling libxl__device_destroy. Report: http://markmail.org/message/yqgppcsdip6tnmh6 Reported-by: Ian Campbell Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index a1b60d7a4f..2429836046 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -81,6 +81,8 @@ static int libxl__num_devices(libxl__gc *gc, uint32_t domid) for (i = 0; i < num_kinds; i++) { if (libxl__device_kind_from_string(kinds[i], &kind)) continue; + if (kind == LIBXL__DEVICE_KIND_CONSOLE) + continue; path = GCSPRINTF("/local/domain/%d/device/%s", domid, kinds[i]); devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs); @@ -522,10 +524,18 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && libxl__parse_backend_path(gc, path, dev) == 0) { - aodev = &aodevs->array[numdev]; dev->domid = domid; dev->kind = kind; dev->devid = atoi(devs[j]); + if (dev->backend_kind == LIBXL__DEVICE_KIND_CONSOLE) { + /* Currently console devices can be destroyed + * synchronously by just removing xenstore entries, + * this is what libxl__device_destroy does. + */ + libxl__device_destroy(gc, dev); + continue; + } + aodev = &aodevs->array[numdev]; aodev->action = DEVICE_DISCONNECT; aodev->dev = dev; aodev->callback = libxl__ao_devices_callback;