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

virHostdevPrepareSCSIVHostDevices: Simplify logic

Browse Source 
Couple of things happening in this patch:

1) We can mark the device we're adding onto active list as used
   way before - when adding it onto temporary list.

2) When actually moving device from a temporary helper list onto
   the list of active devices we check if the device isn't
   already there. The same check is performed by
   virSCSIVHostDeviceListAdd() later. Drop this duplicity.

3) The 'error' label is renamed to 'rollback' to reflect what it
   is actually doing. While in the rest of the code we don't
   allow random label names, this source file is different.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2019-06-15 09:37:18 +02:00
parent 35d61939bc
commit df07ccc6e1
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/util/virhostdev.c
View File

@ -1645,10 +1645,9 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
{ {
size_t i, j;
int count;
VIR_AUTOUNREF(virSCSIVHostDeviceListPtr) list = NULL; VIR_AUTOUNREF(virSCSIVHostDeviceListPtr) list = NULL;
virSCSIVHostDevicePtr host, tmp; virSCSIVHostDevicePtr tmp;
size_t i, j;
if (!nhostdevs) if (!nhostdevs)
return 0; return 0;
@ -1665,6 +1664,7 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
for (i = 0; i < nhostdevs; i++) { for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevDefPtr hostdev = hostdevs[i];
virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host;
VIR_AUTOPTR(virSCSIVHostDevice) host = NULL;
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST)
@ -1676,10 +1676,12 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn))) if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn)))
return -1; return -1;
if (virSCSIVHostDeviceListAdd(list, host) < 0) { if (virSCSIVHostDeviceSetUsedBy(host, drv_name, dom_name) < 0)
virSCSIVHostDeviceFree(host);
return -1; return -1;
}
if (virSCSIVHostDeviceListAdd(list, host) < 0)
return -1;
host = NULL;
} }
/* Loop 2: Mark devices in temporary list as used by @name /* Loop 2: Mark devices in temporary list as used by @name
@ -1687,27 +1689,15 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
* wrong, perform rollback. * wrong, perform rollback.
*/ */
virObjectLock(mgr->activeSCSIVHostHostdevs); virObjectLock(mgr->activeSCSIVHostHostdevs);
count = virSCSIVHostDeviceListCount(list);
for (i = 0; i < count; i++) { for (i = 0; i < virSCSIVHostDeviceListCount(list); i++) {
host = virSCSIVHostDeviceListGet(list, i); tmp = virSCSIVHostDeviceListGet(list, i);
if ((tmp = virSCSIVHostDeviceListFind(mgr->activeSCSIVHostHostdevs,
host))) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("SCSI_host device %s is already in use by "
"another domain"),
virSCSIVHostDeviceGetName(tmp));
goto error;
} else {
if (virSCSIVHostDeviceSetUsedBy(host, drv_name, dom_name) < 0)
goto error;
VIR_DEBUG("Adding %s to activeSCSIVHostHostdevs", VIR_DEBUG("Adding %s to activeSCSIVHostHostdevs",
virSCSIVHostDeviceGetName(host)); virSCSIVHostDeviceGetName(tmp));
if (virSCSIVHostDeviceListAdd(mgr->activeSCSIVHostHostdevs, host) < 0) if (virSCSIVHostDeviceListAdd(mgr->activeSCSIVHostHostdevs, tmp) < 0)
goto error; goto rollback;
}
} }
virObjectUnlock(mgr->activeSCSIVHostHostdevs); virObjectUnlock(mgr->activeSCSIVHostHostdevs);
@ -1722,7 +1712,8 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
} }
return 0; return 0;
error:
rollback:
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
tmp = virSCSIVHostDeviceListGet(list, i); tmp = virSCSIVHostDeviceListGet(list, i);
virSCSIVHostDeviceListSteal(mgr->activeSCSIVHostHostdevs, tmp); virSCSIVHostDeviceListSteal(mgr->activeSCSIVHostHostdevs, tmp);