Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
027986f5
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
027986f5
编写于
5月 13, 2016
作者:
J
John Ferlan
1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
iscsi: Remove initiatoriqn from virISCSIScanTargets
No longer necessary to have it, so remove it.
上级
56057900
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
4 addition
and
11 deletion
+4
-11
src/storage/storage_backend_iscsi.c
src/storage/storage_backend_iscsi.c
+2
-6
src/util/viriscsi.c
src/util/viriscsi.c
+1
-2
src/util/viriscsi.h
src/util/viriscsi.h
+0
-1
tests/viriscsitest.c
tests/viriscsitest.c
+1
-2
未找到文件。
src/storage/storage_backend_iscsi.c
浏览文件 @
027986f5
...
@@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
if
(
!
(
portal
=
virStorageBackendISCSIPortal
(
source
)))
if
(
!
(
portal
=
virStorageBackendISCSIPortal
(
source
)))
goto
cleanup
;
goto
cleanup
;
if
(
virISCSIScanTargets
(
portal
,
if
(
virISCSIScanTargets
(
portal
,
&
ntargets
,
&
targets
)
<
0
)
source
->
initiator
.
iqn
,
&
ntargets
,
&
targets
)
<
0
)
goto
cleanup
;
goto
cleanup
;
if
(
VIR_ALLOC_N
(
list
.
sources
,
ntargets
)
<
0
)
if
(
VIR_ALLOC_N
(
list
.
sources
,
ntargets
)
<
0
)
...
@@ -399,9 +397,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn,
...
@@ -399,9 +397,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn,
* iscsiadm doesn't let you login to a target, unless you've
* iscsiadm doesn't let you login to a target, unless you've
* first issued a 'sendtargets' command to the portal :-(
* first issued a 'sendtargets' command to the portal :-(
*/
*/
if
(
virISCSIScanTargets
(
portal
,
if
(
virISCSIScanTargets
(
portal
,
NULL
,
NULL
)
<
0
)
pool
->
def
->
source
.
initiator
.
iqn
,
NULL
,
NULL
)
<
0
)
goto
cleanup
;
goto
cleanup
;
if
(
virStorageBackendISCSISetAuth
(
portal
,
conn
,
&
pool
->
def
->
source
)
<
0
)
if
(
virStorageBackendISCSISetAuth
(
portal
,
conn
,
&
pool
->
def
->
source
)
<
0
)
...
...
src/util/viriscsi.c
浏览文件 @
027986f5
...
@@ -307,7 +307,7 @@ virISCSIConnection(const char *portal,
...
@@ -307,7 +307,7 @@ virISCSIConnection(const char *portal,
* portal. Without the sendtargets all that is received is a
* portal. Without the sendtargets all that is received is a
* "iscsiadm: No records found"
* "iscsiadm: No records found"
*/
*/
if
(
virISCSIScanTargets
(
portal
,
initiatoriqn
,
NULL
,
NULL
)
<
0
)
if
(
virISCSIScanTargets
(
portal
,
NULL
,
NULL
)
<
0
)
goto
cleanup
;
goto
cleanup
;
break
;
break
;
...
@@ -392,7 +392,6 @@ virISCSIGetTargets(char **const groups,
...
@@ -392,7 +392,6 @@ virISCSIGetTargets(char **const groups,
int
int
virISCSIScanTargets
(
const
char
*
portal
,
virISCSIScanTargets
(
const
char
*
portal
,
const
char
*
initiatoriqn
ATTRIBUTE_UNUSED
,
size_t
*
ntargetsret
,
size_t
*
ntargetsret
,
char
***
targetsret
)
char
***
targetsret
)
{
{
...
...
src/util/viriscsi.h
浏览文件 @
027986f5
...
@@ -49,7 +49,6 @@ virISCSIRescanLUNs(const char *session)
...
@@ -49,7 +49,6 @@ virISCSIRescanLUNs(const char *session)
int
int
virISCSIScanTargets
(
const
char
*
portal
,
virISCSIScanTargets
(
const
char
*
portal
,
const
char
*
initiatoriqn
,
size_t
*
ntargetsret
,
size_t
*
ntargetsret
,
char
***
targetsret
)
char
***
targetsret
)
ATTRIBUTE_NONNULL
(
1
)
ATTRIBUTE_RETURN_CHECK
;
ATTRIBUTE_NONNULL
(
1
)
ATTRIBUTE_RETURN_CHECK
;
...
...
tests/viriscsitest.c
浏览文件 @
027986f5
...
@@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data)
...
@@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data)
virCommandSetDryRun
(
NULL
,
testIscsiadmCb
,
NULL
);
virCommandSetDryRun
(
NULL
,
testIscsiadmCb
,
NULL
);
if
(
virISCSIScanTargets
(
info
->
portal
,
NULL
,
if
(
virISCSIScanTargets
(
info
->
portal
,
&
ntargets
,
&
targets
)
<
0
)
&
ntargets
,
&
targets
)
<
0
)
goto
cleanup
;
goto
cleanup
;
if
(
info
->
nexpected
!=
ntargets
)
{
if
(
info
->
nexpected
!=
ntargets
)
{
...
...
tester丶
🤺
@ssszwink
mentioned in commit
b73dc2e5
·
9月 10, 2020
mentioned in commit
b73dc2e5
mentioned in commit b73dc2e56b94aca38e5f7e1b5a5ca1ee583b739a
开关提交列表
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录