Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
53161d7c
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,发现更多精彩内容 >>
提交
53161d7c
编写于
7月 19, 2006
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bulk replace 'informations' with 'information'
上级
16e2cc51
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
46 addition
and
41 deletion
+46
-41
ChangeLog
ChangeLog
+5
-0
src/libvirt.c
src/libvirt.c
+1
-1
src/proxy_internal.h
src/proxy_internal.h
+2
-2
src/virsh.c
src/virsh.c
+3
-3
src/virterror.c
src/virterror.c
+13
-13
src/xen_internal.c
src/xen_internal.c
+5
-5
src/xend_internal.c
src/xend_internal.c
+12
-12
src/xml.c
src/xml.c
+3
-3
src/xs_internal.c
src/xs_internal.c
+2
-2
未找到文件。
ChangeLog
浏览文件 @
53161d7c
Wed Jul 19 17:26:48 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/*.c: Bulk replace 'informations' with 'information' to
correct English spelling
Thu Jul 13 23:33:48 CEST 2006 Daniel Veillard <veillard@redhat.com>
* src/xml.c: applied patch from Peter Vetere to pass down the
...
...
src/libvirt.c
浏览文件 @
53161d7c
...
...
@@ -1396,7 +1396,7 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory)
* @info: pointer to a virDomainInfo structure allocated by the user
*
* Extract information about a domain. Note that if the connection
* used to get the domain is limited only a partial set of the information
s
* used to get the domain is limited only a partial set of the information
* can be extracted.
*
* Returns 0 in case of success and -1 in case of failure.
...
...
src/proxy_internal.h
浏览文件 @
53161d7c
...
...
@@ -76,8 +76,8 @@ struct _virProxyFullPacket {
union
{
char
str
[
4080
];
/* extra char array */
int
arg
[
1020
];
/* extra int array */
virDomainInfo
dinfo
;
/* domain information
s
*/
virNodeInfo
ninfo
;
/* node information
s
*/
virDomainInfo
dinfo
;
/* domain information */
virNodeInfo
ninfo
;
/* node information */
}
extra
;
};
typedef
struct
_virProxyFullPacket
virProxyFullPacket
;
...
...
src/virsh.c
浏览文件 @
53161d7c
...
...
@@ -231,7 +231,7 @@ static vshCmdInfo info_help[] = {
{
"syntax"
,
"help [<command>]"
},
{
"help"
,
"print help"
},
{
"desc"
,
"Prints global help or command specific help."
},
{
"version"
,
"Prints version
ning informations
."
},
{
"version"
,
"Prints version
information
."
},
{
NULL
,
NULL
}
};
...
...
@@ -833,7 +833,7 @@ cmdNodeinfo(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED)
static
vshCmdInfo
info_dumpxml
[]
=
{
{
"syntax"
,
"dumpxml <name>"
},
{
"help"
,
"domain information in XML"
},
{
"desc"
,
"Ouput the domain information
s
as an XML dump to stdout"
},
{
"desc"
,
"Ouput the domain information as an XML dump to stdout"
},
{
NULL
,
NULL
}
};
...
...
@@ -968,7 +968,7 @@ cmdDomuuid(vshControl * ctl, vshCmd * cmd)
static
vshCmdInfo
info_version
[]
=
{
{
"syntax"
,
"version"
},
{
"help"
,
"show versions"
},
{
"desc"
,
"Display the version information
s
available"
},
{
"desc"
,
"Display the version information available"
},
{
NULL
,
NULL
}
};
...
...
src/virterror.c
浏览文件 @
53161d7c
...
...
@@ -456,43 +456,43 @@ __virErrorMsg(virErrorNumber error, const char *info)
errmsg
=
"unknown OS type %s"
;
break
;
case
VIR_ERR_NO_KERNEL
:
errmsg
=
"missing kernel information
s
"
;
errmsg
=
"missing kernel information"
;
break
;
case
VIR_ERR_NO_ROOT
:
if
(
info
==
NULL
)
errmsg
=
"missing root device information
s
"
;
errmsg
=
"missing root device information"
;
else
errmsg
=
"missing root device information
s
in %s"
;
errmsg
=
"missing root device information in %s"
;
break
;
case
VIR_ERR_NO_SOURCE
:
if
(
info
==
NULL
)
errmsg
=
"missing source information
s
for device"
;
errmsg
=
"missing source information for device"
;
else
errmsg
=
"missing source information
s
for device %s"
;
errmsg
=
"missing source information for device %s"
;
break
;
case
VIR_ERR_NO_TARGET
:
if
(
info
==
NULL
)
errmsg
=
"missing target information
s
for device"
;
errmsg
=
"missing target information for device"
;
else
errmsg
=
"missing target information
s
for device %s"
;
errmsg
=
"missing target information for device %s"
;
break
;
case
VIR_ERR_NO_NAME
:
if
(
info
==
NULL
)
errmsg
=
"missing domain name information
s
"
;
errmsg
=
"missing domain name information"
;
else
errmsg
=
"missing domain name information
s
in %s"
;
errmsg
=
"missing domain name information in %s"
;
break
;
case
VIR_ERR_NO_OS
:
if
(
info
==
NULL
)
errmsg
=
"missing operating system information
s
"
;
errmsg
=
"missing operating system information"
;
else
errmsg
=
"missing operating system information
s
for %s"
;
errmsg
=
"missing operating system information for %s"
;
break
;
case
VIR_ERR_NO_DEVICE
:
if
(
info
==
NULL
)
errmsg
=
"missing devices information
s
"
;
errmsg
=
"missing devices information"
;
else
errmsg
=
"missing devices information
s
for %s"
;
errmsg
=
"missing devices information for %s"
;
break
;
case
VIR_ERR_DRIVER_FULL
:
if
(
info
==
NULL
)
...
...
src/xen_internal.c
浏览文件 @
53161d7c
...
...
@@ -582,9 +582,9 @@ xenHypervisorGetMaxMemory(virDomainPtr domain)
* xenHypervisorGetDomInfo:
* @conn: connection data
* @id: the domain ID
* @info: the place where information
s
should be stored
* @info: the place where information should be stored
*
* Do an hypervisor call to get the related set of domain information
s
.
* Do an hypervisor call to get the related set of domain information.
*
* Returns 0 in case of success, -1 in case of error.
*/
...
...
@@ -660,9 +660,9 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info)
/**
* xenHypervisorGetDomainInfo:
* @domain: pointer to the domain block
* @info: the place where information
s
should be stored
* @info: the place where information should be stored
*
* Do an hypervisor call to get the related set of domain information
s
.
* Do an hypervisor call to get the related set of domain information.
*
* Returns 0 in case of success, -1 in case of error.
*/
...
...
@@ -794,7 +794,7 @@ xenHypervisorSetMaxMemory(virDomainPtr domain, unsigned long memory)
/**
* xenHypervisorCheckID:
* @domain: pointer to the domain block
* @info: the place where information
s
should be stored
* @info: the place where information should be stored
*
* Do an hypervisor call to verify the domain ID is valid
*
...
...
src/xend_internal.c
浏览文件 @
53161d7c
...
...
@@ -443,7 +443,7 @@ xend_get(virConnectPtr xend, const char *path,
* xend_post:
* @xend: pointer to the Xen Daemon structure
* @path: the path used for the HTTP request
* @ops: the information
s
sent for the POST
* @ops: the information sent for the POST
* @content: the buffer to store the content
* @n_content: the size of the buffer
*
...
...
@@ -1105,20 +1105,20 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname,
value
=
sexpr_node
(
root
,
"domain/domid"
);
if
(
value
==
NULL
)
{
virXendError
(
xend
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing domid"
);
"domain information incomplete, missing domid"
);
goto
error
;
}
ret
=
strtol
(
value
,
NULL
,
0
);
if
((
ret
==
0
)
&&
(
value
[
0
]
!=
'0'
))
{
virXendError
(
xend
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incorrect domid not numberic"
);
"domain information incorrect domid not numberic"
);
ret
=
-
1
;
}
else
if
(
uuid
!=
NULL
)
{
char
**
ptr
=
(
char
**
)
&
uuid
;
if
(
sexpr_uuid
(
ptr
,
root
,
"domain/uuid"
)
==
NULL
)
{
virXendError
(
xend
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing uuid"
);
"domain information incomplete, missing uuid"
);
}
}
...
...
@@ -1158,7 +1158,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend,
name
=
sexpr_node
(
root
,
"domain/name"
);
if
(
name
==
NULL
)
{
virXendError
(
xend
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing name"
);
"domain information incomplete, missing name"
);
goto
error
;
}
if
(
domname
)
...
...
@@ -1167,7 +1167,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend,
dst_uuid
=
(
char
*
)
&
uuid
[
0
];
if
(
sexpr_uuid
(
&
dst_uuid
,
root
,
"domain/uuid"
)
==
NULL
)
{
virXendError
(
xend
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing uuid"
);
"domain information incomplete, missing uuid"
);
goto
error
;
}
...
...
@@ -1384,7 +1384,7 @@ xend_parse_sexp_desc_os(struct sexpr *node, virBufferPtr buf, int hvm)
tmp
=
sexpr_node
(
node
,
"domain/image/hvm/kernel"
);
if
(
tmp
==
NULL
)
{
virXendError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing kernel"
);
"domain information incomplete, missing kernel"
);
return
(
-
1
);
}
virBufferVSprintf
(
buf
,
" <loader>%s</loader>
\n
"
,
tmp
);
...
...
@@ -1407,7 +1407,7 @@ xend_parse_sexp_desc_os(struct sexpr *node, virBufferPtr buf, int hvm)
tmp
=
sexpr_node
(
node
,
"domain/image/linux/kernel"
);
if
(
tmp
==
NULL
)
{
virXendError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing kernel"
);
"domain information incomplete, missing kernel"
);
return
(
-
1
);
}
virBufferVSprintf
(
buf
,
" <kernel>%s</kernel>
\n
"
,
tmp
);
...
...
@@ -1461,7 +1461,7 @@ xend_parse_sexp_desc(struct sexpr *root)
tmp
=
sexpr_node
(
root
,
"domain/name"
);
if
(
tmp
==
NULL
)
{
virXendError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, missing name"
);
"domain information incomplete, missing name"
);
goto
error
;
}
virBufferVSprintf
(
&
buf
,
" <name>%s</name>
\n
"
,
tmp
);
...
...
@@ -1524,7 +1524,7 @@ xend_parse_sexp_desc(struct sexpr *root)
tmp
=
sexpr_node
(
node
,
"device/vbd/dev"
);
if
(
tmp
==
NULL
)
{
virXendError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, vbd has no dev"
);
"domain information incomplete, vbd has no dev"
);
goto
error
;
}
virBufferVSprintf
(
&
buf
,
" <target dev='%s'/>
\n
"
,
tmp
);
...
...
@@ -1539,7 +1539,7 @@ xend_parse_sexp_desc(struct sexpr *root)
tmp
=
sexpr_node
(
node
,
"device/vbd/dev"
);
if
(
tmp
==
NULL
)
{
virXendError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"domain information
s
incomplete, vbd has no dev"
);
"domain information incomplete, vbd has no dev"
);
goto
error
;
}
virBufferVSprintf
(
&
buf
,
" <target dev='%s'/>
\n
"
,
tmp
);
...
...
@@ -1748,7 +1748,7 @@ sexpr_to_domain(virConnectPtr conn, struct sexpr *root)
error:
virXendError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"failed to parse Xend domain information
s
"
);
"failed to parse Xend domain information"
);
if
(
ret
!=
NULL
)
virFreeDomain
(
conn
,
ret
);
return
(
NULL
);
...
...
src/xml.c
浏览文件 @
53161d7c
...
...
@@ -246,7 +246,7 @@ virDomainGetXMLDeviceInfo(virDomainPtr domain, const char *sub,
* @buf: the output buffer object
* @dev: the xenstrore internal device number
*
* Extract and dump in the buffer information
s
on the device used by the domain
* Extract and dump in the buffer information on the device used by the domain
*
* Returns 0 in case of success, -1 in case of failure
*/
...
...
@@ -357,7 +357,7 @@ virDomainGetXMLDevices(virDomainPtr domain, virBufferPtr buf)
* @buf: the output buffer object
* @dev: the xenstrore internal device number
*
* Extract and dump in the buffer information
s
on the interface used by
* Extract and dump in the buffer information on the interface used by
* the domain
*
* Returns 0 in case of success, -1 in case of failure
...
...
@@ -457,7 +457,7 @@ virDomainGetXMLInterfaces(virDomainPtr domain, virBufferPtr buf)
* @domain: a domain object
* @buf: the output buffer object
*
* Extract the boot information
s
used to start that domain
* Extract the boot information used to start that domain
*
* Returns 0 in case of success, -1 in case of failure
*/
...
...
src/xs_internal.c
浏览文件 @
53161d7c
...
...
@@ -327,9 +327,9 @@ xenStoreClose(virConnectPtr conn)
/**
* xenStoreGetDomainInfo:
* @domain: pointer to the domain block
* @info: the place where information
s
should be stored
* @info: the place where information should be stored
*
* Do an hypervisor call to get the related set of domain information
s
.
* Do an hypervisor call to get the related set of domain information.
*
* Returns 0 in case of success, -1 in case of error.
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录