From 3c0d5e224c71cd85b123cd938eeb360502503cb0 Mon Sep 17 00:00:00 2001 From: Dennis Chen 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 --- src/storage/storage_backend_scsi.c | 8 ++++---- src/util/virutil.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 285c5cbf10..3decedaa9f 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -659,8 +659,8 @@ createVport(virStoragePoolSourceAdapter adapter) if (getHostNumber(adapter.data.fchost.parent, &parent_host) < 0) return -1; - if (virManageVport(parent_host, adapter.data.fchost.wwnn, - adapter.data.fchost.wwpn, VPORT_CREATE) < 0) + if (virManageVport(parent_host, adapter.data.fchost.wwpn, + adapter.data.fchost.wwnn, VPORT_CREATE) < 0) return -1; virFileWaitForDevices(); @@ -682,8 +682,8 @@ deleteVport(virStoragePoolSourceAdapter adapter) if (getHostNumber(adapter.data.fchost.parent, &parent_host) < 0) return -1; - if (virManageVport(parent_host, adapter.data.fchost.wwnn, - adapter.data.fchost.wwpn, VPORT_DELETE) < 0) + if (virManageVport(parent_host, adapter.data.fchost.wwpn, + adapter.data.fchost.wwnn, VPORT_DELETE) < 0) return -1; return 0; diff --git a/src/util/virutil.c b/src/util/virutil.c index 6fa0212e94..569d035182 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1792,8 +1792,8 @@ virManageVport(const int parent_host, if (virAsprintf(&vport_name, "%s:%s", - wwnn, - wwpn) < 0) { + wwpn, + wwnn) < 0) { virReportOOMError(); goto cleanup; }