Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
ee951b9f
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,发现更多精彩内容 >>
提交
ee951b9f
编写于
10月 02, 2014
作者:
T
Taowei
提交者:
Michal Privoznik
10月 03, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: Rewrite vboxNetworkLookupByName
上级
e4f24f89
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
69 addition
and
38 deletion
+69
-38
src/vbox/vbox_network.c
src/vbox/vbox_network.c
+49
-0
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+16
-38
src/vbox/vbox_uniformed_api.h
src/vbox/vbox_uniformed_api.h
+4
-0
未找到文件。
src/vbox/vbox_network.c
浏览文件 @
ee951b9f
...
...
@@ -364,3 +364,52 @@ virNetworkPtr vboxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *u
vboxIIDUnalloc
(
&
iid
);
return
ret
;
}
virNetworkPtr
vboxNetworkLookupByName
(
virConnectPtr
conn
,
const
char
*
name
)
{
vboxGlobalData
*
data
=
conn
->
privateData
;
PRUnichar
*
nameUtf16
=
NULL
;
IHostNetworkInterface
*
networkInterface
=
NULL
;
PRUint32
interfaceType
=
0
;
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
vboxIIDUnion
iid
;
IHost
*
host
=
NULL
;
virNetworkPtr
ret
=
NULL
;
nsresult
rc
;
if
(
!
data
->
vboxObj
)
return
ret
;
gVBoxAPI
.
UIVirtualBox
.
GetHost
(
data
->
vboxObj
,
&
host
);
if
(
!
host
)
return
ret
;
VBOX_IID_INITIALIZE
(
&
iid
);
VBOX_UTF8_TO_UTF16
(
name
,
&
nameUtf16
);
gVBoxAPI
.
UIHost
.
FindHostNetworkInterfaceByName
(
host
,
nameUtf16
,
&
networkInterface
);
if
(
!
networkInterface
)
goto
cleanup
;
gVBoxAPI
.
UIHNInterface
.
GetInterfaceType
(
networkInterface
,
&
interfaceType
);
if
(
interfaceType
!=
HostNetworkInterfaceType_HostOnly
)
goto
cleanup
;
rc
=
gVBoxAPI
.
UIHNInterface
.
GetId
(
networkInterface
,
&
iid
);
if
(
NS_FAILED
(
rc
))
goto
cleanup
;
vboxIIDToUUID
(
&
iid
,
uuid
);
ret
=
virGetNetwork
(
conn
,
name
,
uuid
);
VIR_DEBUG
(
"Network Name: %s"
,
name
);
DEBUGIID
(
"Network UUID"
,
&
iid
);
vboxIIDUnalloc
(
&
iid
);
cleanup:
VBOX_RELEASE
(
networkInterface
);
VBOX_UTF16_FREE
(
nameUtf16
);
VBOX_RELEASE
(
host
);
return
ret
;
}
src/vbox/vbox_tmpl.c
浏览文件 @
ee951b9f
...
...
@@ -2060,44 +2060,6 @@ _registerDomainEvent(virDriverPtr driver)
* The Network Functions here on
*/
static
virNetworkPtr
vboxNetworkLookupByName
(
virConnectPtr
conn
,
const
char
*
name
)
{
VBOX_OBJECT_HOST_CHECK
(
conn
,
virNetworkPtr
,
NULL
);
PRUnichar
*
nameUtf16
=
NULL
;
IHostNetworkInterface
*
networkInterface
=
NULL
;
VBOX_UTF8_TO_UTF16
(
name
,
&
nameUtf16
);
host
->
vtbl
->
FindHostNetworkInterfaceByName
(
host
,
nameUtf16
,
&
networkInterface
);
if
(
networkInterface
)
{
PRUint32
interfaceType
=
0
;
networkInterface
->
vtbl
->
GetInterfaceType
(
networkInterface
,
&
interfaceType
);
if
(
interfaceType
==
HostNetworkInterfaceType_HostOnly
)
{
unsigned
char
uuid
[
VIR_UUID_BUFLEN
];
vboxIID
iid
=
VBOX_IID_INITIALIZER
;
networkInterface
->
vtbl
->
GetId
(
networkInterface
,
&
iid
.
value
);
vboxIIDToUUID
(
&
iid
,
uuid
);
ret
=
virGetNetwork
(
conn
,
name
,
uuid
);
VIR_DEBUG
(
"Network Name: %s"
,
name
);
DEBUGIID
(
"Network UUID"
,
iid
.
value
);
vboxIIDUnalloc
(
&
iid
);
}
VBOX_RELEASE
(
networkInterface
);
}
VBOX_UTF16_FREE
(
nameUtf16
);
VBOX_RELEASE
(
host
);
return
ret
;
}
static
virNetworkPtr
vboxNetworkDefineCreateXML
(
virConnectPtr
conn
,
const
char
*
xml
,
bool
start
)
{
...
...
@@ -5860,6 +5822,14 @@ _hostFindHostNetworkInterfaceById(IHost *host, vboxIIDUnion *iidu,
networkInterface
);
}
static
nsresult
_hostFindHostNetworkInterfaceByName
(
IHost
*
host
,
PRUnichar
*
name
,
IHostNetworkInterface
**
networkInterface
)
{
return
host
->
vtbl
->
FindHostNetworkInterfaceByName
(
host
,
name
,
networkInterface
);
}
static
nsresult
_hnInterfaceGetInterfaceType
(
IHostNetworkInterface
*
hni
,
PRUint32
*
interfaceType
)
{
...
...
@@ -5878,6 +5848,12 @@ _hnInterfaceGetName(IHostNetworkInterface *hni, PRUnichar **name)
return
hni
->
vtbl
->
GetName
(
hni
,
name
);
}
static
nsresult
_hnInterfaceGetId
(
IHostNetworkInterface
*
hni
,
vboxIIDUnion
*
iidu
)
{
return
hni
->
vtbl
->
GetId
(
hni
,
&
IID_MEMBER
(
value
));
}
static
bool
_machineStateOnline
(
PRUint32
state
)
{
return
((
state
>=
MachineState_FirstOnline
)
&&
...
...
@@ -6183,12 +6159,14 @@ static vboxUniformedIDisplay _UIDisplay = {
static
vboxUniformedIHost
_UIHost
=
{
.
FindHostNetworkInterfaceById
=
_hostFindHostNetworkInterfaceById
,
.
FindHostNetworkInterfaceByName
=
_hostFindHostNetworkInterfaceByName
,
};
static
vboxUniformedIHNInterface
_UIHNInterface
=
{
.
GetInterfaceType
=
_hnInterfaceGetInterfaceType
,
.
GetStatus
=
_hnInterfaceGetStatus
,
.
GetName
=
_hnInterfaceGetName
,
.
GetId
=
_hnInterfaceGetId
,
};
static
uniformedMachineStateChecker
_machineStateChecker
=
{
...
...
src/vbox/vbox_uniformed_api.h
浏览文件 @
ee951b9f
...
...
@@ -470,6 +470,8 @@ typedef struct {
typedef
struct
{
nsresult
(
*
FindHostNetworkInterfaceById
)(
IHost
*
host
,
vboxIIDUnion
*
iidu
,
IHostNetworkInterface
**
networkInterface
);
nsresult
(
*
FindHostNetworkInterfaceByName
)(
IHost
*
host
,
PRUnichar
*
name
,
IHostNetworkInterface
**
networkInterface
);
}
vboxUniformedIHost
;
/* Functions for IHostNetworkInterface */
...
...
@@ -477,6 +479,7 @@ typedef struct {
nsresult
(
*
GetInterfaceType
)(
IHostNetworkInterface
*
hni
,
PRUint32
*
interfaceType
);
nsresult
(
*
GetStatus
)(
IHostNetworkInterface
*
hni
,
PRUint32
*
status
);
nsresult
(
*
GetName
)(
IHostNetworkInterface
*
hni
,
PRUnichar
**
name
);
nsresult
(
*
GetId
)(
IHostNetworkInterface
*
hni
,
vboxIIDUnion
*
iidu
);
}
vboxUniformedIHNInterface
;
typedef
struct
{
...
...
@@ -560,6 +563,7 @@ int vboxConnectListNetworks(virConnectPtr conn, char **const names, int nnames);
int
vboxConnectNumOfDefinedNetworks
(
virConnectPtr
conn
);
int
vboxConnectListDefinedNetworks
(
virConnectPtr
conn
,
char
**
const
names
,
int
nnames
);
virNetworkPtr
vboxNetworkLookupByUUID
(
virConnectPtr
conn
,
const
unsigned
char
*
uuid
);
virNetworkPtr
vboxNetworkLookupByName
(
virConnectPtr
conn
,
const
char
*
name
);
/* 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录