提交 b4882504 编写于 作者: R Richard W.M. Jones

Fix typos (Atsushi SAKAI).

上级 63bc5dd3
Tue Feb 26 23:16:00 EST 2006 Daniel P. Berrange <berrange@redhat.com>
Wed Feb 27 10:34:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
Fix typos (Atsushi SAKAI).
Tue Feb 26 23:16:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/capabilities.h, src/capabilities.c, src/Makefile.am:
Add generic API for dealing with hypervisor capabilities
......
......@@ -28,7 +28,7 @@
/**
* virEventHandleCallback: callback for receiving file handle events
*
* @fd: file handle on which the event occured
* @fd: file handle on which the event occurred
* @events: bitset of events from POLLnnn constants
* @opaque: user data registered with handle
*/
......@@ -38,8 +38,8 @@ typedef void (*virEventHandleCallback)(int fd, int events, void *opaque);
* virEventAddHandle: 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
......@@ -50,7 +50,7 @@ int virEventAddHandle(int fd, int events, virEventHandleCallback cb, void *opaqu
* virEventUpdateHandle: 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
*/
......@@ -77,7 +77,7 @@ typedef void (*virEventTimeoutCallback)(int timer, void *opaque);
* virEventAddTimeout: 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
......
......@@ -544,7 +544,7 @@ iptablesContextNew(void)
* iptablesContextFree:
* @ctx: pointer to the IP table context
*
* Free the ressources associated with an IP table context
* Free the resources associated with an IP table context
*/
void
iptablesContextFree(iptablesContext *ctx)
......@@ -663,7 +663,7 @@ iptablesAddTcpInput(iptablesContext *ctx,
* @iface: the interface name
* @port: the TCP port to remove
*
* Removes an input from the IP table, hence forbiding access to the given
* Removes an input from the IP table, hence forbidding access to the given
* @port on the given @iface interface for TCP packets
*
* Returns 0 in case of success or an error code in case of error
......@@ -702,7 +702,7 @@ iptablesAddUdpInput(iptablesContext *ctx,
* @iface: the interface name
* @port: the UDP port to remove
*
* Removes an input from the IP table, hence forbiding access to the given
* Removes an input from the IP table, hence forbidding access to the given
* @port on the given @iface interface for UDP packets
*
* Returns 0 in case of success or an error code in case of error
......
......@@ -24,7 +24,7 @@
/**
* virSexprError:
* @conn: the connection if available
* @error: the error noumber
* @error: the error number
* @info: extra information string
*
* Handle an error in the S-Expression code
......@@ -289,7 +289,7 @@ trim(const char *string)
* @end: pointer to an index in the buffer for the already parsed bytes
*
* Internal routine implementing the parse of S-Expression
* Note that failure in this function is catrosphic. If it returns
* Note that failure in this function is catastrophic. If it returns
* NULL, you've leaked memory and you're currently OOM. It will always
* parse an SEXPR given a buffer
*
......@@ -387,7 +387,7 @@ _string2sexpr(const char *buffer, size_t * end)
* @buffer: a zero terminated buffer containing an S-Expression in UTF-8
*
* Parse the S-Expression in the buffer.
* Note that failure in this function is catrosphic. If it returns
* Note that failure in this function is catastrophic. If it returns
* NULL, you've leaked memory and you're currently OOM. It will always
* parse an SEXPR given a buffer
*
......
......@@ -43,7 +43,7 @@ socket_errno (void)
#include <winsock2.h>
/* Socket functions in Windoze don't set errno. Instead of using errno
/* Socket functions in Windows don't set errno. Instead of using errno
* to test for socket errors, call this function to get the errno.
*/
static inline int
......
......@@ -335,7 +335,7 @@ virStorageBackendStablePath(virConnectPtr conn,
* Run an external program.
*
* Read its output and apply a series of regexes to each line
* When the entire set of regexes has matched consequetively
* When the entire set of regexes has matched consecutively
* then run a callback passing in all the matches
*/
int
......
......@@ -324,7 +324,7 @@ virStorageBackendDiskMakeVol(virConnectPtr conn,
STREQ(groups[2], "metadata"))
return 0;
/* Remaining data / metdata parts get turn into volumes... */
/* Remaining data / metadata parts get turn into volumes... */
if (STREQ(groups[2], "metadata") ||
STREQ(groups[2], "data")) {
virStorageVolDefPtr vol = data;
......@@ -338,7 +338,7 @@ virStorageBackendDiskMakeVol(virConnectPtr conn,
/* ....or free space extents */
return virStorageBackendDiskMakeFreeExtent(conn, pool, groups);
} else {
/* This codepath should never happen unless someone changed
/* This code path should never happen unless someone changed
* libvirt_parthelper forgot to change this code */
return -1;
}
......
......@@ -698,7 +698,7 @@ virStorageVolDefParseDoc(virConnectPtr conn,
goto cleanup;
}
/* Auto-generated so delibrately ignore */
/* Auto-generated so deliberately ignore */
/*ret->key = virXPathString("string(/volume/key)", ctxt);*/
capacity = virXPathString("string(/volume/capacity)", ctxt);
......
......@@ -20,7 +20,7 @@
static virError lastErr = /* the last error */
{ 0, 0, NULL, VIR_ERR_NONE, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL };
static virErrorFunc virErrorHandler = NULL; /* global error handlet */
static virErrorFunc virErrorHandler = NULL; /* global error handler */
static void *virUserData = NULL; /* associated data */
/*
......@@ -67,7 +67,7 @@ static void *virUserData = NULL; /* associated data */
* Simpler but may not be suitable for multithreaded accesses, in which
* case use virCopyLastError()
*
* Returns a pointer to the last error or NULL if none occured.
* Returns a pointer to the last error or NULL if none occurred.
*/
virErrorPtr
virGetLastError(void)
......@@ -135,7 +135,7 @@ virResetLastError(void)
* Simpler but may not be suitable for multithreaded accesses, in which
* case use virConnCopyLastError()
*
* Returns a pointer to the last error or NULL if none occured.
* Returns a pointer to the last error or NULL if none occurred.
*/
virErrorPtr
virConnGetLastError(virConnectPtr conn)
......@@ -405,7 +405,7 @@ __virRaiseError(virConnectPtr conn, virDomainPtr dom, virNetworkPtr net,
/**
* __virErrorMsg:
* @error: the virErrorNumber
* @info: usually the first paprameter string
* @info: usually the first parameter string
*
* Internal routine to get the message associated to an error raised
* from the library
......@@ -668,9 +668,9 @@ __virErrorMsg(virErrorNumber error, const char *info)
break;
case VIR_ERR_INVALID_MAC:
if (info == NULL)
errmsg = _("invalid MAC adress");
errmsg = _("invalid MAC address");
else
errmsg = _("invalid MAC adress: %s");
errmsg = _("invalid MAC address: %s");
break;
case VIR_ERR_AUTH_FAILED:
if (info == NULL)
......
......@@ -138,7 +138,7 @@ static regex_t xen_cap_rec;
struct xen_v0_getdomaininfo {
domid_t domain; /* the domain number */
uint32_t flags; /* falgs, see before */
uint32_t flags; /* flags, see before */
uint64_t tot_pages; /* total number of pages used */
uint64_t max_pages; /* maximum number of pages allowed */
unsigned long shared_info_frame; /* MFN of shared_info struct */
......@@ -152,7 +152,7 @@ typedef struct xen_v0_getdomaininfo xen_v0_getdomaininfo;
struct xen_v2_getdomaininfo {
domid_t domain; /* the domain number */
uint32_t flags; /* falgs, see before */
uint32_t flags; /* flags, see before */
uint64_t tot_pages; /* total number of pages used */
uint64_t max_pages; /* maximum number of pages allowed */
uint64_t shared_info_frame; /* MFN of shared_info struct */
......@@ -171,7 +171,7 @@ typedef struct xen_v2_getdomaininfo xen_v2_getdomaininfo;
struct xen_v2d5_getdomaininfo {
domid_t domain; /* the domain number */
uint32_t flags; /* falgs, see before */
uint32_t flags; /* flags, see before */
uint64_t tot_pages ALIGN_64; /* total number of pages used */
uint64_t max_pages ALIGN_64; /* maximum number of pages allowed */
uint64_t shared_info_frame ALIGN_64; /* MFN of shared_info struct */
......@@ -809,7 +809,7 @@ virXenPerror (virConnectPtr conn, const char *msg)
/**
* xenHypervisorDoV0Op:
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hyperviros operation structure
* @op: pointer to the hypervisor operation structure
*
* Do an hypervisor operation though the old interface,
* this leads to an hypervisor call through ioctl.
......@@ -850,7 +850,7 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op)
/**
* xenHypervisorDoV1Op:
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hyperviros operation structure
* @op: pointer to the hypervisor operation structure
*
* Do an hypervisor v1 operation, this leads to an hypervisor call through
* ioctl.
......@@ -894,7 +894,7 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op)
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hypervisor operation structure
*
* Do an hypervisor v2 stsyem operation, this leads to an hypervisor
* Do an hypervisor v2 system operation, this leads to an hypervisor
* call through ioctl.
*
* Returns 0 in case of success and -1 in case of error.
......@@ -1970,7 +1970,7 @@ xenHypervisorInit(void)
#endif
/*
* we faild to make any hypercall
* we failed to make any hypercall
*/
hypervisor_version = -1;
......@@ -2049,7 +2049,7 @@ xenHypervisorInit(void)
}
/*
* we faild to make the getdomaininfolist hypercall
* we failed to make the getdomaininfolist hypercall
*/
hypervisor_version = -1;
......@@ -3183,7 +3183,7 @@ xenHypervisorPinVcpu(virDomainPtr domain, unsigned int vcpu,
* underlying virtualization system (Xen...).
*
* Extract information about virtual CPUs of domain, store it in info array
* and also in cpumaps if this pointer is'nt NULL.
* and also in cpumaps if this pointer isn't NULL.
*
* Returns the number of info filled in case of success, -1 in case of failure.
*/
......
......@@ -92,7 +92,7 @@ static int nbNodeCpus = -1;
* @conn: pointer to the hypervisor connection
*
* Initializer for previous variables. We currently assume that
* the number of physical CPU and the numebr of NUMA cell is fixed
* the number of physical CPU and the number of NUMA cell is fixed
* until reboot which might be false in future Xen implementations.
*/
static void
......@@ -111,7 +111,7 @@ xenNumaInit(virConnectPtr conn) {
* xenNbCells:
* @conn: pointer to the hypervisor connection
*
* Number of NUMa cells present in the actual Node
* Number of NUMA cells present in the actual Node
*
* Returns the number of NUMA cells available on that Node
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册