Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
4e01a607
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,体验更适合开发者的 AI 搜索 >>
提交
4e01a607
编写于
7月 27, 2007
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Re-work test driver to implement (nearly) all APIs
上级
1d716405
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
1246 addition
and
719 deletion
+1246
-719
ChangeLog
ChangeLog
+11
-0
docs/testnetdef.xml
docs/testnetdef.xml
+12
-0
docs/testnetpriv.xml
docs/testnetpriv.xml
+11
-0
docs/testnode.xml
docs/testnode.xml
+2
-0
src/driver.h
src/driver.h
+1
-0
src/libvirt.c
src/libvirt.c
+13
-4
src/qemu_driver.c
src/qemu_driver.c
+1
-0
src/remote_internal.c
src/remote_internal.c
+3
-13
src/test.c
src/test.c
+1192
-702
未找到文件。
ChangeLog
浏览文件 @
4e01a607
Fri Jul 27 19:19:31 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/test.c: Added impl of networking APIs. Cleanup all other
existing APIs. Add missing domain APIs.
* src/remote_internal.c: Remove hack for network APIs + test
driver now it has its own impl
* src/libvirt.c, src/driver.h, src/qemu_driver.c: Added a
'name' field to network driver
* docs/testnode.xml, docs/testnetdef.xml, docs/testnetpriv.xml:
Added example XML for network APIs
Thu Jul 26 10:37:31 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/virsh.c docs/virsh.pod virsh.1: added a ttyconsole command,
...
...
docs/testnetdef.xml
0 → 100644
浏览文件 @
4e01a607
<network>
<name>
default
</name>
<uuid>
004b96e12d78c30f5aa5f03c87d21e69
</uuid>
<bridge
name=
'brdefault'
/>
<forward
dev=
'eth0'
/>
<ip
address=
'192.168.122.1'
netmask=
'255.255.255.0'
>
<dhcp>
<range
start=
'192.168.122.128'
end=
'192.168.122.253'
/>
</dhcp>
</ip>
</network>
docs/testnetpriv.xml
0 → 100644
浏览文件 @
4e01a607
<network>
<name>
private
</name>
<uuid>
004b22212d78c30f5aa5f03c87d21e69
</uuid>
<bridge
name=
'brpriv'
/>
<ip
address=
'192.168.124.1'
netmask=
'255.255.255.0'
>
<dhcp>
<range
start=
'192.168.124.128'
end=
'192.168.124.253'
/>
</dhcp>
</ip>
</network>
docs/testnode.xml
浏览文件 @
4e01a607
...
...
@@ -9,6 +9,8 @@
-->
<domain
file=
"testdomfv0.xml"
/>
<domain
file=
"testdomfc4.xml"
/>
<network
file=
"testnetpriv.xml"
/>
<network
file=
"testnetdef.xml"
/>
<cpu>
<mhz>
6000
</mhz>
...
...
src/driver.h
浏览文件 @
4e01a607
...
...
@@ -304,6 +304,7 @@ typedef virNetworkDriver *virNetworkDriverPtr;
* - close
*/
struct
_virNetworkDriver
{
const
char
*
name
;
/* the name of the driver */
virDrvOpen
open
;
virDrvClose
close
;
virDrvNumOfNetworks
numOfNetworks
;
...
...
src/libvirt.c
浏览文件 @
4e01a607
...
...
@@ -423,8 +423,8 @@ do_open (const char *name, int flags)
#endif
res
=
virDriverTab
[
i
]
->
open
(
ret
,
name
,
flags
);
#ifdef ENABLE_DEBUG
fprintf
(
stderr
,
"libvirt: do_open: driver %d returned %s
\n
"
,
i
,
fprintf
(
stderr
,
"libvirt: do_open: driver %d
%s
returned %s
\n
"
,
i
,
virDriverTab
[
i
]
->
name
,
res
==
VIR_DRV_OPEN_SUCCESS
?
"SUCCESS"
:
(
res
==
VIR_DRV_OPEN_DECLINED
?
"DECLINED"
:
(
res
==
VIR_DRV_OPEN_ERROR
?
"ERROR"
:
"unknown status"
)));
...
...
@@ -444,9 +444,18 @@ do_open (const char *name, int flags)
for
(
i
=
0
;
i
<
virNetworkDriverTabCount
;
i
++
)
{
res
=
virNetworkDriverTab
[
i
]
->
open
(
ret
,
name
,
flags
);
#ifdef ENABLE_DEBUG
fprintf
(
stderr
,
"libvirt: do_open: network driver %d %s returned %s
\n
"
,
i
,
virNetworkDriverTab
[
i
]
->
name
,
res
==
VIR_DRV_OPEN_SUCCESS
?
"SUCCESS"
:
(
res
==
VIR_DRV_OPEN_DECLINED
?
"DECLINED"
:
(
res
==
VIR_DRV_OPEN_ERROR
?
"ERROR"
:
"unknown status"
)));
#endif
if
(
res
==
VIR_DRV_OPEN_ERROR
)
{
virLibConnWarning
(
NULL
,
VIR_WAR_NO_NETWORK
,
"Is the daemon running ?"
);
if
(
STREQ
(
virNetworkDriverTab
[
i
]
->
name
,
"remote"
))
{
virLibConnWarning
(
NULL
,
VIR_WAR_NO_NETWORK
,
"Is the daemon running ?"
);
}
break
;
}
else
if
(
res
==
VIR_DRV_OPEN_SUCCESS
)
{
ret
->
networkDriver
=
virNetworkDriverTab
[
i
];
...
...
src/qemu_driver.c
浏览文件 @
4e01a607
...
...
@@ -2352,6 +2352,7 @@ static virDriver qemuDriver = {
};
static
virNetworkDriver
qemuNetworkDriver
=
{
"QEMU"
,
qemudOpenNetwork
,
/* open */
qemudCloseNetwork
,
/* close */
qemudNumNetworks
,
/* numOfNetworks */
...
...
src/remote_internal.c
浏览文件 @
4e01a607
...
...
@@ -2165,9 +2165,8 @@ remoteNetworkOpen (virConnectPtr conn,
}
else
{
/* Using a non-remote driver, so we need to open a
* new connection for network APIs, forcing it to
* use the UNIX transport. This handles Xen / Test
* drivers which don't have their own impl of the
* network APIs.
* use the UNIX transport. This handles Xen driver
* which doesn't have its own impl of the network APIs.
*/
struct
private_data
*
priv
=
malloc
(
sizeof
(
struct
private_data
));
int
ret
,
rflags
=
0
;
...
...
@@ -2177,17 +2176,7 @@ remoteNetworkOpen (virConnectPtr conn,
}
if
(
flags
&
VIR_DRV_OPEN_RO
)
rflags
|=
VIR_DRV_OPEN_REMOTE_RO
;
/* Xen driver is a single system-wide driver, so
* we need the main daemon. Test driver is per
* user, so use the per-user daemon, potentially
* autostarting
*/
rflags
|=
VIR_DRV_OPEN_REMOTE_UNIX
;
if
(
getuid
()
>
0
&&
!
strcmp
(
conn
->
driver
->
name
,
"test"
))
{
rflags
|=
VIR_DRV_OPEN_REMOTE_USER
;
rflags
|=
VIR_DRV_OPEN_REMOTE_AUTOSTART
;
}
memset
(
priv
,
0
,
sizeof
(
struct
private_data
));
priv
->
magic
=
DEAD
;
...
...
@@ -2950,6 +2939,7 @@ static virDriver driver = {
};
static
virNetworkDriver
network_driver
=
{
.
name
=
"remote"
,
.
open
=
remoteNetworkOpen
,
.
close
=
remoteNetworkClose
,
.
numOfNetworks
=
remoteNumOfNetworks
,
...
...
src/test.c
浏览文件 @
4e01a607
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录