Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
e6b83046
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,发现更多精彩内容 >>
提交
e6b83046
编写于
11月 22, 2013
作者:
C
Cédric Bosdonnat
提交者:
Daniel P. Berrange
12月 10, 2013
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Create virDomainEventGraphics to get rid of the huge union
上级
b2232638
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
85 addition
and
63 deletion
+85
-63
src/conf/domain_event.c
src/conf/domain_event.c
+85
-63
未找到文件。
src/conf/domain_event.c
浏览文件 @
e6b83046
...
...
@@ -89,12 +89,14 @@ static virClassPtr virDomainEventLifecycleClass;
static
virClassPtr
virDomainEventRTCChangeClass
;
static
virClassPtr
virDomainEventWatchdogClass
;
static
virClassPtr
virDomainEventIOErrorClass
;
static
virClassPtr
virDomainEventGraphicsClass
;
static
void
virObjectEventDispose
(
void
*
obj
);
static
void
virDomainEventDispose
(
void
*
obj
);
static
void
virDomainEventLifecycleDispose
(
void
*
obj
);
static
void
virDomainEventRTCChangeDispose
(
void
*
obj
);
static
void
virDomainEventWatchdogDispose
(
void
*
obj
);
static
void
virDomainEventIOErrorDispose
(
void
*
obj
);
static
void
virDomainEventGraphicsDispose
(
void
*
obj
);
struct
_virObjectEvent
{
virObject
parent
;
...
...
@@ -107,13 +109,6 @@ struct _virDomainEvent {
virObjectMeta
meta
;
union
{
struct
{
int
phase
;
virDomainEventGraphicsAddressPtr
local
;
virDomainEventGraphicsAddressPtr
remote
;
char
*
authScheme
;
virDomainEventGraphicsSubjectPtr
subject
;
}
graphics
;
struct
{
char
*
path
;
int
type
;
...
...
@@ -175,6 +170,18 @@ struct _virDomainEventIOError {
typedef
struct
_virDomainEventIOError
virDomainEventIOError
;
typedef
virDomainEventIOError
*
virDomainEventIOErrorPtr
;
struct
_virDomainEventGraphics
{
virDomainEvent
parent
;
int
phase
;
virDomainEventGraphicsAddressPtr
local
;
virDomainEventGraphicsAddressPtr
remote
;
char
*
authScheme
;
virDomainEventGraphicsSubjectPtr
subject
;
};
typedef
struct
_virDomainEventGraphics
virDomainEventGraphics
;
typedef
virDomainEventGraphics
*
virDomainEventGraphicsPtr
;
static
int
virObjectEventOnceInit
(
void
)
{
if
(
!
(
virObjectEventClass
=
...
...
@@ -213,6 +220,12 @@ static int virObjectEventOnceInit(void)
sizeof
(
virDomainEventIOError
),
virDomainEventIOErrorDispose
)))
return
-
1
;
if
(
!
(
virDomainEventGraphicsClass
=
virClassNew
(
virDomainEventClass
,
"virDomainEventGraphics"
,
sizeof
(
virDomainEventGraphics
),
virDomainEventGraphicsDispose
)))
return
-
1
;
return
0
;
}
...
...
@@ -245,28 +258,6 @@ static void virDomainEventDispose(void *obj)
switch
(
virObjectEventGetEventID
(
event
))
{
case
VIR_DOMAIN_EVENT_ID_GRAPHICS
:
if
(
event
->
data
.
graphics
.
local
)
{
VIR_FREE
(
event
->
data
.
graphics
.
local
->
node
);
VIR_FREE
(
event
->
data
.
graphics
.
local
->
service
);
VIR_FREE
(
event
->
data
.
graphics
.
local
);
}
if
(
event
->
data
.
graphics
.
remote
)
{
VIR_FREE
(
event
->
data
.
graphics
.
remote
->
node
);
VIR_FREE
(
event
->
data
.
graphics
.
remote
->
service
);
VIR_FREE
(
event
->
data
.
graphics
.
remote
);
}
VIR_FREE
(
event
->
data
.
graphics
.
authScheme
);
if
(
event
->
data
.
graphics
.
subject
)
{
size_t
i
;
for
(
i
=
0
;
i
<
event
->
data
.
graphics
.
subject
->
nidentity
;
i
++
)
{
VIR_FREE
(
event
->
data
.
graphics
.
subject
->
identities
[
i
].
type
);
VIR_FREE
(
event
->
data
.
graphics
.
subject
->
identities
[
i
].
name
);
}
VIR_FREE
(
event
->
data
.
graphics
.
subject
);
}
break
;
case
VIR_DOMAIN_EVENT_ID_BLOCK_JOB
:
VIR_FREE
(
event
->
data
.
blockJob
.
path
);
break
;
...
...
@@ -315,6 +306,32 @@ static void virDomainEventIOErrorDispose(void *obj)
VIR_FREE
(
event
->
reason
);
}
static
void
virDomainEventGraphicsDispose
(
void
*
obj
)
{
virDomainEventGraphicsPtr
event
=
obj
;
VIR_DEBUG
(
"obj=%p"
,
event
);
if
(
event
->
local
)
{
VIR_FREE
(
event
->
local
->
node
);
VIR_FREE
(
event
->
local
->
service
);
VIR_FREE
(
event
->
local
);
}
if
(
event
->
remote
)
{
VIR_FREE
(
event
->
remote
->
node
);
VIR_FREE
(
event
->
remote
->
service
);
VIR_FREE
(
event
->
remote
);
}
VIR_FREE
(
event
->
authScheme
);
if
(
event
->
subject
)
{
size_t
i
;
for
(
i
=
0
;
i
<
event
->
subject
->
nidentity
;
i
++
)
{
VIR_FREE
(
event
->
subject
->
identities
[
i
].
type
);
VIR_FREE
(
event
->
subject
->
identities
[
i
].
name
);
}
VIR_FREE
(
event
->
subject
);
}
}
/**
* virObjectEventCallbackListFree:
* @list: event callback list head
...
...
@@ -1087,26 +1104,26 @@ virDomainEventPtr virDomainEventGraphicsNewFromDom(virDomainPtr dom,
const
char
*
authScheme
,
virDomainEventGraphicsSubjectPtr
subject
)
{
virDomainEventPtr
ev
;
virDomainEvent
Graphics
Ptr
ev
;
if
(
virObjectEventInitialize
()
<
0
)
return
NULL
;
if
(
!
(
ev
=
virDomainEventNew
(
virDomainEventClass
,
if
(
!
(
ev
=
virDomainEventNew
(
virDomainEvent
Graphics
Class
,
VIR_DOMAIN_EVENT_ID_GRAPHICS
,
dom
->
id
,
dom
->
name
,
dom
->
uuid
)))
return
NULL
;
ev
->
data
.
graphics
.
phase
=
phase
;
if
(
VIR_STRDUP
(
ev
->
data
.
graphics
.
authScheme
,
authScheme
)
<
0
)
{
ev
->
phase
=
phase
;
if
(
VIR_STRDUP
(
ev
->
authScheme
,
authScheme
)
<
0
)
{
virObjectUnref
(
ev
);
return
NULL
;
}
ev
->
data
.
graphics
.
local
=
local
;
ev
->
data
.
graphics
.
remote
=
remote
;
ev
->
data
.
graphics
.
subject
=
subject
;
ev
->
local
=
local
;
ev
->
remote
=
remote
;
ev
->
subject
=
subject
;
return
ev
;
return
(
virDomainEventPtr
)
ev
;
}
virDomainEventPtr
virDomainEventGraphicsNewFromObj
(
virDomainObjPtr
obj
,
...
...
@@ -1116,27 +1133,27 @@ virDomainEventPtr virDomainEventGraphicsNewFromObj(virDomainObjPtr obj,
const
char
*
authScheme
,
virDomainEventGraphicsSubjectPtr
subject
)
{
virDomainEventPtr
ev
;
virDomainEvent
Graphics
Ptr
ev
;
if
(
virObjectEventInitialize
()
<
0
)
return
NULL
;
if
(
!
(
ev
=
virDomainEventNew
(
virDomainEventClass
,
if
(
!
(
ev
=
virDomainEventNew
(
virDomainEvent
Graphics
Class
,
VIR_DOMAIN_EVENT_ID_GRAPHICS
,
obj
->
def
->
id
,
obj
->
def
->
name
,
obj
->
def
->
uuid
)))
return
NULL
;
ev
->
data
.
graphics
.
phase
=
phase
;
if
(
VIR_STRDUP
(
ev
->
data
.
graphics
.
authScheme
,
authScheme
)
<
0
)
{
ev
->
phase
=
phase
;
if
(
VIR_STRDUP
(
ev
->
authScheme
,
authScheme
)
<
0
)
{
virObjectUnref
(
ev
);
return
NULL
;
}
ev
->
data
.
graphics
.
local
=
local
;
ev
->
data
.
graphics
.
remote
=
remote
;
ev
->
data
.
graphics
.
subject
=
subject
;
ev
->
local
=
local
;
ev
->
remote
=
remote
;
ev
->
subject
=
subject
;
return
ev
;
return
(
virDomainEventPtr
)
ev
;
}
static
virDomainEventPtr
...
...
@@ -1600,14 +1617,19 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn,
}
case
VIR_DOMAIN_EVENT_ID_GRAPHICS
:
{
virDomainEventGraphicsPtr
graphicsEvent
;
graphicsEvent
=
(
virDomainEventGraphicsPtr
)
event
;
((
virConnectDomainEventGraphicsCallback
)
cb
)(
conn
,
dom
,
event
->
data
.
graphics
.
phase
,
event
->
data
.
graphics
.
local
,
event
->
data
.
graphics
.
remote
,
event
->
data
.
graphics
.
authScheme
,
event
->
data
.
graphics
.
subject
,
graphicsEvent
->
phase
,
graphicsEvent
->
local
,
graphicsEvent
->
remote
,
graphicsEvent
->
authScheme
,
graphicsEvent
->
subject
,
cbopaque
);
goto
cleanup
;
}
case
VIR_DOMAIN_EVENT_ID_CONTROL_ERROR
:
(
cb
)(
conn
,
dom
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录