From: John Ferlan <jferlan@redhat.com>
Date: Tue, 4 Apr 2017 18:06:42 +0000 (-0400)
Subject: conf: Add check for non scsi_host parent during vport delete
X-Git-Tag: v3.2.1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5040c8daa53dfc2ef02e5038c87718e7bd59ffff;p=thirdparty%2Flibvirt.git

conf: Add check for non scsi_host parent during vport delete

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

$

(cherry picked from commit 84f178bdc7ab38011cc1f76759b0a41335285a4f)
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 330d5d92c5..d2ad6352b2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -2075,6 +2075,13 @@ virNodeDeviceDeleteVport(virConnectPtr conn,
         if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name)))
             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)
             goto cleanup;
     }