External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: make virDomainHostdevAssignAddress() void

Browse Source 
The function always returns zero, so it might as well be void.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Matt Coleman 2020-11-05 22:32:40 -05:00 committed by Michal Privoznik
parent 0f3cedc676
commit 93b13d49f3
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/conf/domain_conf.c
View File

@ -5016,7 +5016,7 @@ virDomainControllerSCSINextUnit(const virDomainDef *def,
#define SCSI_WIDE_BUS_MAX_CONT_UNIT 16 #define SCSI_WIDE_BUS_MAX_CONT_UNIT 16
#define SCSI_NARROW_BUS_MAX_CONT_UNIT 7 #define SCSI_NARROW_BUS_MAX_CONT_UNIT 7
static int static void
virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt,
const virDomainDef *def, const virDomainDef *def,
virDomainHostdevDefPtr hostdev) virDomainHostdevDefPtr hostdev)
@ -5054,8 +5054,6 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt,
hostdev->info->addr.drive.bus = 0; hostdev->info->addr.drive.bus = 0;
hostdev->info->addr.drive.target = 0; hostdev->info->addr.drive.target = 0;
hostdev->info->addr.drive.unit = next_unit; hostdev->info->addr.drive.unit = next_unit;
return 0;
} }
@ -5089,6 +5087,7 @@ virDomainHostdevDefPostParse(virDomainHostdevDefPtr dev,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
virDomainHostdevSubsysSCSIPtr scsisrc; virDomainHostdevSubsysSCSIPtr scsisrc;
virDomainDeviceDriveAddressPtr addr = NULL;
if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
return 0; return 0;
@ -5101,27 +5100,23 @@ virDomainHostdevDefPostParse(virDomainHostdevDefPtr dev,
virDomainPostParseCheckISCSIPath(&iscsisrc->src->path); virDomainPostParseCheckISCSIPath(&iscsisrc->src->path);
} }
if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
virDomainHostdevAssignAddress(xmlopt, def, dev) < 0) { virDomainHostdevAssignAddress(xmlopt, def, dev);
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Cannot assign SCSI host device address")); /* Ensure provided address doesn't conflict with existing
* scsi disk drive address
*/
addr = &dev->info->addr.drive;
if (virDomainDriveAddressIsUsedByDisk(def,
VIR_DOMAIN_DISK_BUS_SCSI,
addr)) {
virReportError(VIR_ERR_XML_ERROR,
_("SCSI host address controller='%u' "
"bus='%u' target='%u' unit='%u' in "
"use by a SCSI disk"),
addr->controller, addr->bus,
addr->target, addr->unit);
return -1; return -1;
} else {
/* Ensure provided address doesn't conflict with existing
* scsi disk drive address
*/
virDomainDeviceDriveAddressPtr addr = &dev->info->addr.drive;
if (virDomainDriveAddressIsUsedByDisk(def,
VIR_DOMAIN_DISK_BUS_SCSI,
addr)) {
virReportError(VIR_ERR_XML_ERROR,
_("SCSI host address controller='%u' "
"bus='%u' target='%u' unit='%u' in "
"use by a SCSI disk"),
addr->controller, addr->bus,
addr->target, addr->unit);
return -1;
}
} }
break; break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: {