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

conf: Add 'bus' and 'target' to SCSI address conflict checks

Browse Source 
Modify virDomainDriveAddressIsUsedBy{Disk|Hostdev} and
virDomainSCSIDriveAddressIsUsed to take 'bus' and 'target'
parameters.  Will be used by future patches for more complete
address conflict checks

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2015-06-19 15:11:13 -04:00
parent 8b97ba2952
commit b79c52d8c2
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/conf/domain_conf.c
View File

@ -5236,13 +5236,15 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode,
return ret; return ret;
} }
/* Check if a drive type address $controller:0:0:$unit is already /* Check if a drive type address $controller:$bus:$target:$unit is already
* taken by a disk or not. * taken by a disk or not.
*/ */
static bool static bool
virDomainDriveAddressIsUsedByDisk(const virDomainDef *def, virDomainDriveAddressIsUsedByDisk(const virDomainDef *def,
virDomainDiskBus type, virDomainDiskBus type,
unsigned int controller, unsigned int controller,
unsigned int bus,
unsigned int target,
unsigned int unit) unsigned int unit)
{ {
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
@ -5257,21 +5259,23 @@ virDomainDriveAddressIsUsedByDisk(const virDomainDef *def,
if (disk->info.addr.drive.controller == controller && if (disk->info.addr.drive.controller == controller &&
disk->info.addr.drive.unit == unit && disk->info.addr.drive.unit == unit &&
disk->info.addr.drive.bus == 0 && disk->info.addr.drive.bus == bus &&
disk->info.addr.drive.target == 0) disk->info.addr.drive.target == target)
return true; return true;
} }
return false; return false;
} }
/* Check if a drive type address $controller:0:0:$unit is already /* Check if a drive type address $controller:$target:$bus:$unit is already
* taken by a host device or not. * taken by a host device or not.
*/ */
static bool static bool
virDomainDriveAddressIsUsedByHostdev(const virDomainDef *def, virDomainDriveAddressIsUsedByHostdev(const virDomainDef *def,
virDomainHostdevSubsysType type, virDomainHostdevSubsysType type,
unsigned int controller, unsigned int controller,
unsigned int bus,
unsigned int target,
unsigned int unit) unsigned int unit)
{ {
virDomainHostdevDefPtr hostdev; virDomainHostdevDefPtr hostdev;
@ -5285,8 +5289,8 @@ virDomainDriveAddressIsUsedByHostdev(const virDomainDef *def,
if (hostdev->info->addr.drive.controller == controller && if (hostdev->info->addr.drive.controller == controller &&
hostdev->info->addr.drive.unit == unit && hostdev->info->addr.drive.unit == unit &&
hostdev->info->addr.drive.bus == 0 && hostdev->info->addr.drive.bus == bus &&
hostdev->info->addr.drive.target == 0) hostdev->info->addr.drive.target == target)
return true; return true;
} }
@ -5296,6 +5300,8 @@ virDomainDriveAddressIsUsedByHostdev(const virDomainDef *def,
static bool static bool
virDomainSCSIDriveAddressIsUsed(const virDomainDef *def, virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
unsigned int controller, unsigned int controller,
unsigned int bus,
unsigned int target,
unsigned int unit) unsigned int unit)
{ {
/* In current implementation, the maximum unit number of a controller /* In current implementation, the maximum unit number of a controller
@ -5305,9 +5311,10 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
return true; return true;
if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI, if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI,
controller, unit) || controller, bus, target, unit) ||
virDomainDriveAddressIsUsedByHostdev(def, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI, virDomainDriveAddressIsUsedByHostdev(def,
controller, unit)) VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI,
controller, bus, target, unit))
return true; return true;
return false; return false;
@ -5322,7 +5329,8 @@ virDomainControllerSCSINextUnit(const virDomainDef *def,
size_t i; size_t i;
for (i = 0; i < max_unit; i++) { for (i = 0; i < max_unit; i++) {
if (!virDomainSCSIDriveAddressIsUsed(def, controller, i)) /* Default to assigning addresses using bus = target = 0 */
if (!virDomainSCSIDriveAddressIsUsed(def, controller, 0, 0, i))
return i; return i;
} }