Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
705519d8
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,发现更多精彩内容 >>
提交
705519d8
编写于
4月 22, 2011
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remote: Rename 'nameslen' to the common 'maxnames'
Avoids special case handling in the remote generator.
上级
9a74649c
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
14 addition
and
14 deletion
+14
-14
daemon/remote.c
daemon/remote.c
+4
-4
src/remote/remote_driver.c
src/remote/remote_driver.c
+6
-6
src/remote/remote_protocol.c
src/remote/remote_protocol.c
+1
-1
src/remote/remote_protocol.h
src/remote/remote_protocol.h
+1
-1
src/remote/remote_protocol.x
src/remote/remote_protocol.x
+1
-1
src/remote_protocol-structs
src/remote_protocol-structs
+1
-1
未找到文件。
daemon/remote.c
浏览文件 @
705519d8
...
...
@@ -3796,9 +3796,9 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS
goto
cleanup
;
}
if
(
args
->
nameslen
>
REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX
)
{
if
(
args
->
maxnames
>
REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX
)
{
virNetError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"
nameslen
> REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX"
));
_
(
"
maxnames
> REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX"
));
goto
cleanup
;
}
...
...
@@ -3806,14 +3806,14 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS
goto
cleanup
;
/* Allocate return buffer. */
if
(
VIR_ALLOC_N
(
ret
->
names
.
names_val
,
args
->
nameslen
)
<
0
)
{
if
(
VIR_ALLOC_N
(
ret
->
names
.
names_val
,
args
->
maxnames
)
<
0
)
{
virReportOOMError
();
goto
cleanup
;
}
len
=
virDomainSnapshotListNames
(
dom
,
ret
->
names
.
names_val
,
args
->
nameslen
,
args
->
maxnames
,
args
->
flags
);
if
(
len
<
0
)
goto
cleanup
;
...
...
src/remote/remote_driver.c
浏览文件 @
705519d8
...
...
@@ -9312,7 +9312,7 @@ done:
static
int
remoteDomainSnapshotListNames
(
virDomainPtr
domain
,
char
**
const
names
,
int
nameslen
,
unsigned
int
flags
)
int
maxnames
,
unsigned
int
flags
)
{
int
rv
=
-
1
;
int
i
;
...
...
@@ -9322,15 +9322,15 @@ remoteDomainSnapshotListNames (virDomainPtr domain, char **const names,
remoteDriverLock
(
priv
);
if
(
nameslen
>
REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX
)
{
if
(
maxnames
>
REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX
)
{
remoteError
(
VIR_ERR_RPC
,
_
(
"too many remote domain snapshot names: %d > %d"
),
nameslen
,
REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX
);
maxnames
,
REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX
);
goto
done
;
}
make_nonnull_domain
(
&
args
.
dom
,
domain
);
args
.
nameslen
=
nameslen
;
args
.
maxnames
=
maxnames
;
args
.
flags
=
flags
;
memset
(
&
ret
,
0
,
sizeof
ret
);
...
...
@@ -9339,10 +9339,10 @@ remoteDomainSnapshotListNames (virDomainPtr domain, char **const names,
(
xdrproc_t
)
xdr_remote_domain_snapshot_list_names_ret
,
(
char
*
)
&
ret
)
==
-
1
)
goto
done
;
if
(
ret
.
names
.
names_len
>
nameslen
)
{
if
(
ret
.
names
.
names_len
>
maxnames
)
{
remoteError
(
VIR_ERR_RPC
,
_
(
"too many remote domain snapshots: %d > %d"
),
ret
.
names
.
names_len
,
nameslen
);
ret
.
names
.
names_len
,
maxnames
);
goto
cleanup
;
}
...
...
src/remote/remote_protocol.c
浏览文件 @
705519d8
...
...
@@ -3756,7 +3756,7 @@ xdr_remote_domain_snapshot_list_names_args (XDR *xdrs, remote_domain_snapshot_li
if
(
!
xdr_remote_nonnull_domain
(
xdrs
,
&
objp
->
dom
))
return
FALSE
;
if
(
!
xdr_int
(
xdrs
,
&
objp
->
nameslen
))
if
(
!
xdr_int
(
xdrs
,
&
objp
->
maxnames
))
return
FALSE
;
if
(
!
xdr_int
(
xdrs
,
&
objp
->
flags
))
return
FALSE
;
...
...
src/remote/remote_protocol.h
浏览文件 @
705519d8
...
...
@@ -2119,7 +2119,7 @@ typedef struct remote_domain_snapshot_num_ret remote_domain_snapshot_num_ret;
struct
remote_domain_snapshot_list_names_args
{
remote_nonnull_domain
dom
;
int
nameslen
;
int
maxnames
;
int
flags
;
};
typedef
struct
remote_domain_snapshot_list_names_args
remote_domain_snapshot_list_names_args
;
...
...
src/remote/remote_protocol.x
浏览文件 @
705519d8
...
...
@@ -1874,7 +1874,7 @@ struct remote_domain_snapshot_num_ret {
struct
remote_domain_snapshot_list_names_args
{
remote_nonnull_domain
dom
;
int
nameslen
;
int
maxnames
;
int
flags
;
};
...
...
src/remote_protocol-structs
浏览文件 @
705519d8
...
...
@@ -1371,7 +1371,7 @@ struct remote_domain_snapshot_num_ret {
};
struct
remote_domain_snapshot_list_names_args
{
remote_nonnull_domain
dom
;
int
nameslen
;
int
maxnames
;
int
flags
;
};
struct
remote_domain_snapshot_list_names_ret
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录