From 416814e66afa876dba2d384b87c22fbd08e08fcd Mon Sep 17 00:00:00 2001
From: Guannan Ren <gren@redhat.com>
Date: Sun, 3 Jul 2011 20:09:44 +0800
Subject: [PATCH] pci: initialize state values on reattach

add a new API pciDeviceReAttachInit() in pci.c to initialize state values for nodedev reattach

Initialize three state value of device driver to 1. This is just for a new call to
qemudNodeDeviceReAttach()
---
 AUTHORS                  | 1 +
 src/libvirt_private.syms | 1 +
 src/qemu/qemu_driver.c   | 2 ++
 src/util/pci.c           | 8 ++++++++
 src/util/pci.h           | 1 +
 5 files changed, 13 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 074dace720..2919249a54 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -180,6 +180,7 @@ Patches have also been contributed by:
   David S. Wang        <dwang2@cisco.com>
   Ruben Kerkhof        <ruben@rubenkerkhof.com>
   Scott Moser          <smoser@ubuntu.com>
+  Guannan Ren          <gren@redhat.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 626ac6ccf8..ae0d199516 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -801,6 +801,7 @@ pciDeviceListFree;
 pciDeviceListGet;
 pciDeviceListNew;
 pciDeviceListSteal;
+pciDeviceReAttachInit;
 pciDeviceSetManaged;
 pciFreeDevice;
 pciGetDevice;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5d61f0ad1f..cd43bf7de4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7197,6 +7197,8 @@ qemudNodeDeviceReAttach (virNodeDevicePtr dev)
     if (!pci)
         return -1;
 
+    pciDeviceReAttachInit(pci);
+
     qemuDriverLock(driver);
     if (pciReAttachDevice(pci, driver->activePciHostdevs) < 0)
         goto out;
diff --git a/src/util/pci.c b/src/util/pci.c
index 21c12b97b2..e3f978c547 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -1382,6 +1382,14 @@ unsigned pciDeviceGetManaged(pciDevice *dev)
     return dev->managed;
 }
 
+void pciDeviceReAttachInit(pciDevice *pci)
+{
+    pci->unbind_from_stub = 1;
+    pci->remove_slot = 1;
+    pci->reprobe = 1;
+}
+
+
 pciDeviceList *
 pciDeviceListNew(void)
 {
diff --git a/src/util/pci.h b/src/util/pci.h
index b767930bbc..a351baf028 100644
--- a/src/util/pci.h
+++ b/src/util/pci.h
@@ -40,6 +40,7 @@ int        pciResetDevice    (pciDevice     *dev,
 void      pciDeviceSetManaged(pciDevice     *dev,
                               unsigned       managed);
 unsigned  pciDeviceGetManaged(pciDevice     *dev);
+void      pciDeviceReAttachInit(pciDevice   *dev);
 
 pciDeviceList *pciDeviceListNew  (void);
 void           pciDeviceListFree (pciDeviceList *list);
-- 
GitLab