External/libvirt
1
0
Fork 0
Code

conf: Add check for non scsi_host parent during vport delete

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1420740

If the parent is not a scsi_host, then we can just happily return since
we won't be removing a vport.

Fixes a bug with the following output:

$ virsh pool-destroy host4_hba_pool
error: Failed to destroy pool host4_hba_pool
error: internal error: Invalid adapter name 'pci_0000_10_00_1' for SCSI pool

$
This commit is contained in:
John Ferlan 2017-04-04 14:06:42 -04:00
parent 4143b194ce
commit 84f178bdc7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/node_device_conf.c
View File

@ -2075,6 +2075,13 @@ virNodeDeviceDeleteVport(virConnectPtr conn,
if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name)))
goto cleanup; goto cleanup;
/* If the parent is not a scsi_host, then this is a pool backed
* directly to an HBA and there's no vHBA to remove - so we're done */
if (!STRPREFIX(vhba_parent, "scsi_host")) {
ret = 0;
goto cleanup;
}
if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0)
goto cleanup; goto cleanup;
} }