19d8f590f0
xen.spec - bsc#945167 - Running command ’ xl pci-assignable-add 03:10.1’ secondly show errors 55f7f9d2-libxl-slightly-refine-pci-assignable-add-remove-handling.patch - Upstream patches from Jan 55f2e438-x86-hvm-fix-saved-pmtimer-and-hpet-values.patch 55f9345b-x86-MSI-fail-if-no-hardware-support.patch 5604f239-x86-PV-properly-populate-descriptor-tables.patch 5604f2e6-vt-d-fix-IM-bit-mask-and-unmask-of-FECTL_REG.patch 560a4af9-x86-EPT-tighten-conditions-of-IOMMU-mapping-updates.patch 560a7c36-x86-p2m-pt-delay-freeing-of-intermediate-page-tables.patch 560a7c53-x86-p2m-pt-ignore-pt-share-flag-for-shadow-mode-guests.patch 560bd926-credit1-fix-tickling-when-it-happens-from-a-remote-pCPU.patch 560e6d34-x86-p2m-pt-tighten-conditions-of-IOMMU-mapping-updates.patch - bsc#941074 - VmError: Device 51728 (vbd) could not be connected. Hotplug scripts not working. hotplug-Linux-block-performance-fix.patch - bsc#947165 - VUL-0: CVE-2015-7311: xen: libxl fails to honour readonly flag on disks with qemu-xen (xsa-142) CVE-2015-7311-xsa142.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=378
107 lines
4.0 KiB
Diff
107 lines
4.0 KiB
Diff
References: bsc#945167
|
|
|
|
# Commit 6e1e3480c3878bac5d244925974a6852c47c809b
|
|
# Date 2015-09-15 11:58:26 +0100
|
|
# Author Jan Beulich <JBeulich@suse.com>
|
|
# Committer Ian Campbell <ian.campbell@citrix.com>
|
|
libxl: slightly refine pci-assignable-{add, remove} handling
|
|
|
|
While it appears to be intentional for "xl pci-assignable-remove" to
|
|
not re-bind the original driver by default (requires the -r option),
|
|
permanently losing the information which driver was originally used
|
|
seems bad. Make "add; remove; add; remove -r" re-bind the original
|
|
driver by allowing "remove" to delete the information only upon
|
|
successful re-bind.
|
|
|
|
In the course of this I also noticed that binding information is lost
|
|
when upon first "add" pciback isn't loaded yet, due to its presence not
|
|
being checked for early enough. Adjust pciback_dev_is_assigned()
|
|
accordingly, and properly distinguish "yes" and "error" returns in the
|
|
"add" case (removing a redundant error message from the "remove" path
|
|
for consistency).
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: George Dunlap <george.dunlap@citrix.com>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
|
|
--- a/tools/libxl/libxl_pci.c
|
|
+++ b/tools/libxl/libxl_pci.c
|
|
@@ -543,6 +543,17 @@ static int pciback_dev_is_assigned(libxl
|
|
int rc;
|
|
struct stat st;
|
|
|
|
+ if ( access(SYSFS_PCIBACK_DRIVER, F_OK) < 0 ) {
|
|
+ if ( errno == ENOENT ) {
|
|
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
|
|
+ "Looks like pciback driver is not loaded");
|
|
+ } else {
|
|
+ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
|
|
+ "Can't access "SYSFS_PCIBACK_DRIVER);
|
|
+ }
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
spath = libxl__sprintf(gc, SYSFS_PCIBACK_DRIVER"/"PCI_BDF,
|
|
pcidev->domain, pcidev->bus,
|
|
pcidev->dev, pcidev->func);
|
|
@@ -658,6 +669,7 @@ static int libxl__device_pci_assignable_
|
|
libxl_ctx *ctx = libxl__gc_owner(gc);
|
|
unsigned dom, bus, dev, func;
|
|
char *spath, *driver_path = NULL;
|
|
+ int rc;
|
|
struct stat st;
|
|
|
|
/* Local copy for convenience */
|
|
@@ -674,7 +686,11 @@ static int libxl__device_pci_assignable_
|
|
}
|
|
|
|
/* Check to see if it's already assigned to pciback */
|
|
- if ( pciback_dev_is_assigned(gc, pcidev) ) {
|
|
+ rc = pciback_dev_is_assigned(gc, pcidev);
|
|
+ if ( rc < 0 ) {
|
|
+ return ERROR_FAIL;
|
|
+ }
|
|
+ if ( rc ) {
|
|
LIBXL__LOG(ctx, LIBXL__LOG_WARNING, PCI_BDF" already assigned to pciback",
|
|
dom, bus, dev, func);
|
|
return 0;
|
|
@@ -692,11 +708,18 @@ static int libxl__device_pci_assignable_
|
|
if ( rebind ) {
|
|
if ( driver_path ) {
|
|
pci_assignable_driver_path_write(gc, pcidev, driver_path);
|
|
+ } else if ( (driver_path =
|
|
+ pci_assignable_driver_path_read(gc, pcidev)) != NULL ) {
|
|
+ LIBXL__LOG(ctx, LIBXL__LOG_INFO,
|
|
+ PCI_BDF" not bound to a driver, will be rebound to %s",
|
|
+ dom, bus, dev, func, driver_path);
|
|
} else {
|
|
LIBXL__LOG(ctx, LIBXL__LOG_WARNING,
|
|
PCI_BDF" not bound to a driver, will not be rebound.",
|
|
dom, bus, dev, func);
|
|
}
|
|
+ } else {
|
|
+ pci_assignable_driver_path_remove(gc, pcidev);
|
|
}
|
|
|
|
if ( pciback_dev_assign(gc, pcidev) ) {
|
|
@@ -717,7 +740,6 @@ static int libxl__device_pci_assignable_
|
|
|
|
/* Unbind from pciback */
|
|
if ( (rc=pciback_dev_is_assigned(gc, pcidev)) < 0 ) {
|
|
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Checking if pciback was assigned");
|
|
return ERROR_FAIL;
|
|
} else if ( rc ) {
|
|
pciback_dev_unassign(gc, pcidev);
|
|
@@ -741,9 +763,9 @@ static int libxl__device_pci_assignable_
|
|
"Couldn't bind device to %s", driver_path);
|
|
return -1;
|
|
}
|
|
- }
|
|
|
|
- pci_assignable_driver_path_remove(gc, pcidev);
|
|
+ pci_assignable_driver_path_remove(gc, pcidev);
|
|
+ }
|
|
} else {
|
|
if ( rebind ) {
|
|
LIBXL__LOG(ctx, LIBXL__LOG_WARNING,
|