Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
524ba58b
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,发现更多精彩内容 >>
提交
524ba58b
编写于
12月 30, 2011
作者:
Y
Yuri Chornoivan
提交者:
Eric Blake
1月 03, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typos in messages.
https://bugzilla.redhat.com/show_bug.cgi?id=770954
上级
66ca7ce5
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
28 addition
and
27 deletion
+28
-27
AUTHORS
AUTHORS
+1
-0
docs/news.html.in
docs/news.html.in
+1
-1
src/conf/domain_conf.c
src/conf/domain_conf.c
+1
-1
src/esx/esx_storage_driver.c
src/esx/esx_storage_driver.c
+1
-1
src/libvirt.c
src/libvirt.c
+3
-3
src/qemu/qemu_domain.c
src/qemu/qemu_domain.c
+1
-1
src/qemu/qemu_monitor_json.c
src/qemu/qemu_monitor_json.c
+10
-10
src/test/test_driver.c
src/test/test_driver.c
+1
-1
src/util/virnetdev.c
src/util/virnetdev.c
+4
-4
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+1
-1
tools/virsh.c
tools/virsh.c
+4
-4
未找到文件。
AUTHORS
浏览文件 @
524ba58b
...
...
@@ -213,6 +213,7 @@ Patches have also been contributed by:
Prerna Saxena <prerna@linux.vnet.ibm.com>
Michael Ellerman <michael@ellerman.id.au>
Rommer <rommer@active.by>
Yuri Chornoivan <yurchor@ukr.net>
[....send patches to get your name here....]
...
...
docs/news.html.in
浏览文件 @
524ba58b
...
...
@@ -7337,7 +7337,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a>
from virsh (Saori Fukuta), Coverage files (Daniel Berrange),
Solaris fixes (Mark Johnson), avoid [r]index calls (Richard Jones),
release information in Xen backend, virsh cpupin command cleanups
(Masayuki Sunou), xen:/// supp
p
ort as standard Xen URI (Richard Jones and
(Masayuki Sunou), xen:/// support as standard Xen URI (Richard Jones and
Daniel Berrange), improve driver selection/decline mechanism (Richard
Jones), error reporting on XML dump (Richard Jones), Remove unused
virDomainKernel structure (Richard Jones), daemon event loop event
...
...
src/conf/domain_conf.c
浏览文件 @
524ba58b
...
...
@@ -2941,7 +2941,7 @@ virDomainDiskDefParseXML(virCapsPtr caps,
if
(
authUUID
!=
NULL
&&
authUsage
!=
NULL
)
{
virDomainReportError
(
VIR_ERR_XML_ERROR
,
_
(
"only one of uuid and usage can be specfied"
));
_
(
"only one of uuid and usage can be spec
i
fied"
));
goto
error
;
}
if
(
authUUID
!=
NULL
)
{
...
...
src/esx/esx_storage_driver.c
浏览文件 @
524ba58b
...
...
@@ -834,7 +834,7 @@ esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key)
if
(
!
priv
->
primary
->
hasQueryVirtualDiskUuid
)
{
ESX_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"QueryVirtualDiskUuid not av
ia
lable, cannot lookup storage "
_
(
"QueryVirtualDiskUuid not av
ai
lable, cannot lookup storage "
"volume by UUID"
));
return
NULL
;
}
...
...
src/libvirt.c
浏览文件 @
524ba58b
...
...
@@ -1025,7 +1025,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char *
safe
=
strspn
(
entry
->
str
,
URI_ALIAS_CHARS
);
if
(
safe
<
(
offset
-
entry
->
str
))
{
virLibConnError
(
VIR_ERR_CONF_SYNTAX
,
_
(
"Malformed 'uri_aliases' config entry '%s', aliases may only contain
er
'a-Z, 0-9, _, -'"
),
_
(
"Malformed 'uri_aliases' config entry '%s', aliases may only contain 'a-Z, 0-9, _, -'"
),
entry
->
str
);
return
-
1
;
}
...
...
@@ -10659,10 +10659,10 @@ virInterfaceFree(virInterfacePtr iface)
* @conn: pointer to hypervisor connection
* @flags: flags, not used yet
*
* This function
s
creates a restore point to which one can return
* This function creates a restore point to which one can return
* later by calling virInterfaceChangeRollback(). This function should
* be called before any transaction with interface configuration.
* Once
knowing, new configuration works, it can be commi
ted via
* Once
it is known that a new configuration works, it can be commit
ted via
* virInterfaceChangeCommit(), which frees the restore point.
*
* If virInterfaceChangeBegin() is called when a transaction is
...
...
src/qemu/qemu_domain.c
浏览文件 @
524ba58b
...
...
@@ -892,7 +892,7 @@ qemuDomainObjEnterMonitorInternal(struct qemud_driver *driver,
if
(
asyncJob
!=
QEMU_ASYNC_JOB_NONE
)
{
if
(
asyncJob
!=
priv
->
job
.
asyncJob
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"une
px
ected async job %d"
),
asyncJob
);
_
(
"une
xp
ected async job %d"
),
asyncJob
);
return
-
1
;
}
if
(
qemuDomainObjBeginJobInternal
(
driver
,
driver_locked
,
obj
,
...
...
src/qemu/qemu_monitor_json.c
浏览文件 @
524ba58b
...
...
@@ -2338,7 +2338,7 @@ int qemuMonitorJSONAddUSBDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
const
char
*
path
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"usb_add not supp
p
orted in JSON mode"
));
_
(
"usb_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2348,7 +2348,7 @@ int qemuMonitorJSONAddUSBDeviceExact(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
int
dev
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"usb_add not supp
p
orted in JSON mode"
));
_
(
"usb_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2358,7 +2358,7 @@ int qemuMonitorJSONAddUSBDeviceMatch(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
int
product
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"usb_add not supp
p
orted in JSON mode"
));
_
(
"usb_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2368,7 +2368,7 @@ int qemuMonitorJSONAddPCIHostDevice(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress
*
guestAddr
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pci_add not supp
p
orted in JSON mode"
));
_
(
"pci_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2379,7 +2379,7 @@ int qemuMonitorJSONAddPCIDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress
*
guestAddr
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pci_add not supp
p
orted in JSON mode"
));
_
(
"pci_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2389,7 +2389,7 @@ int qemuMonitorJSONAddPCINetwork(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress
*
guestAddr
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pci_add not supp
p
orted in JSON mode"
));
_
(
"pci_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2398,7 +2398,7 @@ int qemuMonitorJSONRemovePCIDevice(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress
*
guestAddr
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pci_del not supp
p
orted in JSON mode"
));
_
(
"pci_del not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2655,7 +2655,7 @@ int qemuMonitorJSONAttachPCIDiskController(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress
*
guestAddr
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pci_add not supp
p
orted in JSON mode"
));
_
(
"pci_add not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -2732,7 +2732,7 @@ int qemuMonitorJSONGetAllPCIAddresses(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
qemuMonitorPCIAddress
**
addrs
ATTRIBUTE_UNUSED
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"query-pci not supp
p
orted in JSON mode"
));
_
(
"query-pci not supported in JSON mode"
));
return
-
1
;
}
...
...
@@ -3196,7 +3196,7 @@ static int qemuMonitorJSONGetBlockJobInfo(virJSONValuePtr reply,
if
(
data
->
type
!=
VIR_JSON_TYPE_ARRAY
)
{
qemuReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"urecognized format of block job information"
));
_
(
"u
n
recognized format of block job information"
));
return
-
1
;
}
...
...
src/test/test_driver.c
浏览文件 @
524ba58b
...
...
@@ -3555,7 +3555,7 @@ static int testInterfaceChangeCommit(virConnectPtr conn,
if
(
!
privconn
->
transaction_running
)
{
testError
(
VIR_ERR_OPERATION_INVALID
,
_
(
"no transaction running, "
"nothing to be commited."
));
"nothing to be commit
t
ed."
));
goto
cleanup
;
}
...
...
src/util/virnetdev.c
浏览文件 @
524ba58b
...
...
@@ -900,7 +900,7 @@ int virNetDevValidateConfig(const char *ifname,
goto
cleanup
;
}
virReportSystemError
(
errno
,
_
(
"coud not get MAC address of interface %s"
),
_
(
"cou
l
d not get MAC address of interface %s"
),
ifname
);
goto
cleanup
;
}
...
...
@@ -1060,7 +1060,7 @@ int
virNetDevIsVirtualFunction
(
const
char
*
ifname
ATTRIBUTE_UNUSED
)
{
virReportSystemError
(
ENOSYS
,
"%s"
,
_
(
"Unable to check virtual function status on this platfor
n
m"
));
_
(
"Unable to check virtual function status on this platform"
));
return
-
1
;
}
...
...
@@ -1070,7 +1070,7 @@ virNetDevGetVirtualFunctionIndex(const char *pfname ATTRIBUTE_UNUSED,
int
*
vf_index
ATTRIBUTE_UNUSED
)
{
virReportSystemError
(
ENOSYS
,
"%s"
,
_
(
"Unable to get virtual function index on this platfor
n
m"
));
_
(
"Unable to get virtual function index on this platform"
));
return
-
1
;
}
...
...
@@ -1079,7 +1079,7 @@ virNetDevGetPhysicalFunction(const char *ifname ATTRIBUTE_UNUSED,
char
**
pfname
ATTRIBUTE_UNUSED
)
{
virReportSystemError
(
ENOSYS
,
"%s"
,
_
(
"Unable to get physical function status on this platfor
n
m"
));
_
(
"Unable to get physical function status on this platform"
));
return
-
1
;
}
#endif
/* !__linux__ */
src/vbox/vbox_tmpl.c
浏览文件 @
524ba58b
...
...
@@ -948,7 +948,7 @@ static int vboxExtractVersion(vboxGlobalData *data) {
if
(
ret
!=
0
)
vboxError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Cou
n
d not extract VirtualBox version"
));
_
(
"Cou
l
d not extract VirtualBox version"
));
return
ret
;
}
...
...
tools/virsh.c
浏览文件 @
524ba58b
...
...
@@ -1803,7 +1803,7 @@ cleanup:
*/
static const vshCmdInfo info_dommemstat[] = {
{"help", N_("get memory statistics for a domain")},
{"desc", N_("Get memory statistics for a runnng domain.")},
{"desc", N_("Get memory statistics for a runn
i
ng domain.")},
{NULL,NULL}
};
...
...
@@ -6774,7 +6774,7 @@ static const vshCmdInfo info_block_job[] = {
static const vshCmdOptDef opts_block_job[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
{"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")},
{"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the spe
fic
ied disk")},
{"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the spe
cif
ied disk")},
{"info", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Get active job information for the specified disk")},
{"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Set the Bandwidth limit in MB/s")},
{NULL, 0, 0, NULL}
...
...
@@ -8125,7 +8125,7 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd)
*/
static const vshCmdInfo info_interface_begin[] = {
{"help", N_("create a snapshot of current interfaces settings, "
"which can be later commited (iface-commit) or "
"which can be later commit
t
ed (iface-commit) or "
"restored (iface-rollback)")},
{"desc", N_("Create a restore point for interfaces settings")},
{NULL, NULL}
...
...
@@ -8508,7 +8508,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd)
}
if ((if_node = virXPathNode("./bridge/interface[2]", ctxt))) {
vshError(ctl, "%s", _("Multiple interfa
ec
s attached to bridge"));
vshError(ctl, "%s", _("Multiple interfa
ce
s attached to bridge"));
goto cleanup;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录