Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
149c87b4
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看板
提交
149c87b4
编写于
10月 11, 2012
作者:
J
Ján Tomko
提交者:
Peter Krempa
10月 12, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Various typos and misspellings
上级
36f7dbf4
变更
39
隐藏空白更改
内联
并排
Showing
39 changed file
with
67 addition
and
67 deletion
+67
-67
HACKING
HACKING
+1
-1
configure.ac
configure.ac
+1
-1
daemon/libvirtd.conf
daemon/libvirtd.conf
+2
-2
daemon/stream.c
daemon/stream.c
+1
-1
docs/api.html.in
docs/api.html.in
+2
-2
docs/apibuild.py
docs/apibuild.py
+1
-1
docs/apps.html.in
docs/apps.html.in
+1
-1
docs/firewall.html.in
docs/firewall.html.in
+1
-1
docs/formatdomain.html.in
docs/formatdomain.html.in
+1
-1
docs/hacking.html.in
docs/hacking.html.in
+3
-3
docs/internals/locking.html.in
docs/internals/locking.html.in
+1
-1
docs/remote.html.in
docs/remote.html.in
+1
-1
examples/domain-events/events-python/event-test.py
examples/domain-events/events-python/event-test.py
+2
-2
examples/python/dominfo.py
examples/python/dominfo.py
+1
-1
include/libvirt/libvirt.h.in
include/libvirt/libvirt.h.in
+3
-3
src/conf/domain_conf.c
src/conf/domain_conf.c
+3
-3
src/conf/nwfilter_conf.c
src/conf/nwfilter_conf.c
+1
-1
src/internal.h
src/internal.h
+1
-1
src/libvirt.c
src/libvirt.c
+2
-2
src/phyp/phyp_driver.c
src/phyp/phyp_driver.c
+3
-3
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.c
+1
-1
src/qemu/qemu_conf.c
src/qemu/qemu_conf.c
+1
-1
src/qemu/qemu_monitor_text.c
src/qemu/qemu_monitor_text.c
+1
-1
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+1
-1
src/rpc/virnetsaslcontext.c
src/rpc/virnetsaslcontext.c
+1
-1
src/rpc/virnettlscontext.c
src/rpc/virnettlscontext.c
+1
-1
src/storage/storage_backend_disk.c
src/storage/storage_backend_disk.c
+5
-5
src/storage/storage_backend_rbd.c
src/storage/storage_backend_rbd.c
+1
-1
src/uml/uml_driver.c
src/uml/uml_driver.c
+1
-1
src/util/cgroup.c
src/util/cgroup.c
+2
-2
src/util/logging.c
src/util/logging.c
+2
-2
src/util/processinfo.c
src/util/processinfo.c
+2
-2
src/util/virpidfile.c
src/util/virpidfile.c
+2
-2
src/util/virsocketaddr.c
src/util/virsocketaddr.c
+2
-2
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+2
-2
src/xen/xm_internal.c
src/xen/xm_internal.c
+4
-4
src/xenxs/xen_sxpr.c
src/xenxs/xen_sxpr.c
+1
-1
tests/virnettlscontexttest.c
tests/virnettlscontexttest.c
+1
-1
tools/virsh.pod
tools/virsh.pod
+4
-4
未找到文件。
HACKING
浏览文件 @
149c87b4
...
...
@@ -461,7 +461,7 @@ File handling
=============
Usage of the "fdopen()", "close()", "fclose()" APIs is deprecated in libvirt
code base to help avoiding double-closing of files or file descriptors, which
is particular
y dangerous in a multi-threaded applications
. Instead of these
is particular
ly dangerous in a multi-threaded application
. Instead of these
APIs, use the macros from virfile.h
- Open a file from a file descriptor:
...
...
configure.ac
浏览文件 @
149c87b4
...
...
@@ -1351,7 +1351,7 @@ if test "x$with_avahi" = "xyes" || test "x$with_avahi" = "xcheck"; then
])
if test "x$with_avahi" = "xyes" ; then
AC_DEFINE_UNQUOTED([HAVE_AVAHI], 1,
[whether Avahi is used to broadcast server presen
s
e])
[whether Avahi is used to broadcast server presen
c
e])
fi
fi
AC_SUBST([AVAHI_CFLAGS])
...
...
daemon/libvirtd.conf
浏览文件 @
149c87b4
...
...
@@ -251,7 +251,7 @@
# The minimum limit sets the number of workers to start up
# initially. If the number of active clients exceeds this,
# then more threads are spawned, upto max_workers limit.
# then more threads are spawned, up
to max_workers limit.
# Typically you'd want max_workers to equal maximum number
# of clients allowed
#min_workers = 5
...
...
@@ -267,7 +267,7 @@
# at least as large as max_workers. Beyond this, RPC requests
# will be read into memory and queued. This directly impact
# memory usage, currently each request requires 256 KB of
# memory. So by default upto 5 MB of memory is used
# memory. So by default up
to 5 MB of memory is used
#
# XXX this isn't actually enforced yet, only the per-client
# limit is used so far
...
...
daemon/stream.c
浏览文件 @
149c87b4
...
...
@@ -689,7 +689,7 @@ daemonStreamHandleWrite(virNetServerClientPtr client,
/*
* Invoked when a stream is signalled as having data
* available to read. This reads upto one message
* available to read. This reads up
to one message
* worth of data, and then queues that for transmission
* to the client.
*
...
...
docs/api.html.in
浏览文件 @
149c87b4
...
...
@@ -64,13 +64,13 @@
<p>
Most kind of object can also be named in various ways:
</p>
<ul>
<li>
by their
<code>
name
</code>
, an user friendly identifier but
whose unicity cannot be garanteed between two nodes.
</li>
whose unicity cannot be g
u
aranteed between two nodes.
</li>
<li>
by their
<code>
ID
</code>
, which is a runtime unique identifier
provided by the hypervisor for one given activation of the object,
but it becomes invalid once the resource is deactivated.
</li >
<li>
by their
<code>
UUID
</code>
, a 16 bytes unique identifier
as defined in
<a
href=
"http://www.ietf.org/rfc/rfc4122.txt"
>
RFC 4122
</a>
,
which is garanteed to be unique for long term usage and across a
which is g
u
aranteed to be unique for long term usage and across a
set of nodes.
</li>
</ul>
...
...
docs/apibuild.py
浏览文件 @
149c87b4
...
...
@@ -2474,7 +2474,7 @@ class docBuilder:
def
rebuild
(
name
):
if
name
not
in
[
"libvirt"
,
"libvirt-qemu"
]:
self
.
warning
(
"rebuild() failed, unkown module %s"
)
%
name
self
.
warning
(
"rebuild() failed, unk
n
own module %s"
)
%
name
return
None
builder
=
None
srcdir
=
os
.
environ
[
"srcdir"
]
...
...
docs/apps.html.in
浏览文件 @
149c87b4
...
...
@@ -188,7 +188,7 @@
A general purpose desktop management tool, able to manage
virtual machines across both local and remotely accessed
hypervisors. It is targeted at home and small office usage
upto managing 10-20 hosts and their VMs.
up
to managing 10-20 hosts and their VMs.
</dd>
<dt><a
href=
"http://virt-manager.org/"
>
virt-viewer
</a></dt>
<dd>
...
...
docs/firewall.html.in
浏览文件 @
149c87b4
...
...
@@ -317,7 +317,7 @@ Bridge chain: PREROUTING, entries: 1, policy: ACCEPT
Bridge chain: POSTROUTING, entries: 1, policy: ACCEPT
-o vnet0 -j libvirt-O-vnet0
</pre>
<p>
To keep things managable and easy to follow, the driver will then
<p>
To keep things manag
e
able and easy to follow, the driver will then
create further sub-chains for each protocol then it needs to match
against:
</p>
...
...
docs/formatdomain.html.in
浏览文件 @
149c87b4
...
...
@@ -425,7 +425,7 @@
<dd>
The optional
<code>
emulatorpin
</code>
element specifies which of host
physical CPUs the "emulator", a subset of a domain not including vcpu,
will be pinned to. If this is om
m
itted, "emulator" is pinned to all
will be pinned to. If this is omitted, "emulator" is pinned to all
the physical CPUs by default. It contains one required attribute
<code>
cpuset
</code>
specifying which physical CPUs to pin to.
</dd>
...
...
docs/hacking.html.in
浏览文件 @
149c87b4
...
...
@@ -18,7 +18,7 @@
or:
</p>
<pre>
git diff
>
libvirt-myfeature.patch
git diff
>
libvirt-myfeature.patch
</pre>
<p>
However, the usual workflow of libvirt developer is:
</p>
<pre>
...
...
@@ -554,8 +554,8 @@
<p>
Usage of the
<code>
fdopen()
</code>
,
<code>
close()
</code>
,
<code>
fclose()
</code>
APIs is deprecated in libvirt code base to help avoiding double-closing of files
or file descriptors, which is particulary dangerous in a multi-threaded
application
s
. Instead of these APIs, use the macros from virfile.h
or file descriptors, which is particular
l
y dangerous in a multi-threaded
application. Instead of these APIs, use the macros from virfile.h
</p>
<ul>
...
...
docs/internals/locking.html.in
浏览文件 @
149c87b4
...
...
@@ -150,7 +150,7 @@
<h2><a
name=
"usagePatterns"
>
Lock usage patterns
</a></h2>
<p>
The following ps
ue
do code illustrates the common
The following ps
eu
do code illustrates the common
patterns of operations invoked on the lock
manager plugin callbacks.
</p>
...
...
docs/remote.html.in
浏览文件 @
149c87b4
...
...
@@ -356,7 +356,7 @@ Note that parameter values must be
</td>
<td>
libssh2
</td>
<td>
Path to the known_hosts file to verify the host key agains. LibSSH2
Path to the known_hosts file to verify the host key agains
t
. LibSSH2
supports OpenSSH-style known_hosts files, although it does not support
all key types, so using files created by the OpenSSH binary may result
into truncating the known_hosts file. It's recommended to use the default
...
...
examples/domain-events/events-python/event-test.py
浏览文件 @
149c87b4
...
...
@@ -126,7 +126,7 @@ class virEventLoopPure:
self
.
poll
.
register
(
self
.
pipetrick
[
0
],
select
.
POLLIN
)
# Calculate when the next timeout is due to occur
r
, returning
# Calculate when the next timeout is due to occur, returning
# the absolute timestamp for the next timeout, or 0 if there is
# no timeout due
def
next_timeout
(
self
):
...
...
@@ -169,7 +169,7 @@ class virEventLoopPure:
#
# Due to the coarse granularity of schedular timeslices, if
# we ask for a sleep of 500ms in order to satisfy a timer, we
# may return upto 1 schedular timeslice early. So even though
# may return up
to 1 schedular timeslice early. So even though
# our sleep timeout was reached, the registered timer may not
# technically be at its expiry point. This leads to us going
# back around the loop with a crazy 5ms sleep. So when checking
...
...
examples/python/dominfo.py
浏览文件 @
149c87b4
...
...
@@ -43,7 +43,7 @@ try:
dom
=
conn
.
lookupByName
(
name
)
# Annoyiingly, libvirt prints its own error message here
except
libvirt
.
libvirtError
:
print
"Domain %s is not runing"
%
name
print
"Domain %s is not run
n
ing"
%
name
sys
.
exit
(
0
)
info
=
dom
.
info
()
...
...
include/libvirt/libvirt.h.in
浏览文件 @
149c87b4
...
...
@@ -3124,7 +3124,7 @@ typedef enum {
* virConnectDomainEventCallback:
* @conn: virConnect connection
* @dom: The domain on which the event occurred
* @event: The specfic virDomainEventType which occurred
* @event: The spec
i
fic virDomainEventType which occurred
* @detail: event specific detail information
* @opaque: opaque user data
*
...
...
@@ -3417,7 +3417,7 @@ int virStreamRecv(virStreamPtr st,
*
* The callback will be invoked multiple times,
* fetching data in small chunks. The application
* should fill the 'data' array with upto 'nbytes'
* should fill the 'data' array with up
to 'nbytes'
* of data and then return the number actual number
* of bytes. The callback will continue to be
* invoked until it indicates the end of the source
...
...
@@ -3849,7 +3849,7 @@ typedef void (*virConnectDomainEventWatchdogCallback)(virConnectPtr conn,
/**
* virDomainEventIOErrorAction:
*
* The action that is to be taken due to an IO error occuring
* The action that is to be taken due to an IO error occur
r
ing
*/
typedef
enum
{
VIR_DOMAIN_EVENT_IO_ERROR_NONE
=
0
,
/* No action, IO error ignored */
...
...
src/conf/domain_conf.c
浏览文件 @
149c87b4
...
...
@@ -4668,7 +4668,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
int
m
;
if
((
m
=
virNetDevMacVLanModeTypeFromString
(
mode
))
<
0
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Unkown mode '%s' in interface <actual> element"
),
_
(
"Unk
n
own mode '%s' in interface <actual> element"
),
mode
);
goto
error
;
}
...
...
@@ -5036,7 +5036,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
int
m
;
if
((
m
=
virNetDevMacVLanModeTypeFromString
(
mode
))
<
0
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Unkown mode has been specified"
));
_
(
"Unk
n
own mode has been specified"
));
goto
error
;
}
def
->
data
.
direct
.
mode
=
m
;
...
...
@@ -7042,7 +7042,7 @@ virDomainVideoDefaultRAM(virDomainDefPtr def,
int
type
)
{
switch
(
type
)
{
/* W
ie
rd, QEMU defaults to 9 MB ??! */
/* W
ei
rd, QEMU defaults to 9 MB ??! */
case
VIR_DOMAIN_VIDEO_TYPE_VGA
:
case
VIR_DOMAIN_VIDEO_TYPE_CIRRUS
:
case
VIR_DOMAIN_VIDEO_TYPE_VMVGA
:
...
...
src/conf/nwfilter_conf.c
浏览文件 @
149c87b4
...
...
@@ -2801,7 +2801,7 @@ _virNWFilterDefLoopDetect(virConnectPtr conn,
* virNWFilterDefLoopDetect:
* @conn: pointer to virConnect object
* @nwfilters : the nwfilters to search
* @def : the filter definiton that may add a loop and is to be tested
* @def : the filter definit
i
on that may add a loop and is to be tested
*
* Detect a loop introduced through the filters being able to
* reference each other.
...
...
src/internal.h
浏览文件 @
149c87b4
...
...
@@ -107,7 +107,7 @@
/**
* ATTRIBUTE_UNUSED:
*
* Macro to flag conciously unused parameters to functions
* Macro to flag con
s
ciously unused parameters to functions
*/
# ifndef ATTRIBUTE_UNUSED
# define ATTRIBUTE_UNUSED __attribute__((__unused__))
...
...
src/libvirt.c
浏览文件 @
149c87b4
...
...
@@ -3091,7 +3091,7 @@ error:
*
* This call sets up a stream; subsequent use of stream API is necessary
* to transfer actual data, determine how much data is successfully
* transfered, and detect any errors.
* transfer
r
ed, and detect any errors.
*
* The screen ID is the sequential number of screen. In case of multiple
* graphics cards, heads are enumerated before devices, e.g. having
...
...
@@ -14683,7 +14683,7 @@ error:
* @cb: callback to the function handling domain events
*
* Removes a callback previously registered with the virConnectDomainEventRegister
* funtion.
* fun
c
tion.
*
* Use of this method is no longer recommended. Instead applications
* should try virConnectDomainEventUnregisterAny which has a more flexible
...
...
src/phyp/phyp_driver.c
浏览文件 @
149c87b4
...
...
@@ -2064,7 +2064,7 @@ phypStorageVolCreateXML(virStoragePoolPtr pool,
goto
err
;
}
/* Information not ava
li
able */
/* Information not ava
il
able */
spdef
->
allocation
=
0
;
spdef
->
available
=
0
;
...
...
@@ -2287,7 +2287,7 @@ phypVolumeGetXMLDesc(virStorageVolPtr vol, unsigned int flags)
goto
cleanup
;
}
/* Information not ava
li
able */
/* Information not ava
il
able */
pool
.
allocation
=
0
;
pool
.
available
=
0
;
...
...
@@ -2767,7 +2767,7 @@ phypGetStoragePoolXMLDesc(virStoragePoolPtr pool, unsigned int flags)
goto
err
;
}
/* Information not ava
li
able */
/* Information not ava
il
able */
def
.
allocation
=
0
;
def
.
available
=
0
;
...
...
src/qemu/qemu_capabilities.c
浏览文件 @
149c87b4
...
...
@@ -607,7 +607,7 @@ qemuCapsInitGuest(virCapsPtr caps,
qemuCapsPtr
kvmbinCaps
=
NULL
;
int
ret
=
-
1
;
/* Check for exist
a
nce of base emulator, or alternate base
/* Check for exist
e
nce of base emulator, or alternate base
* which can be used with magic cpu choice
*/
binary
=
qemuCapsFindBinaryForArch
(
hostarch
,
guestarch
);
...
...
src/qemu/qemu_conf.c
浏览文件 @
149c87b4
...
...
@@ -203,7 +203,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
size_t
len
;
virConfValuePtr
pp
;
/* Calc leng
ht
and check items */
/* Calc leng
th
and check items */
for
(
len
=
0
,
pp
=
p
->
list
;
pp
;
len
++
,
pp
=
pp
->
next
)
{
if
(
pp
->
type
!=
VIR_CONF_STRING
)
{
VIR_ERROR
(
_
(
"security_driver be a list of strings"
));
...
...
src/qemu/qemu_monitor_text.c
浏览文件 @
149c87b4
...
...
@@ -2291,7 +2291,7 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon,
if
(
!
needle
)
continue
;
/* id is everthing from the beginning of the line to the ':'
/* id is ever
y
thing from the beginning of the line to the ':'
* find ':' and turn it into a terminator */
char
*
colon
=
memchr
(
pos
,
':'
,
needle
-
pos
);
if
(
colon
==
NULL
)
...
...
src/qemu/qemu_process.c
浏览文件 @
149c87b4
...
...
@@ -2599,7 +2599,7 @@ static int qemuProcessHook(void *data)
if
(
virDomainLockProcessStart
(
h
->
driver
->
lockManager
,
h
->
driver
->
uri
,
h
->
vm
,
/* QEMU is always pased initially */
/* QEMU is always pa
u
sed initially */
true
,
&
fd
)
<
0
)
goto
cleanup
;
...
...
src/rpc/virnetsaslcontext.c
浏览文件 @
149c87b4
...
...
@@ -150,7 +150,7 @@ int virNetSASLContextCheckIdentity(virNetSASLContextPtr ctxt,
int
rv
=
fnmatch
(
*
wildcards
,
identity
,
0
);
if
(
rv
==
0
)
{
ret
=
1
;
goto
cleanup
;
/* Succesful match */
goto
cleanup
;
/* Succes
s
ful match */
}
if
(
rv
!=
FNM_NOMATCH
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
...
...
src/rpc/virnettlscontext.c
浏览文件 @
149c87b4
...
...
@@ -374,7 +374,7 @@ virNetTLSContextCheckCertDNWhitelist(const char *dname,
{
while
(
*
wildcards
)
{
int
ret
=
fnmatch
(
*
wildcards
,
dname
,
0
);
if
(
ret
==
0
)
/* Succesful match */
if
(
ret
==
0
)
/* Succes
s
ful match */
return
1
;
if
(
ret
!=
FNM_NOMATCH
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
...
...
src/storage/storage_backend_disk.c
浏览文件 @
149c87b4
...
...
@@ -533,9 +533,9 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool,
}
/**
* Aligns a new partition to nearest cylinder boundry
* Aligns a new partition to nearest cylinder bound
a
ry
* when having a msdos partition table type
* to avoid any problem with al
l
ready existing
* to avoid any problem with already existing
* partitions
*/
static
int
...
...
@@ -558,7 +558,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
int
partType
=
virStorageBackendDiskPartTypeToCreate
(
pool
);
/* how many extra bytes we have since we allocate
aligned to the cylinder boundry */
aligned to the cylinder bound
a
ry */
extraBytes
=
cylinderSize
-
(
allocation
%
cylinderSize
);
for
(
i
=
0
;
i
<
dev
->
nfreeExtent
;
i
++
)
{
...
...
@@ -568,7 +568,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
unsigned
long
long
neededSize
=
allocation
;
if
(
pool
->
def
->
source
.
format
==
VIR_STORAGE_POOL_DISK_DOS
)
{
/* align to cylinder boundry */
/* align to cylinder bound
a
ry */
neededSize
+=
extraBytes
;
if
((
*
start
%
cylinderSize
)
>
extraBytes
)
{
/* add an extra cylinder if the offset can't fit within
...
...
@@ -617,7 +617,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
*
end
=
*
start
+
alignedAllocation
;
if
(
pool
->
def
->
source
.
format
==
VIR_STORAGE_POOL_DISK_DOS
)
{
/* adjust our allocation if start is not at a cylinder boundry */
/* adjust our allocation if start is not at a cylinder bound
a
ry */
*
end
-=
(
*
start
%
cylinderSize
);
}
...
...
src/storage/storage_backend_rbd.c
浏览文件 @
149c87b4
...
...
@@ -315,7 +315,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
if
(
len
>=
0
)
break
;
if
(
len
!=
-
ERANGE
)
{
VIR_WARN
(
"%s"
,
_
(
"A problem occured while listing RBD images"
));
VIR_WARN
(
"%s"
,
_
(
"A problem occur
r
ed while listing RBD images"
));
goto
cleanup
;
}
}
...
...
src/uml/uml_driver.c
浏览文件 @
149c87b4
...
...
@@ -258,7 +258,7 @@ requery:
}
}
else
if
(
!
res
||
STRPREFIX
(
res
,
"pts"
))
{
/* It can take a while to startup, so retry for
upto 5 seconds */
up
to 5 seconds */
/* XXX should do this in a better non-blocking
way somehow ...perhaps register a timer */
if
(
retries
++
<
50
)
{
...
...
src/util/cgroup.c
浏览文件 @
149c87b4
...
...
@@ -169,7 +169,7 @@ no_memory:
/*
* Process /proc/self/cgroup figuring out what cgroup
* sub-path the current process is assigned to. ie not
* nec
c
essarily in the root
* necessarily in the root
*/
static
int
virCgroupDetectPlacement
(
virCgroupPtr
group
)
{
...
...
@@ -2026,7 +2026,7 @@ int virCgroupKillPainfully(virCgroupPtr group)
else
if
(
i
==
8
)
signum
=
SIGKILL
;
else
signum
=
0
;
/* Just check for exist
a
nce */
signum
=
0
;
/* Just check for exist
e
nce */
rc
=
virCgroupKillRecursive
(
group
,
signum
);
VIR_DEBUG
(
"Iteration %d rc=%d"
,
i
,
rc
);
...
...
src/util/logging.c
浏览文件 @
149c87b4
...
...
@@ -1081,7 +1081,7 @@ virLogOutputToJournald(virLogSource source,
char
priostr
[
INT_BUFSIZE_BOUND
(
priority
)];
char
linestr
[
INT_BUFSIZE_BOUND
(
linenr
)];
/* First message takes upto 4 iovecs, and each
/* First message takes up
to 4 iovecs, and each
* other field needs 3, assuming they don't have
* newlines in them
*/
...
...
@@ -1090,7 +1090,7 @@ virLogOutputToJournald(virLogSource source,
if
(
strchr
(
rawstr
,
'\n'
))
{
uint64_t
nstr
;
/* If 'str' contain
e
s a newline, then we must
/* If 'str' contains a newline, then we must
* encode the string length, since we can't
* rely on the newline for the field separator
*/
...
...
src/util/processinfo.c
浏览文件 @
149c87b4
...
...
@@ -77,7 +77,7 @@ realloc:
}
CPU_FREE
(
mask
);
# else
/* Legacy method uses a fixed size cpu mask, only allows upto 1024 cpus */
/* Legacy method uses a fixed size cpu mask, only allows up
to 1024 cpus */
cpu_set_t
mask
;
CPU_ZERO
(
&
mask
);
...
...
@@ -149,7 +149,7 @@ realloc:
ignore_value
(
virBitmapSetBit
(
*
map
,
i
));
CPU_FREE
(
mask
);
# else
/* Legacy method uses a fixed size cpu mask, only allows upto 1024 cpus */
/* Legacy method uses a fixed size cpu mask, only allows up
to 1024 cpus */
cpu_set_t
mask
;
CPU_ZERO
(
&
mask
);
...
...
src/util/virpidfile.c
浏览文件 @
149c87b4
...
...
@@ -366,7 +366,7 @@ int virPidFileAcquirePath(const char *path,
VIR_DEBUG
(
"Pid file '%s' disappeared: %s"
,
path
,
virStrerror
(
errno
,
ebuf
,
sizeof
(
ebuf
)));
VIR_FORCE_CLOSE
(
fd
);
/* Someone else must be racing with us, so try agin */
/* Someone else must be racing with us, so try ag
a
in */
continue
;
}
...
...
@@ -375,7 +375,7 @@ int virPidFileAcquirePath(const char *path,
VIR_DEBUG
(
"Pid file '%s' was recreated"
,
path
);
VIR_FORCE_CLOSE
(
fd
);
/* Someone else must be racing with us, so try agin */
/* Someone else must be racing with us, so try ag
a
in */
}
snprintf
(
pidstr
,
sizeof
(
pidstr
),
"%lld"
,
(
long
long
)
pid
);
...
...
src/util/virsocketaddr.c
浏览文件 @
149c87b4
...
...
@@ -418,7 +418,7 @@ virSocketAddrMaskByPrefix(const virSocketAddrPtr addr,
* virSocketAddrBroadcast:
* @addr: address that needs to be turned into broadcast address (IPv4 only)
* @netmask: the netmask address
* @broadcast: virSocketAddr to rec
ie
ve the broadcast address
* @broadcast: virSocketAddr to rec
ei
ve the broadcast address
*
* Mask ON the host bits of @addr according to @netmask, turning it
* into a broadcast address.
...
...
@@ -448,7 +448,7 @@ virSocketAddrBroadcast(const virSocketAddrPtr addr,
* virSocketAddrBroadcastByPrefix:
* @addr: address that needs to be turned into broadcast address (IPv4 only)
* @prefix: prefix (# of 1 bits) of netmask to apply
* @broadcast: virSocketAddr to rec
ie
ve the broadcast address
* @broadcast: virSocketAddr to rec
ei
ve the broadcast address
*
* Mask off the host bits of @addr according to @prefix, turning it
* into a network address.
...
...
src/vbox/vbox_tmpl.c
浏览文件 @
149c87b4
...
...
@@ -7049,7 +7049,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
virDomainEventPtr
ev
;
/* CURRENT LIMITATION: we never get the VIR_DOMAIN_EVENT_UNDEFINED
* event bec
ua
se the when the machine is de-registered the call
* event bec
au
se the when the machine is de-registered the call
* to vboxDomainLookupByUUID fails and thus we don't get any
* dom pointer which is necessary (null dom pointer doesn't work)
* to show the VIR_DOMAIN_EVENT_UNDEFINED event
...
...
@@ -8747,7 +8747,7 @@ static int vboxStorageVolDelete(virStorageVolPtr vol,
* is no 128bit width simple item type for a SafeArray to fit a
* GUID in. The largest simple type it 64bit width and VirtualBox
* uses two of this 64bit items to represents one GUID. Therefore,
* we d
e
vide the size of the SafeArray by two, to compensate for
* we d
i
vide the size of the SafeArray by two, to compensate for
* this workaround in VirtualBox */
machineIds
.
count
/=
2
;
#endif
/* VBOX_API_VERSION >= 2002 */
...
...
src/xen/xm_internal.c
浏览文件 @
149c87b4
...
...
@@ -174,7 +174,7 @@ xenXMConfigSaveFile(virConnectPtr conn, const char *filename, virDomainDefPtr de
/*
* Caller must hold the lock on 'conn->privateData' before
* calling this funtion
* calling this fun
c
tion
*/
int
xenXMConfigCacheRemoveFile
(
virConnectPtr
conn
,
...
...
@@ -198,7 +198,7 @@ xenXMConfigCacheRemoveFile(virConnectPtr conn,
/*
* Caller must hold the lock on 'conn->privateData' before
* calling this funtion
* calling this fun
c
tion
*/
int
xenXMConfigCacheAddFile
(
virConnectPtr
conn
,
const
char
*
filename
)
...
...
@@ -307,7 +307,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename)
* once every X seconds
*
* Caller must hold the lock on 'conn->privateData' before
* calling this funtion
* calling this fun
c
tion
*/
int
xenXMConfigCacheRefresh
(
virConnectPtr
conn
)
{
xenUnifiedPrivatePtr
priv
=
conn
->
privateData
;
...
...
@@ -383,7 +383,7 @@ int xenXMConfigCacheRefresh (virConnectPtr conn) {
/* If we already have a matching entry and it is not
modified, then carry on to next one*/
if
(
xenXMConfigCacheAddFile
(
conn
,
path
)
<
0
)
{
/* Ignoring errors, since alot of stuff goes wrong in /etc/xen */
/* Ignoring errors, since a
lot of stuff goes wrong in /etc/xen */
}
VIR_FREE
(
path
);
...
...
src/xenxs/xen_sxpr.c
浏览文件 @
149c87b4
...
...
@@ -811,7 +811,7 @@ xenParseSxprGraphicsOld(virDomainDefPtr def,
/* For Xen >= 3.0.3, don't generate a fixed port mapping
* because it will almost certainly be wrong ! Just leave
* it as -1 which lets caller see that the VNC server isn't
* present yet. Subsquent dumps of the XML will eventually
* present yet. Subs
e
quent dumps of the XML will eventually
* find the port in XenStore once VNC server has started
*/
if
(
port
==
-
1
&&
xendConfigVersion
<
XEND_CONFIG_VERSION_3_0_3
)
...
...
tests/virnettlscontexttest.c
浏览文件 @
149c87b4
...
...
@@ -448,7 +448,7 @@ struct testTLSContextData {
* This code is done when libvirtd starts up, or before
* a libvirt client connects. The test is ensuring that
* the creation of virNetTLSContextPtr fails if we
* give bogus certs, or suceeds for good certs
* give bogus certs, or suc
c
eeds for good certs
*/
static
int
testTLSContextInit
(
const
void
*
opaque
)
{
...
...
tools/virsh.pod
浏览文件 @
149c87b4
...
...
@@ -129,7 +129,7 @@ Several B<virsh> commands take an optionally scaled integer; if no
scale is provided, then the default is listed in the command (for
historical reasons, some commands default to bytes, while other
commands default to kibibytes). The following case-insensitive
suffixes can be used to select a specfic scale:
suffixes can be used to select a spec
i
fic scale:
b, byte byte 1
KB kilobyte 1,000
k, KiB kibibyte 1,024
...
...
@@ -607,7 +607,7 @@ Availability of these fields depends on hypervisor. Unsupported fields are
missing from the output. Other fields may appear if communicating with a newer
version of libvirtd.
B<Explanation of fields> (fields appear in the folowing order):
B<Explanation of fields> (fields appear in the fol
l
owing order):
rd_req - count of read operations
rd_bytes - count of read bytes
wr_req - count of write operations
...
...
@@ -2406,7 +2406,7 @@ is in.
I<vol-name-or-key-or-path> is the name or key or path of the volume to wipe.
I<--offset> is the position in the storage volume at which to start writing
the data. I<--length> is an upper bound of the amount of data to be uploaded.
An error will occur
r
if the I<local-file> is greater than the specified length.
An error will occur if the I<local-file> is greater than the specified length.
=item B<vol-download> [I<--pool> I<pool-or-uuid>] [I<--offset> I<bytes>]
[I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file>
...
...
@@ -2654,7 +2654,7 @@ this flag is in use, the command can also take additional I<diskspec>
arguments to add <disk> elements to the xml. Each <diskspec> is in the
form B<disk[,snapshot=type][,driver=type][,file=name]>. To include a
literal comma in B<disk> or in B<file=name>, escape it with a second
comma. A literal I<--diskspec> must prece
ed
each B<diskspec> unless
comma. A literal I<--diskspec> must prece
de
each B<diskspec> unless
all three of I<domain>, I<name>, and I<description> are also present.
For example, a diskspec of "vda,snapshot=external,file=/path/to,,new"
results in the following XML:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录