Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
1d963578
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,发现更多精彩内容 >>
提交
1d963578
编写于
12月 29, 2016
作者:
D
Dawid Zamirski
提交者:
John Ferlan
1月 10, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vbox: remove domain events support.
this was implemented only for vbox 3 series and was mostly stubs anyway.
上级
374422ea
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
688 deletion
+2
-688
src/vbox/vbox_common.c
src/vbox/vbox_common.c
+0
-20
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+0
-648
src/vbox/vbox_uniformed_api.h
src/vbox/vbox_uniformed_api.h
+2
-20
未找到文件。
src/vbox/vbox_common.c
浏览文件 @
1d963578
...
...
@@ -111,8 +111,6 @@ vboxDriverDispose(void *obj)
virObjectUnref
(
driver
->
caps
);
virObjectUnref
(
driver
->
xmlopt
);
if
(
gVBoxAPI
.
domainEventCallbacks
)
virObjectUnref
(
driver
->
domainEventState
);
}
static
int
...
...
@@ -145,10 +143,6 @@ vboxDriverObjNew(void)
NULL
,
NULL
)))
goto
cleanup
;
if
(
gVBoxAPI
.
domainEventCallbacks
&&
!
(
driver
->
domainEventState
=
virObjectEventStateNew
()))
goto
cleanup
;
return
driver
;
cleanup:
...
...
@@ -199,10 +193,6 @@ vboxSdkInitialize(void)
if
(
gVBoxAPI
.
UPFN
.
Initialize
(
vbox_driver
)
!=
0
)
return
-
1
;
if
(
gVBoxAPI
.
domainEventCallbacks
&&
gVBoxAPI
.
initializeDomainEvent
(
vbox_driver
)
!=
0
)
return
-
1
;
if
(
vbox_driver
->
vboxObj
==
NULL
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"IVirtualBox object is null"
));
...
...
@@ -7816,14 +7806,6 @@ virHypervisorDriver vboxCommonDriver = {
.
domainScreenshot
=
vboxDomainScreenshot
,
/* 0.9.2 */
};
static
void
updateDriver
(
void
)
{
/* Update the vboxDriver according to the vboxUniformedAPI.
* We need to make sure the vboxUniformedAPI is initialized
* before calling this function. */
gVBoxAPI
.
registerDomainEvent
(
&
vboxCommonDriver
);
}
virHypervisorDriverPtr
vboxGetHypervisorDriver
(
uint32_t
uVersion
)
{
/* Install gVBoxAPI according to the vbox API version. */
...
...
@@ -7835,7 +7817,5 @@ virHypervisorDriverPtr vboxGetHypervisorDriver(uint32_t uVersion)
return
NULL
;
}
updateDriver
();
return
&
vboxCommonDriver
;
}
src/vbox/vbox_tmpl.c
浏览文件 @
1d963578
此差异已折叠。
点击以展开。
src/vbox/vbox_uniformed_api.h
浏览文件 @
1d963578
...
...
@@ -27,7 +27,7 @@
*
* The vbox_tmpl.c is the only place where the driver knows the inside
* architecture of those vbox structs(vboxObj, vboxSession,
* pFuncs,
vboxCallback and vboxQueue
). The file should be included
* pFuncs,
and vboxCallback
). The file should be included
* after the currect vbox_CAPI_v*.h, then we can use the vbox structs
* in vboxGlobalData. The vbox_tmpl.c should implement functions
* defined in vboxUniformedAPI.
...
...
@@ -36,7 +36,7 @@
* The vbox_driver.c collects vboxUniformedAPI for all versions.
* Then vboxRegister calls the vboxRegisterUniformedAPI to register.
* Note: In vbox_driver.c, the vbox structs in vboxGlobalData is
* defined by vbox_CAPI_v
2.2
.h.
* defined by vbox_CAPI_v
4_0
.h.
*
* The vbox_common.c, it is used to generate common codes for all vbox
* versions. Bacause the same member varible's offset in a vbox struct
...
...
@@ -96,14 +96,6 @@ typedef union {
PRInt32
resultCode
;
}
resultCodeUnion
;
struct
_vboxCallback
{
struct
IVirtualBoxCallback_vtbl
*
vtbl
;
virConnectPtr
conn
;
int
vboxCallBackRefCount
;
};
typedef
struct
_vboxCallback
vboxCallback
;
typedef
struct
_vboxCallback
*
vboxCallbackPtr
;
struct
_vboxDriver
{
virObjectLockable
parent
;
...
...
@@ -120,13 +112,6 @@ struct _vboxDriver {
IVirtualBoxClient
*
vboxClient
;
# endif
int
fdWatch
;
vboxCallbackPtr
vboxCallback
;
# if VBOX_API_VERSION > 2002000 && VBOX_API_VERSION < 4000000
nsIEventQueue
*
vboxQueue
;
# else
void
*
vboxQueue
;
# endif
unsigned
long
version
;
/* reference counting of vbox connections */
...
...
@@ -548,7 +533,6 @@ typedef struct {
uint32_t
APIVersion
;
uint32_t
XPCOMCVersion
;
/* vbox APIs */
int
(
*
initializeDomainEvent
)(
vboxDriverPtr
driver
);
void
(
*
detachDevices
)(
vboxDriverPtr
driver
,
IMachine
*
machine
,
PRUnichar
*
hddcnameUtf16
);
nsresult
(
*
unregisterMachine
)(
vboxDriverPtr
driver
,
vboxIIDUnion
*
iidu
,
IMachine
**
machine
);
void
(
*
deleteConfig
)(
IMachine
*
machine
);
...
...
@@ -562,7 +546,6 @@ typedef struct {
int
(
*
attachFloppy
)(
vboxDriverPtr
driver
,
IMachine
*
machine
,
const
char
*
src
);
int
(
*
detachFloppy
)(
IMachine
*
machine
);
int
(
*
snapshotRestore
)(
virDomainPtr
dom
,
IMachine
*
machine
,
ISnapshot
*
snapshot
);
void
(
*
registerDomainEvent
)(
virHypervisorDriverPtr
driver
);
vboxUniformedPFN
UPFN
;
vboxUniformedIID
UIID
;
vboxUniformedArray
UArray
;
...
...
@@ -593,7 +576,6 @@ typedef struct {
vboxUniformedIKeyboard
UIKeyboard
;
uniformedMachineStateChecker
machineStateChecker
;
/* vbox API features */
bool
domainEventCallbacks
;
bool
chipsetType
;
bool
accelerate2DVideo
;
bool
oldMediumInterface
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录