From b1878a91f75a26f6c851106df6d83086fe213963 Mon Sep 17 00:00:00 2001 Message-Id: From: Michal Privoznik Date: Mon, 4 Nov 2013 17:36:00 +0100 Subject: [PATCH] virpci: Don't error on unbinded devices RHEL-7: https://bugzilla.redhat.com/show_bug.cgi?id=1019387 UPSTREAM: https://bugzilla.redhat.com/show_bug.cgi?id=1018897 If a PCI deivce is not binded to any driver (e.g. there's yet no PCI driver in the linux kernel) but still users want to passthru the device we fail the whole operation as we fail to resolve the 'driver' link under the PCI device sysfs tree. Obviously, this is not a fatal error and it shouldn't be error at all. Signed-off-by: Michal Privoznik (cherry picked from commit df4283a55bf3516b333352e2052dbe3317936953) Signed-off-by: Jiri Denemark --- src/util/virpci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index be50b4f..be95d03 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1095,11 +1095,8 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, const char *newDriverName = NULL; if (virPCIDriverDir(&stubDriverPath, stubDriverName) < 0 || - virPCIFile(&driverLink, dev->name, "driver") < 0 || - virPCIDeviceGetDriverPathAndName(dev, &oldDriverPath, - &oldDriverName) < 0) { + virPCIFile(&driverLink, dev->name, "driver") < 0) goto cleanup; - } if (virFileExists(driverLink)) { if (virFileLinkPointsTo(driverLink, stubDriverPath)) { -- 1.8.4.2