Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
b4882504
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,发现更多精彩内容 >>
提交
b4882504
编写于
2月 27, 2008
作者:
R
Richard W.M. Jones
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typos (Atsushi SAKAI).
上级
63bc5dd3
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
38 addition
and
34 deletion
+38
-34
ChangeLog
ChangeLog
+5
-1
src/event.h
src/event.h
+5
-5
src/iptables.c
src/iptables.c
+3
-3
src/sexpr.c
src/sexpr.c
+3
-3
src/socketcompat.h
src/socketcompat.h
+1
-1
src/storage_backend.c
src/storage_backend.c
+1
-1
src/storage_backend_disk.c
src/storage_backend_disk.c
+2
-2
src/storage_conf.c
src/storage_conf.c
+1
-1
src/virterror.c
src/virterror.c
+6
-6
src/xen_internal.c
src/xen_internal.c
+9
-9
src/xen_unified.c
src/xen_unified.c
+2
-2
未找到文件。
ChangeLog
浏览文件 @
b4882504
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
...
...
src/event.h
浏览文件 @
b4882504
...
...
@@ -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 occur
r
ed
* @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 occur
r
s
* @events: bitset of events to wa
t
ch 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 wa
t
ch 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 occur
r
s
* @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
...
...
src/iptables.c
浏览文件 @
b4882504
...
...
@@ -544,7 +544,7 @@ iptablesContextNew(void)
* iptablesContextFree:
* @ctx: pointer to the IP table context
*
* Free the res
s
ources 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 forbid
d
ing 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 forbid
d
ing 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
...
...
src/sexpr.c
浏览文件 @
b4882504
...
...
@@ -24,7 +24,7 @@
/**
* virSexprError:
* @conn: the connection if available
* @error: the error n
o
umber
* @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 cat
ros
phic. If it returns
* Note that failure in this function is cat
astro
phic. 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 cat
ros
phic. If it returns
* Note that failure in this function is cat
astro
phic. If it returns
* NULL, you've leaked memory and you're currently OOM. It will always
* parse an SEXPR given a buffer
*
...
...
src/socketcompat.h
浏览文件 @
b4882504
...
...
@@ -43,7 +43,7 @@ socket_errno (void)
#include <winsock2.h>
/* Socket functions in Windo
ze
don't set errno. Instead of using errno
/* Socket functions in Windo
ws
don't set errno. Instead of using errno
* to test for socket errors, call this function to get the errno.
*/
static
inline
int
...
...
src/storage_backend.c
浏览文件 @
b4882504
...
...
@@ -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 conse
que
tively
* When the entire set of regexes has matched conse
cu
tively
* then run a callback passing in all the matches
*/
int
...
...
src/storage_backend_disk.c
浏览文件 @
b4882504
...
...
@@ -324,7 +324,7 @@ virStorageBackendDiskMakeVol(virConnectPtr conn,
STREQ
(
groups
[
2
],
"metadata"
))
return
0
;
/* Remaining data / metdata parts get turn into volumes... */
/* Remaining data / met
a
data 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
;
}
...
...
src/storage_conf.c
浏览文件 @
b4882504
...
...
@@ -698,7 +698,7 @@ virStorageVolDefParseDoc(virConnectPtr conn,
goto
cleanup
;
}
/* Auto-generated so delibrately ignore */
/* Auto-generated so delib
e
rately ignore */
/*ret->key = virXPathString("string(/volume/key)", ctxt);*/
capacity
=
virXPathString
(
"string(/volume/capacity)"
,
ctxt
);
...
...
src/virterror.c
浏览文件 @
b4882504
...
...
@@ -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 handle
t
*/
static
virErrorFunc
virErrorHandler
=
NULL
;
/* global error handle
r
*/
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 occur
r
ed.
*/
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 occur
r
ed.
*/
virErrorPtr
virConnGetLastError
(
virConnectPtr
conn
)
...
...
@@ -405,7 +405,7 @@ __virRaiseError(virConnectPtr conn, virDomainPtr dom, virNetworkPtr net,
/**
* __virErrorMsg:
* @error: the virErrorNumber
* @info: usually the first pa
p
rameter 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 ad
d
ress"
);
else
errmsg
=
_
(
"invalid MAC adress: %s"
);
errmsg
=
_
(
"invalid MAC ad
d
ress: %s"
);
break
;
case
VIR_ERR_AUTH_FAILED
:
if
(
info
==
NULL
)
...
...
src/xen_internal.c
浏览文件 @
b4882504
...
...
@@ -138,7 +138,7 @@ static regex_t xen_cap_rec;
struct
xen_v0_getdomaininfo
{
domid_t
domain
;
/* the domain number */
uint32_t
flags
;
/* f
al
gs, see before */
uint32_t
flags
;
/* f
la
gs, 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
;
/* f
al
gs, see before */
uint32_t
flags
;
/* f
la
gs, 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
;
/* f
al
gs, see before */
uint32_t
flags
;
/* f
la
gs, 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 hypervi
ros
operation structure
* @op: pointer to the hypervi
sor
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 hypervi
ros
operation structure
* @op: pointer to the hypervi
sor
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 s
tsy
em operation, this leads to an hypervisor
* Do an hypervisor v2 s
yst
em 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 fail
e
d to make any hypercall
*/
hypervisor_version
=
-
1
;
...
...
@@ -2049,7 +2049,7 @@ xenHypervisorInit(void)
}
/*
* we faild to make the getdomaininfolist hypercall
* we fail
e
d 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
'n
t NULL.
* and also in cpumaps if this pointer is
n'
t NULL.
*
* Returns the number of info filled in case of success, -1 in case of failure.
*/
...
...
src/xen_unified.c
浏览文件 @
b4882504
...
...
@@ -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 num
eb
r of NUMA cell is fixed
* the number of physical CPU and the num
be
r 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 NUM
a
cells present in the actual Node
* Number of NUM
A
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录