From 187ed9000da34f288ea9100e252f4042092edf83 Mon Sep 17 00:00:00 2001
From: Dennis Chen <xschen@tnsoft.com.cn>
Date: Fri, 28 Jun 2013 11:59:51 +0200
Subject: [PATCH] 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
---
 src/util/virutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 87a97c9a0a..629e0c868e 100644
--- 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;
     }
-- 
GitLab