From: Marek Marczykowski-Górecki Date: Sat, 28 Sep 2019 14:20:34 +0000 (+0100) Subject: libxl: fix cold plugged PCI device with stubdomain X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1a734d51902dff44501a7589fdf44d269a55cffd;p=people%2Flarsk%2Fxen.git libxl: fix cold plugged PCI device with stubdomain When libxl__device_pci_add() is called, stubdomain is already running, even when still constructing the target domain. Previously, do_pci_add() was called with 'starting' hardcoded to false, but now do_pci_add() shares 'starting' flag in pci_add_state for both target domain and stubdomain. Fix this by resetting (local) 'starting' to false in pci_add_dm_done() (previously part of do_pci_add()) when handling stubdomain, regardless of pas->starting value. Fixes: 11db56f9a6 (libxl_pci: Use libxl__ao_device with libxl__device_pci_add) Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Anthony PERARD Acked-by: Ian Jackson Release-acked-by: Juergen Gross --- diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index cb849b2415..eae086e503 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1300,6 +1300,10 @@ static void pci_add_dm_done(libxl__egc *egc, if (rc) goto out; + /* stubdomain is always running by now, even at create time */ + if (isstubdom) + starting = false; + sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); f = fopen(sysfs_path, "r"); @@ -1559,7 +1563,6 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid, GCNEW(pcidev_s); libxl_device_pci_init(pcidev_s); libxl_device_pci_copy(CTX, pcidev_s, pcidev); - /* stubdomain is always running by now, even at create time */ pas->callback = device_pci_add_stubdom_done; do_pci_add(egc, stubdomid, pcidev_s, pas); /* must be last */ return;