pass driver name as parameter to virHostdevPrepareSCSIDevices

This commit is contained in:
Chunyan Liu 2014-03-06 14:12:52 +08:00 committed by Daniel P. Berrange
parent 313437ac64
commit c82c274581

View File

@ -247,6 +247,7 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
static int static int
virHostdevPrepareSCSIDevices(virHostdevManagerPtr hostdev_mgr, virHostdevPrepareSCSIDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
@ -317,10 +318,10 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr hostdev_mgr,
goto error; goto error;
} }
if (virSCSIDeviceSetUsedBy(tmp, QEMU_DRIVER_NAME, name) < 0) if (virSCSIDeviceSetUsedBy(tmp, drv_name, name) < 0)
goto error; goto error;
} else { } else {
if (virSCSIDeviceSetUsedBy(scsi, QEMU_DRIVER_NAME, name) < 0) if (virSCSIDeviceSetUsedBy(scsi, drv_name, name) < 0)
goto error; goto error;
VIR_DEBUG("Adding %s to activeScsiHostdevs", virSCSIDeviceGetName(scsi)); VIR_DEBUG("Adding %s to activeScsiHostdevs", virSCSIDeviceGetName(scsi));
@ -380,8 +381,8 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
return -1; return -1;
} }
return virHostdevPrepareSCSIDevices(hostdev_mgr, name, return virHostdevPrepareSCSIDevices(hostdev_mgr, QEMU_DRIVER_NAME,
hostdevs, nhostdevs); name, hostdevs, nhostdevs);
} }