Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
7c4bc3f9
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,发现更多精彩内容 >>
提交
7c4bc3f9
编写于
12月 18, 2008
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use pid_t for all PID tracking variables (John Levon)
上级
9e8517c7
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
29 addition
and
12 deletion
+29
-12
ChangeLog
ChangeLog
+7
-0
src/openvz_driver.c
src/openvz_driver.c
+4
-2
src/proxy_internal.c
src/proxy_internal.c
+2
-1
src/remote_internal.c
src/remote_internal.c
+2
-1
src/storage_backend.c
src/storage_backend.c
+4
-2
src/uml_driver.c
src/uml_driver.c
+2
-1
src/util.c
src/util.c
+6
-4
src/util.h
src/util.h
+2
-1
未找到文件。
ChangeLog
浏览文件 @
7c4bc3f9
Thu Dec 18 11:56:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Use pid_t for all PID tracking variables (John Levon)
* src/openvz_driver.c, src/proxy_internal.h, src/remote_internal.c,
src/storage_backend.c, src/uml_driver.c, src/util.c, src/util.h:
s/int/pid_t/
Thu Dec 18 11:54:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Thu Dec 18 11:54:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* qemud/Makefile.am: Don't munge default network XML if
* qemud/Makefile.am: Don't munge default network XML if
...
...
src/openvz_driver.c
浏览文件 @
7c4bc3f9
...
@@ -1102,7 +1102,8 @@ static char *openvzGetCapabilities(virConnectPtr conn) {
...
@@ -1102,7 +1102,8 @@ static char *openvzGetCapabilities(virConnectPtr conn) {
static
int
openvzListDomains
(
virConnectPtr
conn
,
int
*
ids
,
int
nids
)
{
static
int
openvzListDomains
(
virConnectPtr
conn
,
int
*
ids
,
int
nids
)
{
int
got
=
0
;
int
got
=
0
;
int
veid
,
pid
;
int
veid
;
pid_t
pid
;
int
outfd
=
-
1
;
int
outfd
=
-
1
;
int
errfd
=
-
1
;
int
errfd
=
-
1
;
int
ret
;
int
ret
;
...
@@ -1153,7 +1154,8 @@ static int openvzNumDomains(virConnectPtr conn) {
...
@@ -1153,7 +1154,8 @@ static int openvzNumDomains(virConnectPtr conn) {
static
int
openvzListDefinedDomains
(
virConnectPtr
conn
,
static
int
openvzListDefinedDomains
(
virConnectPtr
conn
,
char
**
const
names
,
int
nnames
)
{
char
**
const
names
,
int
nnames
)
{
int
got
=
0
;
int
got
=
0
;
int
veid
,
pid
,
outfd
=
-
1
,
errfd
=
-
1
,
ret
;
int
veid
,
outfd
=
-
1
,
errfd
=
-
1
,
ret
;
pid_t
pid
;
char
vpsname
[
32
];
char
vpsname
[
32
];
char
buf
[
32
];
char
buf
[
32
];
char
*
endptr
;
char
*
endptr
;
...
...
src/proxy_internal.c
浏览文件 @
7c4bc3f9
...
@@ -144,7 +144,8 @@ static int
...
@@ -144,7 +144,8 @@ static int
virProxyForkServer
(
void
)
virProxyForkServer
(
void
)
{
{
const
char
*
proxyPath
=
virProxyFindServerPath
();
const
char
*
proxyPath
=
virProxyFindServerPath
();
int
ret
,
pid
,
status
;
int
ret
,
status
;
pid_t
pid
;
const
char
*
proxyarg
[
2
];
const
char
*
proxyarg
[
2
];
if
(
!
proxyPath
)
{
if
(
!
proxyPath
)
{
...
...
src/remote_internal.c
浏览文件 @
7c4bc3f9
...
@@ -252,7 +252,8 @@ remoteForkDaemon(virConnectPtr conn)
...
@@ -252,7 +252,8 @@ remoteForkDaemon(virConnectPtr conn)
{
{
const
char
*
daemonPath
=
remoteFindDaemonPath
();
const
char
*
daemonPath
=
remoteFindDaemonPath
();
const
char
*
const
daemonargs
[]
=
{
daemonPath
,
"--timeout=30"
,
NULL
};
const
char
*
const
daemonargs
[]
=
{
daemonPath
,
"--timeout=30"
,
NULL
};
int
ret
,
pid
,
status
;
int
ret
,
status
;
pid_t
pid
;
if
(
!
daemonPath
)
{
if
(
!
daemonPath
)
{
error
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"failed to find libvirtd binary"
));
error
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"failed to find libvirtd binary"
));
...
...
src/storage_backend.c
浏览文件 @
7c4bc3f9
...
@@ -411,7 +411,8 @@ virStorageBackendRunProgRegex(virConnectPtr conn,
...
@@ -411,7 +411,8 @@ virStorageBackendRunProgRegex(virConnectPtr conn,
void
*
data
,
void
*
data
,
int
*
outexit
)
int
*
outexit
)
{
{
int
child
=
0
,
fd
=
-
1
,
exitstatus
,
err
,
failed
=
1
;
int
fd
=
-
1
,
exitstatus
,
err
,
failed
=
1
;
pid_t
child
=
0
;
FILE
*
list
=
NULL
;
FILE
*
list
=
NULL
;
regex_t
*
reg
;
regex_t
*
reg
;
regmatch_t
*
vars
=
NULL
;
regmatch_t
*
vars
=
NULL
;
...
@@ -575,7 +576,8 @@ virStorageBackendRunProgNul(virConnectPtr conn,
...
@@ -575,7 +576,8 @@ virStorageBackendRunProgNul(virConnectPtr conn,
void
*
data
)
void
*
data
)
{
{
size_t
n_tok
=
0
;
size_t
n_tok
=
0
;
int
child
=
0
,
fd
=
-
1
,
exitstatus
;
int
fd
=
-
1
,
exitstatus
;
pid_t
child
=
0
;
FILE
*
fp
=
NULL
;
FILE
*
fp
=
NULL
;
char
**
v
;
char
**
v
;
int
err
=
-
1
;
int
err
=
-
1
;
...
...
src/uml_driver.c
浏览文件 @
7c4bc3f9
...
@@ -711,7 +711,8 @@ static int umlStartVMDaemon(virConnectPtr conn,
...
@@ -711,7 +711,8 @@ static int umlStartVMDaemon(virConnectPtr conn,
virDomainObjPtr
vm
)
{
virDomainObjPtr
vm
)
{
const
char
**
argv
=
NULL
,
**
tmp
;
const
char
**
argv
=
NULL
,
**
tmp
;
const
char
**
progenv
=
NULL
;
const
char
**
progenv
=
NULL
;
int
i
,
ret
,
pid
;
int
i
,
ret
;
pid_t
pid
;
char
*
logfile
;
char
*
logfile
;
int
logfd
=
-
1
;
int
logfd
=
-
1
;
struct
stat
sb
;
struct
stat
sb
;
...
...
src/util.c
浏览文件 @
7c4bc3f9
...
@@ -182,10 +182,11 @@ __virExec(virConnectPtr conn,
...
@@ -182,10 +182,11 @@ __virExec(virConnectPtr conn,
const
char
*
const
*
argv
,
const
char
*
const
*
argv
,
const
char
*
const
*
envp
,
const
char
*
const
*
envp
,
const
fd_set
*
keepfd
,
const
fd_set
*
keepfd
,
in
t
*
retpid
,
pid_
t
*
retpid
,
int
infd
,
int
*
outfd
,
int
*
errfd
,
int
infd
,
int
*
outfd
,
int
*
errfd
,
int
flags
)
{
int
flags
)
{
int
pid
,
null
,
i
,
openmax
;
pid_t
pid
;
int
null
,
i
,
openmax
;
int
pipeout
[
2
]
=
{
-
1
,
-
1
};
int
pipeout
[
2
]
=
{
-
1
,
-
1
};
int
pipeerr
[
2
]
=
{
-
1
,
-
1
};
int
pipeerr
[
2
]
=
{
-
1
,
-
1
};
int
childout
=
-
1
;
int
childout
=
-
1
;
...
@@ -439,7 +440,7 @@ virExec(virConnectPtr conn,
...
@@ -439,7 +440,7 @@ virExec(virConnectPtr conn,
const
char
*
const
*
argv
,
const
char
*
const
*
argv
,
const
char
*
const
*
envp
,
const
char
*
const
*
envp
,
const
fd_set
*
keepfd
,
const
fd_set
*
keepfd
,
in
t
*
retpid
,
pid_
t
*
retpid
,
int
infd
,
int
*
outfd
,
int
*
errfd
,
int
infd
,
int
*
outfd
,
int
*
errfd
,
int
flags
)
{
int
flags
)
{
char
*
argv_str
;
char
*
argv_str
;
...
@@ -554,7 +555,8 @@ int
...
@@ -554,7 +555,8 @@ int
virRun
(
virConnectPtr
conn
,
virRun
(
virConnectPtr
conn
,
const
char
*
const
*
argv
,
const
char
*
const
*
argv
,
int
*
status
)
{
int
*
status
)
{
int
childpid
,
exitstatus
,
execret
,
waitret
;
pid_t
childpid
;
int
exitstatus
,
execret
,
waitret
;
int
ret
=
-
1
;
int
ret
=
-
1
;
int
errfd
=
-
1
,
outfd
=
-
1
;
int
errfd
=
-
1
,
outfd
=
-
1
;
char
*
outbuf
=
NULL
;
char
*
outbuf
=
NULL
;
...
...
src/util.h
浏览文件 @
7c4bc3f9
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
#include "verify.h"
#include "verify.h"
#include <sys/select.h>
#include <sys/select.h>
#include <sys/types.h>
int
saferead
(
int
fd
,
void
*
buf
,
size_t
count
);
int
saferead
(
int
fd
,
void
*
buf
,
size_t
count
);
ssize_t
safewrite
(
int
fd
,
const
void
*
buf
,
size_t
count
);
ssize_t
safewrite
(
int
fd
,
const
void
*
buf
,
size_t
count
);
...
@@ -41,7 +42,7 @@ int virExec(virConnectPtr conn,
...
@@ -41,7 +42,7 @@ int virExec(virConnectPtr conn,
const
char
*
const
*
argv
,
const
char
*
const
*
argv
,
const
char
*
const
*
envp
,
const
char
*
const
*
envp
,
const
fd_set
*
keepfd
,
const
fd_set
*
keepfd
,
in
t
*
retpid
,
pid_
t
*
retpid
,
int
infd
,
int
infd
,
int
*
outfd
,
int
*
outfd
,
int
*
errfd
,
int
*
errfd
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录