提交 12edef9a 编写于 作者: M Mark McLoughlin

Reset PCI host devices after hot-unplug

When we hot-unplug a PCI host device from a guest, we should reset it.

Both managed and unmanaged devices should be reset, but only managed
devices should be re-attached.

* src/qemu_driver.c: reset devices in qemudDomainDetachHostPciDevice()
上级 4dbecff9
...@@ -5780,6 +5780,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn, ...@@ -5780,6 +5780,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
virDomainHostdevDefPtr detach; virDomainHostdevDefPtr detach;
char *cmd, *reply; char *cmd, *reply;
int i, ret; int i, ret;
pciDevice *pci;
for (i = 0 ; i < vm->def->nhostdevs ; i++) { for (i = 0 ; i < vm->def->nhostdevs ; i++) {
unsigned domain = vm->def->hostdevs[i]->source.subsys.u.pci.domain; unsigned domain = vm->def->hostdevs[i]->source.subsys.u.pci.domain;
...@@ -5848,16 +5849,19 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn, ...@@ -5848,16 +5849,19 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
ret = 0; ret = 0;
if (detach->managed) { pci = pciGetDevice(conn,
pciDevice *pci = pciGetDevice(conn, detach->source.subsys.u.pci.domain,
detach->source.subsys.u.pci.domain, detach->source.subsys.u.pci.bus,
detach->source.subsys.u.pci.bus, detach->source.subsys.u.pci.slot,
detach->source.subsys.u.pci.slot, detach->source.subsys.u.pci.function);
detach->source.subsys.u.pci.function); if (!pci)
if (!pci || pciReAttachDevice(conn, pci) < 0) ret = -1;
else {
if (pciResetDevice(conn, pci) < 0)
ret = -1;
if (detach->managed && pciReAttachDevice(conn, pci) < 0)
ret = -1; ret = -1;
if (pci) pciFreeDevice(conn, pci);
pciFreeDevice(conn, pci);
} }
if (i != --vm->def->nhostdevs) if (i != --vm->def->nhostdevs)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册