Fix vPort management: FC vHBA creation

When creating a virtual FC HBA with virsh/libvirt API, an error message
will be returned: "error: Node device not found",
also the 'nodedev-dumpxml' shows wrong information of wwpn & wwnn
for the new created device.

Signed-off-by: xschen@tnsoft.com.cn
This reverts f90af69 which switched wwpn & wwwn in the wrong place.

https://www.kernel.org/doc/Documentation/scsi/scsi_fc_transport.txt
(cherry picked from commit 3c0d5e224c71cd85b123cd938eeb360502503cb0)

Conflicts:
	src/storage/storage_backend_scsi.c

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 87a97c9a0af656f7d8157824aa73845f9bf23e10..629e0c868ed7b0a829a550565f5f29c7f4ff6e1b 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -3551,8 +3551,8 @@ virManageVport(const int parent_host,
 
     if (virAsprintf(&vport_name,
                     "%s:%s",
-                    wwnn,
-                    wwpn) < 0) {
+                    wwpn,
+                    wwnn) < 0) {
         virReportOOMError();
         goto cleanup;
     }