From 72652e9dbb583a9f321d7dc6c545a115a0b9fc77 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 2 Mar 2009 20:22:35 +0000
Subject: [PATCH] Always reset PCI devices

---
 ChangeLog       | 5 +++++
 src/qemu_conf.c | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7298fdd33..b104c22bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 2 20:21:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/qemu_conf.c: Always reset PCI devices before starting guests.
+	Add todo item for non-managed PCI devs
+
 Mon Mar 2 20:18:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/libvirt_private.syms: Export virUnrefConnect and
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index fad3eeb622..d7257fa0df 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -1411,7 +1411,11 @@ int qemudBuildCommandLine(virConnectPtr conn,
                 }
 
                 pciFreeDevice(conn, dev);
-            }
+            } /* else {
+                XXX validate that non-managed device isn't in use, eg
+                by checking that device is either un-bound, or bound
+                to pci-stub.ko
+            } */
         }
 
     }
@@ -1421,8 +1425,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
         virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i];
         pciDevice *dev;
 
-        if (!hostdev->managed ||
-            hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
             hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
             continue;