Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
3b12eca6
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,发现更多精彩内容 >>
提交
3b12eca6
编写于
10月 02, 2014
作者:
T
Taowei
提交者:
Michal Privoznik
10月 03, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: Rewrite vboxNetworkCreate
上级
1f8b9882
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
73 addition
and
68 deletion
+73
-68
src/vbox/vbox_network.c
src/vbox/vbox_network.c
+72
-0
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+0
-68
src/vbox/vbox_uniformed_api.h
src/vbox/vbox_uniformed_api.h
+1
-0
未找到文件。
src/vbox/vbox_network.c
浏览文件 @
3b12eca6
...
...
@@ -736,3 +736,75 @@ int vboxNetworkDestroy(virNetworkPtr network)
{
return
vboxNetworkUndefineDestroy
(
network
,
false
);
}
int
vboxNetworkCreate
(
virNetworkPtr
network
)
{
vboxGlobalData
*
data
=
network
->
conn
->
privateData
;
char
*
networkNameUtf8
=
NULL
;
PRUnichar
*
networkInterfaceNameUtf16
=
NULL
;
IHostNetworkInterface
*
networkInterface
=
NULL
;
PRUnichar
*
networkNameUtf16
=
NULL
;
IDHCPServer
*
dhcpServer
=
NULL
;
PRUnichar
*
trunkTypeUtf16
=
NULL
;
PRUint32
interfaceType
=
0
;
IHost
*
host
=
NULL
;
int
ret
=
-
1
;
if
(
!
data
->
vboxObj
)
return
ret
;
gVBoxAPI
.
UIVirtualBox
.
GetHost
(
data
->
vboxObj
,
&
host
);
if
(
!
host
)
return
ret
;
/* Current limitation of the function for VirtualBox 2.2.* is
* that the default hostonly network "vboxnet0" is always active
* and thus all this functions does is start the dhcp server,
* but the network can still be used without starting the dhcp
* server by giving the machine static IP
*/
if
(
virAsprintf
(
&
networkNameUtf8
,
"HostInterfaceNetworking-%s"
,
network
->
name
)
<
0
)
goto
cleanup
;
VBOX_UTF8_TO_UTF16
(
network
->
name
,
&
networkInterfaceNameUtf16
);
gVBoxAPI
.
UIHost
.
FindHostNetworkInterfaceByName
(
host
,
networkInterfaceNameUtf16
,
&
networkInterface
);
if
(
!
networkInterface
)
goto
cleanup
;
gVBoxAPI
.
UIHNInterface
.
GetInterfaceType
(
networkInterface
,
&
interfaceType
);
if
(
interfaceType
!=
HostNetworkInterfaceType_HostOnly
)
goto
cleanup
;
VBOX_UTF8_TO_UTF16
(
networkNameUtf8
,
&
networkNameUtf16
);
gVBoxAPI
.
UIVirtualBox
.
FindDHCPServerByNetworkName
(
data
->
vboxObj
,
networkNameUtf16
,
&
dhcpServer
);
if
(
!
dhcpServer
)
goto
cleanup
;
gVBoxAPI
.
UIDHCPServer
.
SetEnabled
(
dhcpServer
,
PR_TRUE
);
VBOX_UTF8_TO_UTF16
(
"netflt"
,
&
trunkTypeUtf16
);
gVBoxAPI
.
UIDHCPServer
.
Start
(
dhcpServer
,
networkNameUtf16
,
networkInterfaceNameUtf16
,
trunkTypeUtf16
);
VBOX_UTF16_FREE
(
trunkTypeUtf16
);
ret
=
0
;
cleanup:
VBOX_RELEASE
(
dhcpServer
);
VBOX_UTF16_FREE
(
networkNameUtf16
);
VBOX_RELEASE
(
networkInterface
);
VBOX_UTF16_FREE
(
networkInterfaceNameUtf16
);
VBOX_RELEASE
(
host
);
VIR_FREE
(
networkNameUtf8
);
return
ret
;
}
src/vbox/vbox_tmpl.c
浏览文件 @
3b12eca6
...
...
@@ -2042,74 +2042,6 @@ _registerDomainEvent(virDriverPtr driver)
* The Network Functions here on
*/
static
int
vboxNetworkCreate
(
virNetworkPtr
network
)
{
VBOX_OBJECT_HOST_CHECK
(
network
->
conn
,
int
,
-
1
);
char
*
networkNameUtf8
=
NULL
;
PRUnichar
*
networkInterfaceNameUtf16
=
NULL
;
IHostNetworkInterface
*
networkInterface
=
NULL
;
/* Current limitation of the function for VirtualBox 2.2.* is
* that the default hostonly network "vboxnet0" is always active
* and thus all this functions does is start the dhcp server,
* but the network can still be used without starting the dhcp
* server by giving the machine static IP
*/
if
(
virAsprintf
(
&
networkNameUtf8
,
"HostInterfaceNetworking-%s"
,
network
->
name
)
<
0
)
goto
cleanup
;
VBOX_UTF8_TO_UTF16
(
network
->
name
,
&
networkInterfaceNameUtf16
);
host
->
vtbl
->
FindHostNetworkInterfaceByName
(
host
,
networkInterfaceNameUtf16
,
&
networkInterface
);
if
(
networkInterface
)
{
PRUint32
interfaceType
=
0
;
networkInterface
->
vtbl
->
GetInterfaceType
(
networkInterface
,
&
interfaceType
);
if
(
interfaceType
==
HostNetworkInterfaceType_HostOnly
)
{
PRUnichar
*
networkNameUtf16
=
NULL
;
IDHCPServer
*
dhcpServer
=
NULL
;
VBOX_UTF8_TO_UTF16
(
networkNameUtf8
,
&
networkNameUtf16
);
data
->
vboxObj
->
vtbl
->
FindDHCPServerByNetworkName
(
data
->
vboxObj
,
networkNameUtf16
,
&
dhcpServer
);
if
(
dhcpServer
)
{
PRUnichar
*
trunkTypeUtf16
=
NULL
;
dhcpServer
->
vtbl
->
SetEnabled
(
dhcpServer
,
PR_TRUE
);
VBOX_UTF8_TO_UTF16
(
"netflt"
,
&
trunkTypeUtf16
);
dhcpServer
->
vtbl
->
Start
(
dhcpServer
,
networkNameUtf16
,
networkInterfaceNameUtf16
,
trunkTypeUtf16
);
VBOX_UTF16_FREE
(
trunkTypeUtf16
);
VBOX_RELEASE
(
dhcpServer
);
}
VBOX_UTF16_FREE
(
networkNameUtf16
);
}
VBOX_RELEASE
(
networkInterface
);
}
VBOX_UTF16_FREE
(
networkInterfaceNameUtf16
);
VBOX_RELEASE
(
host
);
ret
=
0
;
cleanup:
VIR_FREE
(
networkNameUtf8
);
return
ret
;
}
static
char
*
vboxNetworkGetXMLDesc
(
virNetworkPtr
network
,
unsigned
int
flags
)
{
...
...
src/vbox/vbox_uniformed_api.h
浏览文件 @
3b12eca6
...
...
@@ -593,6 +593,7 @@ virNetworkPtr vboxNetworkCreateXML(virConnectPtr conn, const char *xml);
virNetworkPtr
vboxNetworkDefineXML
(
virConnectPtr
conn
,
const
char
*
xml
);
int
vboxNetworkUndefine
(
virNetworkPtr
network
);
int
vboxNetworkDestroy
(
virNetworkPtr
network
);
int
vboxNetworkCreate
(
virNetworkPtr
network
);
/* Version specified functions for installing uniformed API */
void
vbox22InstallUniformedAPI
(
vboxUniformedAPI
*
pVBoxAPI
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录