NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuGetPciHostDeviceList take hostdev list directly

Browse Source 
- src/qemu/qemu_driver.c: Update qemuGetPciHostDeviceList to take a
  hostdev list and count directly, rather than getting this indirectly
  from domain definition. This will allow reuse for the attach-device case.
This commit is contained in:
Chris Wright 2010-07-26 18:17:20 +02:00 committed by Daniel Veillard
parent d3864c3782
commit 8bd00c0edf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_driver.c
View File

@ -3000,7 +3000,7 @@ cleanup:
static pciDeviceList * static pciDeviceList *
qemuGetPciHostDeviceList(virDomainDefPtr def) qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
{ {
pciDeviceList *list; pciDeviceList *list;
int i; int i;
@ -3008,8 +3008,8 @@ qemuGetPciHostDeviceList(virDomainDefPtr def)
if (!(list = pciDeviceListNew())) if (!(list = pciDeviceListNew()))
return NULL; return NULL;
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0 ; i < nhostdevs ; i++) {
virDomainHostdevDefPtr hostdev = def->hostdevs[i]; virDomainHostdevDefPtr hostdev = hostdevs[i];
pciDevice *dev; pciDevice *dev;
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
@ -3049,7 +3049,7 @@ qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
if (!def->nhostdevs) if (!def->nhostdevs)
return 0; return 0;
if (!(pcidevs = qemuGetPciHostDeviceList(def))) if (!(pcidevs = qemuGetPciHostDeviceList(def->hostdevs, def->nhostdevs)))
return -1; return -1;
for (i = 0; i < pciDeviceListCount(pcidevs); i++) { for (i = 0; i < pciDeviceListCount(pcidevs); i++) {
@ -3077,7 +3077,7 @@ qemuPrepareHostPCIDevices(struct qemud_driver *driver,
int i; int i;
int ret = -1; int ret = -1;
if (!(pcidevs = qemuGetPciHostDeviceList(def))) if (!(pcidevs = qemuGetPciHostDeviceList(def->hostdevs, def->nhostdevs)))
return -1; return -1;
/* We have to use 3 loops here. *All* devices must /* We have to use 3 loops here. *All* devices must
@ -3229,7 +3229,7 @@ qemuDomainReAttachHostDevices(struct qemud_driver *driver,
if (!def->nhostdevs) if (!def->nhostdevs)
return; return;
if (!(pcidevs = qemuGetPciHostDeviceList(def))) { if (!(pcidevs = qemuGetPciHostDeviceList(def->hostdevs, def->nhostdevs))) {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
VIR_ERROR(_("Failed to allocate pciDeviceList: %s"), VIR_ERROR(_("Failed to allocate pciDeviceList: %s"),
err ? err->message : _("unknown error")); err ? err->message : _("unknown error"));