libxl_pci: Don't hold QMP connection while waiting

After sending the 'device_del' command for a PCI passthrough device,
we wait until QEMU has effectively deleted the device, this involves
executing more QMP commands. While waiting, libxl hold the connection.

It isn't necessary to hold the connection and it prevents others from
making progress, so this patch releases the QMP connection.

For background:
    e.g., when a guest is created with several pci passthrough
    attached, on `xl destroy` all the devices needs to be detach, and
    this is usually what happens:
	- 'device_del' called for the 1st pci device
	- 'query-pci' checking if pci still there, it is
	- wait 1s
	- 'query-pci' checking again, and it's gone
	-> now the same can be done for the second pci device, so
	plenty of waiting on others when pci detach can be done in
	parallel.

    On shutdown, libxl usually keeps waiting because QEMU never
    releases the device because the guest kernel never responds QEMU's
    unplug queries. So detaching of the 1st device waits until a
    timeout stops it, and since the same timeout is setup at the same
    time for the other devices to detach, the 'device_del' command is
    never sent for those.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>

diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index a66915542b98803544e1c7ccd54ea7cee160bae2..664d74c478f3dc3a3adf7a3fffbc6195cab867ef 100644 (file)
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -2084,6 +2084,8 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc,
 
     if (rc) goto out;
 
+    libxl__ev_qmp_dispose(gc, qmp);
+
     asked_id = GCSPRINTF(PCI_PT_QDEV_ID,
                          pcidev->bus, pcidev->dev, pcidev->func);