Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 bb8340c1 编写于 作者: R Richard W.M. Jones
浏览文件
操作

Many typos fixed (Atsushi SAKAI).

上级 ba52fcbc
隐藏空白更改
内联 并排
Showing with 67 addition and 63 deletion
ChangeLog
浏览文件 @ bb8340c1
Fri Feb 29 12:50:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
Many typos fixed (Atsushi SAKAI).
Thu Feb 28 18:04:59 CET 2008 Jim Meyering <meyering@redhat.com>
Rewrite test-coverage rules to accommodate multiple .o files per .c.
......
docs/errors.html
浏览文件 @ bb8340c1
......@@ -8,7 +8,7 @@ asynchronous error reporting. When an error happens in the library code the
error is logged, allowing to retrieve it later and if the user registered an
error callback it will be called synchronously. Once the call to libvirt ends
the error can be detected by the return value and the full information for
the last logged error can be retrieved.</p><p>To avoid as much as prossible troubles with a global variable in a
the last logged error can be retrieved.</p><p>To avoid as much as possible troubles with a global variable in a
multithreaded environment, libvirt will associate when possible the errors to
the current connection they are related to, that way the error is stored in a
dynamic structure which can be made thread specific. Error callback can be
......@@ -43,7 +43,7 @@ following fields:</p><ul><li>code: an error number from the <a href="html/libvir
<li>conn: if available a pointer to the <a href="html/libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>
connection to the hypervisor where this happened</li>
<li>dom: if available a pointer to the <a href="html/libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain
targetted in the operation</li>
targeted in the operation</li>
</ul><p>and then extra raw informations about the error which may be initialized
to 0 or NULL if unused</p><ul><li>str1, str2, str3: string informations, usually str1 is the error
message format</li>
......@@ -51,7 +51,7 @@ to 0 or NULL if unused</p><ul><li>str1, str2, str3: string informations, usually
</ul><p>So usually, setting up specific error handling with libvirt consist of
registering an handler with with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a> or
with <a href="html/libvirt-virterror.html#virConnSetErrorFunc">virConnSetErrorFunc</a>,
chech the value of the code value, take appropriate action, if needed let
check the value of the code value, take appropriate action, if needed let
libvirt print the error on stderr by calling <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a>.
For asynchronous error handing, set such a function doing nothing to avoid
the error being reported on stderr, and call virConnGetLastError or
......
docs/format.html
浏览文件 @ bb8340c1
......@@ -45,7 +45,7 @@ significant:</p><ul><li>name: the domain name, preferably ASCII based</li>
<li>memory: the maximum memory allocated to the domain in kilobytes</li>
<li>vcpu: the number of virtual cpu configured for the domain</li>
<li>os: a block describing the Operating System, its content will be
dependant on the OS type
dependent on the OS type
<ul><li>type: indicate the OS type, always linux at this point</li>
<li>kernel: path to the kernel on the Domain 0 filesystem</li>
<li>initrd: an optional path for the init ramdisk on the Domain 0
......@@ -168,7 +168,7 @@ systems:</p><pre>&lt;domain type='xen' id='3'&gt;
pointing to an additional program in charge of emulating the devices</li>
<li>the disk entry indicates in the dev target section that the emulation
for the drive is the first IDE disk device hda. The list of device names
supported is dependant on the Hypervisor, but for Xen it can be any IDE
supported is dependent on the Hypervisor, but for Xen it can be any IDE
device <code>hda</code>-<code>hdd</code>, or a floppy device
<code>fda</code>, <code>fdb</code>. The <code>&lt;disk&gt;</code> element
also supports a 'device' attribute to indicate what kinda of hardware to
......@@ -247,7 +247,7 @@ support a variety of options:</p><ol><li>Userspace SLIRP stack
of the box which does NAT'ing to the default route and has an IP range of
<code>192.168.22.0/255.255.255.0</code>. Each guest will have an
associated tun device created with a name of vnetN, which can also be
overriden with the &lt;target&gt; element. Example configs are:</p>
overridden with the &lt;target&gt; element. Example configs are:</p>
<pre>&lt;interface type='network'&gt;
&lt;source network='default'/&gt;
&lt;/interface&gt;
......@@ -263,7 +263,7 @@ support a variety of options:</p><ol><li>Userspace SLIRP stack
<p>Provides a bridge from the VM directly onto the LAN. This assumes
there is a bridge device on the host which has one or more of the hosts
physical NICs enslaved. The guest VM will have an associated tun device
created with a name of vnetN, which can also be overriden with the
created with a name of vnetN, which can also be overridden with the
&lt;target&gt; element. The tun device will be enslaved to the bridge.
The IP range / network configuration is whatever is used on the LAN. This
provides the guest VM full incoming &amp; outgoing net access just like a
......@@ -281,11 +281,11 @@ support a variety of options:</p><ol><li>Userspace SLIRP stack
<li>Generic connection to LAN
<p>Provides a means for the administrator to execute an arbitrary script
to connect the guest's network to the LAN. The guest will have a tun
device created with a name of vnetN, which can also be overriden with the
device created with a name of vnetN, which can also be overridden with the
&lt;target&gt; element. After creating the tun device a shell script will
be run which is expected to do whatever host network integration is
required. By default this script is called /etc/qemu-ifup but can be
overriden.</p>
overridden.</p>
<pre>&lt;interface type='ethernet'/&gt;
&lt;interface type='ethernet'&gt;
......@@ -409,7 +409,7 @@ BIOS you will see</p><pre>&lt;capabilities&gt;
&lt;/features&gt;
&lt;/guest&gt;</span>
...
&lt;/capabilities&gt;</pre><p>The first block (in red) indicates the host hardware capbilities, currently
&lt;/capabilities&gt;</pre><p>The first block (in red) indicates the host hardware capabilities, currently
it is limited to the CPU properties but other information may be available,
it shows the CPU architecture, and the features of the chip (the feature
block is similar to what you will find in a Xen fully virtualized domain
......
docs/index.html
浏览文件 @ bb8340c1
......@@ -20,7 +20,7 @@ of recent versions of Linux (and other OSes). It is free software available
under the <a href="http://www.opensource.org/licenses/lgpl-license.html">GNU
Lesser General Public License</a>. Virtualization of the Linux Operating
System means the ability to run multiple instances of Operating Systems
concurently on a single hardware system where the basic resources are driven
concurrently on a single hardware system where the basic resources are driven
by a Linux (or Solaris) instance. The library aims at providing a long term
stable C API initially for <a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen
paravirtualization</a> but it can also integrate with other
......
docs/news.html
浏览文件 @ bb8340c1
......@@ -6,7 +6,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p><h3>0
Ruby bindings (David Lutterkort), SASL based authentication for
libvirt remote support (Daniel Berrange), PolicyKit authentication
(Daniel Berrange)</li>
<li>Documentation: example files for QEMU and libvirtd configuations
<li>Documentation: example files for QEMU and libvirtd configurations
(Daniel Berrange), english cleanups (Jim Paris), CIM and OpenVZ
references, document &lt;shareable/&gt;, daemon startup when using
QEMU/KVM, document HV support for new NUMA calls (Richard Jones),
......
docs/python.html
浏览文件 @ bb8340c1
......@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Bindings for other languages</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Bindings for other languages</h1><p>Libvirt comes with bindings to support other languages than
pure C. First the headers embeds the necessary declarations to
allow direct acces from C++ code, but also we have bindings for
allow direct access from C++ code, but also we have bindings for
higher level kind of languages:</p><ul><li>Python: Libvirt comes with direct support for the Python language
(just make sure you installed the libvirt-python package if not
compiling from sources). See below for more informations about
......
docs/storage.html
浏览文件 @ bb8340c1
......@@ -84,7 +84,7 @@ full capacity for storage volumes. This value is in bytes. This
is not applicable when creating a pool.</dd>
<dt>available</dt>
<dd>Providing the free space available for allocating new volums
<dd>Providing the free space available for allocating new volumes
in the pool. Due to underlying device constraints it may not be
possible to allocate the entire free space to a single volume.
This value is in bytes. This is not applicable when creating a
......@@ -131,8 +131,8 @@ pool it will be the name of the directory in which volumes will
be created. For device based pools it will tbe directory in which
devices nodes exist. For the latter <code>/dev/</code> may seem
like the logical choice, however, devices nodes there are not
guarenteed stable across reboots, since they are allocated on
demand. It is preferrable to use a stable location such as one
guaranteed stable across reboots, since they are allocated on
demand. It is preferable to use a stable location such as one
of the <code>/dev/disk/by-{path,id,uuid,label</code> locations.
</dd>
<dt>permissions<dt>
......@@ -152,7 +152,7 @@ contains the MAC (eg SELinux) label string.
If a storage pool exposes information about its underlying
placement / allocation scheme, the <code>device</code> element
within the <code>source</code> element may contain information
about its avilable extents. Some pools have a constraint that
about its available extents. Some pools have a constraint that
a volume must be allocated entirely within a single constraint
(eg disk partition pools). Thus the extent information allows an
application to determine the maximum possible size for a new
......@@ -215,8 +215,8 @@ pool it will be the name of the directory in which volumes will
be created. For device based pools it will tbe directory in which
devices nodes exist. For the latter <code>/dev/</code> may seem
like the logical choice, however, devices nodes there are not
guarenteed stable across reboots, since they are allocated on
demand. It is preferrable to use a stable location such as one
guaranteed stable across reboots, since they are allocated on
demand. It is preferable to use a stable location such as one
of the <code>/dev/disk/by-{path,id,uuid,label</code> locations.
</dd>
<dt>format</dt>
......@@ -293,10 +293,10 @@ One of the following options:
</ul><p>
When listing existing volumes all these formats are supported
natively. When creating new volumes, only a subset may be
available. The <code>raw</code> type is guarenteed always
available. The <code>raw</code> type is guaranteed always
available. The <code>qcow2</code> type can be created if
either <code>qemu-img</code> or <code>qcow-create</code> tools
are present. The others are dependant on support of the
are present. The others are dependent on support of the
<code>qemu-img</code> tool.
</p><h4><a name="StorageBackendFS" id="StorageBackendFS">Filesystem pool</a></h4>
......@@ -328,7 +328,7 @@ required.
<h5>Valid pool format types</h5>
<p>
The fileystem pool supports the following formats:
The filesystem pool supports the following formats:
</p>
<ul><li><code>auto</code> - automatically determine format</li>
......@@ -378,7 +378,7 @@ point. It will default to using NFS as the protocol.
<h5>Valid pool format types</h5>
<p>
The network fileystem pool supports the following formats:
The network filesystem pool supports the following formats:
</p>
<ul><li><code>auto</code> - automatically determine format</li>
......
include/libvirt/libvirt.h
浏览文件 @ bb8340c1
......@@ -241,7 +241,7 @@ struct _virDomainInterfaceStats {
/**
* virDomainInterfaceStatsPtr:
*
* A pointe to a virDomainInterfaceStats structure
* A pointer to a virDomainInterfaceStats structure
*/
typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr;
......@@ -261,7 +261,7 @@ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
* @nodeinfo: virNodeInfo instance
*
* This macro is to calculate the total number of CPUs supported
* but not neccessarily active in the host.
* but not necessarily active in the host.
*/
......@@ -278,7 +278,7 @@ typedef virNodeInfo *virNodeInfoPtr;
/**
* virConnectFlags
*
* Flags when openning a connection to a hypervisor
* Flags when opening a connection to a hypervisor
*/
typedef enum {
VIR_CONNECT_RO = 1, /* A readonly connection */
......@@ -573,7 +573,7 @@ int virDomainPinVcpu (virDomainPtr domain,
* @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT)
* @cpu: the physical CPU number
*
* This macro is to be used in conjonction with virDomainPinVcpu() API.
* This macro is to be used in conjunction with virDomainPinVcpu() API.
* USE_CPU macro set the bit (CPU usable) of the related cpu in cpumap.
*/
......@@ -584,7 +584,7 @@ int virDomainPinVcpu (virDomainPtr domain,
* @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT)
* @cpu: the physical CPU number
*
* This macro is to be used in conjonction with virDomainPinVcpu() API.
* This macro is to be used in conjunction with virDomainPinVcpu() API.
* USE_CPU macro reset the bit (CPU not usable) of the related cpu in cpumap.
*/
......@@ -594,7 +594,7 @@ int virDomainPinVcpu (virDomainPtr domain,
* VIR_CPU_MAPLEN:
* @cpu: number of physical CPUs
*
* This macro is to be used in conjonction with virDomainPinVcpu() API.
* This macro is to be used in conjunction with virDomainPinVcpu() API.
* It returns the length (in bytes) required to store the complete
* CPU map between a single virtual & all physical CPUs of a domain.
*/
......@@ -615,7 +615,7 @@ int virDomainGetVcpus (virDomainPtr domain,
* @vcpu: the virtual CPU number
* @cpu: the physical CPU number
*
* This macro is to be used in conjonction with virDomainGetVcpus() API.
* This macro is to be used in conjunction with virDomainGetVcpus() API.
* VIR_CPU_USABLE macro returns a non zero value (true) if the cpu
* is usable by the vcpu, and 0 otherwise.
*/
......@@ -632,7 +632,7 @@ int virDomainGetVcpus (virDomainPtr domain,
* This cpumap must be previously allocated by the caller
* (ie: malloc(maplen))
*
* This macro is to be used in conjonction with virDomainGetVcpus() and
* This macro is to be used in conjunction with virDomainGetVcpus() and
* virDomainPinVcpu() APIs. VIR_COPY_CPUMAP macro extract the cpumap of
* the specified vcpu from cpumaps array and copy it into cpumap to be used
* later by virDomainPinVcpu() API.
......@@ -647,7 +647,7 @@ int virDomainGetVcpus (virDomainPtr domain,
* @maplen: the length (in bytes) of one cpumap
* @vcpu: the virtual CPU number
*
* This macro is to be used in conjonction with virDomainGetVcpus() and
* This macro is to be used in conjunction with virDomainGetVcpus() and
* virDomainPinVcpu() APIs. VIR_GET_CPUMAP macro returns a pointer to the
* cpumap of the specified vcpu from cpumaps array.
*/
......
include/libvirt/libvirt.h.in
浏览文件 @ bb8340c1
......@@ -241,7 +241,7 @@ struct _virDomainInterfaceStats {
/**
* virDomainInterfaceStatsPtr:
*
* A pointe to a virDomainInterfaceStats structure
* A pointer to a virDomainInterfaceStats structure
*/
typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr;
......@@ -261,7 +261,7 @@ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
* @nodeinfo: virNodeInfo instance
*
* This macro is to calculate the total number of CPUs supported
* but not neccessarily active in the host.
* but not necessary active in the host.
*/
......@@ -278,7 +278,7 @@ typedef virNodeInfo *virNodeInfoPtr;
/**
* virConnectFlags
*
* Flags when openning a connection to a hypervisor
* Flags when opening a connection to a hypervisor
*/
typedef enum {
VIR_CONNECT_RO = 1, /* A readonly connection */
......@@ -573,7 +573,7 @@ int virDomainPinVcpu (virDomainPtr domain,
* @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT)
* @cpu: the physical CPU number
*
* This macro is to be used in conjonction with virDomainPinVcpu() API.
* This macro is to be used in conjunction with virDomainPinVcpu() API.
* USE_CPU macro set the bit (CPU usable) of the related cpu in cpumap.
*/
......@@ -584,7 +584,7 @@ int virDomainPinVcpu (virDomainPtr domain,
* @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT)
* @cpu: the physical CPU number
*
* This macro is to be used in conjonction with virDomainPinVcpu() API.
* This macro is to be used in conjunction with virDomainPinVcpu() API.
* USE_CPU macro reset the bit (CPU not usable) of the related cpu in cpumap.
*/
......@@ -594,7 +594,7 @@ int virDomainPinVcpu (virDomainPtr domain,
* VIR_CPU_MAPLEN:
* @cpu: number of physical CPUs
*
* This macro is to be used in conjonction with virDomainPinVcpu() API.
* This macro is to be used in conjunction with virDomainPinVcpu() API.
* It returns the length (in bytes) required to store the complete
* CPU map between a single virtual & all physical CPUs of a domain.
*/
......@@ -615,7 +615,7 @@ int virDomainGetVcpus (virDomainPtr domain,
* @vcpu: the virtual CPU number
* @cpu: the physical CPU number
*
* This macro is to be used in conjonction with virDomainGetVcpus() API.
* This macro is to be used in conjunction with virDomainGetVcpus() API.
* VIR_CPU_USABLE macro returns a non zero value (true) if the cpu
* is usable by the vcpu, and 0 otherwise.
*/
......@@ -632,7 +632,7 @@ int virDomainGetVcpus (virDomainPtr domain,
* This cpumap must be previously allocated by the caller
* (ie: malloc(maplen))
*
* This macro is to be used in conjonction with virDomainGetVcpus() and
* This macro is to be used in conjunction with virDomainGetVcpus() and
* virDomainPinVcpu() APIs. VIR_COPY_CPUMAP macro extract the cpumap of
* the specified vcpu from cpumaps array and copy it into cpumap to be used
* later by virDomainPinVcpu() API.
......@@ -647,7 +647,7 @@ int virDomainGetVcpus (virDomainPtr domain,
* @maplen: the length (in bytes) of one cpumap
* @vcpu: the virtual CPU number
*
* This macro is to be used in conjonction with virDomainGetVcpus() and
* This macro is to be used in conjunction with virDomainGetVcpus() and
* virDomainPinVcpu() APIs. VIR_GET_CPUMAP macro returns a pointer to the
* cpumap of the specified vcpu from cpumaps array.
*/
......
include/libvirt/virterror.h
浏览文件 @ bb8340c1
......@@ -41,7 +41,7 @@ typedef enum {
VIR_FROM_XEN, /* Error at Xen hypervisor layer */
VIR_FROM_XEND, /* Error at connection with xend daemon */
VIR_FROM_XENSTORE, /* Error at connection with xen store */
VIR_FROM_SEXPR, /* Error in the S-Epression code */
VIR_FROM_SEXPR, /* Error in the S-Expression code */
VIR_FROM_XML, /* Error in the XML code */
VIR_FROM_DOM, /* Error when operating on a domain */
VIR_FROM_RPC, /* Error in the XML-RPC code */
......@@ -131,7 +131,7 @@ typedef enum {
VIR_WAR_NO_NETWORK, /* failed to start network */
VIR_ERR_NO_DOMAIN, /* domain not found or unexpectedly disappeared */
VIR_ERR_NO_NETWORK, /* network not found */
VIR_ERR_INVALID_MAC, /* invalid MAC adress */
VIR_ERR_INVALID_MAC, /* invalid MAC address */
VIR_ERR_AUTH_FAILED, /* authentication failed */
VIR_ERR_INVALID_STORAGE_POOL, /* invalid storage pool object */
VIR_ERR_INVALID_STORAGE_VOL, /* invalid storage vol object */
......
python/libvir.c
浏览文件 @ bb8340c1
......@@ -115,7 +115,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
if (c_retval == NULL)
return VIR_PY_NONE;
/* convert to a Python tupple of long objects */
/* convert to a Python tuple of long objects */
if ((info = PyTuple_New(2)) == NULL) {
free(c_retval);
return VIR_PY_NONE;
......@@ -154,7 +154,7 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
}
/* convert to a Python tupple of long objects */
/* convert to a Python tuple of long objects */
if ((info = PyDict_New()) == NULL) {
free(params);
return VIR_PY_NONE;
......@@ -227,7 +227,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_INT_FAIL;
}
/* convert to a Python tupple of long objects */
/* convert to a Python tuple of long objects */
for (i = 0 ; i < nparams ; i++) {
PyObject *key, *val;
key = libvirt_constcharPtrWrap(params[i].field);
......@@ -318,7 +318,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
cpumap, cpumaplen) < 0)
goto cleanup;
/* convert to a Python tupple of long objects */
/* convert to a Python tuple of long objects */
if ((pyretval = PyTuple_New(2)) == NULL)
goto cleanup;
if ((pycpuinfo = PyList_New(dominfo.nrVirtCpu)) == NULL)
......@@ -1442,7 +1442,7 @@ initcygvirtmod
virInitialize();
/* intialize the python extension module */
/* initialize the python extension module */
Py_InitModule((char *)
#ifndef __CYGWIN__
"libvirtmod"
......
python/libvirt-python-api.xml
浏览文件 @ bb8340c1
......@@ -76,7 +76,7 @@
<arg name='path' type='char *' info='the path for the interface device'/>
</function>
<function name="virNodeGetCellsFreeMemory" file='python'>
<info>Returns the availbale memory for a list of cells</info>
<info>Returns the available memory for a list of cells</info>
<arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
<arg name='startCell' type='int' info='first cell in the list'/>
<arg name='maxCells' type='int' info='number of cell in the list'/>
......@@ -98,7 +98,7 @@
<arg name='domain' type='virDomainPtr' info='pointer to domain object, or NULL for Domain0'/>
</function>
<function name='virDomainPinVcpu' file='python'>
<info>Dynamically change the real CPUs which can be allocated to a virtual CPU. This function requires priviledged access to the hypervisor.</info>
<info>Dynamically change the real CPUs which can be allocated to a virtual CPU. This function requires privileged access to the hypervisor.</info>
<return type='int' info='0 in case of success, -1 in case of failure.'/>
<arg name='domain' type='virDomainPtr' info='pointer to domain object, or NULL for Domain0'/>
<arg name='vcpu' type='unsigned int' info='virtual CPU number'/>
......
python/libvirt_wrap.h
浏览文件 @ bb8340c1
......@@ -86,7 +86,7 @@ PyObject * libvirt_virStorageVolPtrWrap(virStorageVolPtr node);
* if (x) LIBVIRT_STMT_START { ... } LIBVIRT_STMT_END; else ...
*
* When GCC is compiling C code in non-ANSI mode, it will use the
* compiler __extension__ to wrap the statements wihin `({' and '})' braces.
* compiler __extension__ to wrap the statements within `({' and '})' braces.
* When compiling on platforms where configure has defined
* HAVE_DOWHILE_MACROS, statements will be wrapped with `do' and `while (0)'.
* For any other platforms (SunOS4 is known to have this issue), wrap the
......
qemud/event.c
浏览文件 @ bb8340c1
......@@ -379,7 +379,7 @@ static int virEventCleanupTimeouts(void) {
int i;
/* Remove deleted entries, shuffling down remaining
* entries as needed to form contigous series
* entries as needed to form contiguous series
*/
for (i = 0 ; i < eventLoop.timeoutsCount ; ) {
if (!eventLoop.timeouts[i].deleted) {
......@@ -421,7 +421,7 @@ static int virEventCleanupHandles(void) {
int i;
/* Remove deleted entries, shuffling down remaining
* entries as needed to form contigous series
* entries as needed to form contiguous series
*/
for (i = 0 ; i < eventLoop.handlesCount ; ) {
if (!eventLoop.handles[i].deleted) {
......
qemud/event.h
浏览文件 @ bb8340c1
......@@ -30,8 +30,8 @@
* virEventAddHandleImpl: register a callback for monitoring file handle events
*
* @fd: file handle to monitor for events
* @events: bitset of events to wach from POLLnnn constants
* @cb: callback to invoke when an event occurrs
* @events: bitset of events to watch from POLLnnn constants
* @cb: callback to invoke when an event occurs
* @opaque: user data to pass to callback
*
* returns -1 if the file handle cannot be registered, 0 upon success
......@@ -42,7 +42,7 @@ int virEventAddHandleImpl(int fd, int events, virEventHandleCallback cb, void *o
* virEventUpdateHandleImpl: change event set for a monitored file handle
*
* @fd: file handle to monitor for events
* @events: bitset of events to wach from POLLnnn constants
* @events: bitset of events to watch from POLLnnn constants
*
* Will not fail if fd exists
*/
......@@ -61,7 +61,7 @@ int virEventRemoveHandleImpl(int fd);
* virEventAddTimeoutImpl: register a callback for a timer event
*
* @frequency: time between events in milliseconds
* @cb: callback to invoke when an event occurrs
* @cb: callback to invoke when an event occurs
* @opaque: user data to pass to callback
*
* Setting frequency to -1 will disable the timer. Setting the frequency
......
qemud/libvirtd.conf
浏览文件 @ bb8340c1
......@@ -5,14 +5,14 @@
#################################################################
#
# Network connectivitiy controls
# Network connectivity controls
#
# Flag listening for secure TLS connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to
# have any effect.
#
# It is neccessary to setup a CA and issue server certificates before
# It is necessary to setup a CA and issue server certificates before
# using this capability.
#
# This is enabled by default, uncomment this to disable it
......
qemud/mdns.c
浏览文件 @ bb8340c1
......@@ -209,7 +209,7 @@ static void libvirtd_mdns_client_callback(AvahiClient *c, AvahiClientState state
/* The server records are now being established. This
* might be caused by a host name change. We need to wait
* for our own records to register until the host name is
* properly esatblished. */
* properly established. */
AVAHI_DEBUG("Client collision/connecting %p", mdns->client);
group = mdns->group;
while (group) {
......
qemud/mdns.h
浏览文件 @ bb8340c1
......@@ -69,7 +69,7 @@ struct libvirtd_mdns_group *libvirtd_mdns_add_group(struct libvirtd_mdns *mdns,
/**
* Removes a group container from advertizement
*
* @mdns amanger to detatch group from
* @mdns amanger to detach group from
* @group group to remove
*/
void libvirtd_mdns_remove_group(struct libvirtd_mdns *mdns, struct libvirtd_mdns_group *group);
......@@ -88,7 +88,7 @@ struct libvirtd_mdns_entry *libvirtd_mdns_add_entry(struct libvirtd_mdns_group *
/**
* Removes a service entry from a group
*
* @group group to deteach service entry from
* @group group to detach service entry from
* @entry service entry to remove
*/
void libvirtd_mdns_remove_entry(struct libvirtd_mdns_group *group, struct libvirtd_mdns_entry *entry);
......
qemud/remote.c
浏览文件 @ bb8340c1
......@@ -2261,7 +2261,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED,
}
/* We asked for an SSF layer, so sanity check that we actaully
/* We asked for an SSF layer, so sanity check that we actually
* got what we asked for */
static int
remoteSASLCheckSSF (struct qemud_client *client,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或