Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
06fcee63
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,发现更多精彩内容 >>
提交
06fcee63
编写于
12月 22, 2016
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
secret: add support for lifecycle events
Signed-off-by:
N
Daniel P. Berrange
<
berrange@redhat.com
>
上级
3b7bd6e5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
70 addition
and
0 deletion
+70
-0
src/secret/secret_driver.c
src/secret/secret_driver.c
+70
-0
未找到文件。
src/secret/secret_driver.c
浏览文件 @
06fcee63
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
#include "configmake.h"
#include "configmake.h"
#include "virstring.h"
#include "virstring.h"
#include "viraccessapicheck.h"
#include "viraccessapicheck.h"
#include "secret_event.h"
#define VIR_FROM_THIS VIR_FROM_SECRET
#define VIR_FROM_THIS VIR_FROM_SECRET
...
@@ -58,6 +59,9 @@ struct _virSecretDriverState {
...
@@ -58,6 +59,9 @@ struct _virSecretDriverState {
virMutex
lock
;
virMutex
lock
;
virSecretObjListPtr
secrets
;
virSecretObjListPtr
secrets
;
char
*
configDir
;
char
*
configDir
;
/* Immutable pointer, self-locking APIs */
virObjectEventStatePtr
secretEventState
;
};
};
static
virSecretDriverStatePtr
driver
;
static
virSecretDriverStatePtr
driver
;
...
@@ -218,6 +222,7 @@ secretDefineXML(virConnectPtr conn,
...
@@ -218,6 +222,7 @@ secretDefineXML(virConnectPtr conn,
virSecretObjPtr
secret
=
NULL
;
virSecretObjPtr
secret
=
NULL
;
virSecretDefPtr
backup
=
NULL
;
virSecretDefPtr
backup
=
NULL
;
virSecretDefPtr
new_attrs
;
virSecretDefPtr
new_attrs
;
virObjectEventPtr
event
=
NULL
;
virCheckFlags
(
0
,
NULL
);
virCheckFlags
(
0
,
NULL
);
...
@@ -256,6 +261,12 @@ secretDefineXML(virConnectPtr conn,
...
@@ -256,6 +261,12 @@ secretDefineXML(virConnectPtr conn,
/* Saved successfully - drop old values */
/* Saved successfully - drop old values */
virSecretDefFree
(
backup
);
virSecretDefFree
(
backup
);
event
=
virSecretEventLifecycleNew
(
new_attrs
->
uuid
,
new_attrs
->
usage_type
,
new_attrs
->
usage_id
,
VIR_SECRET_EVENT_DEFINED
,
0
);
ret
=
virGetSecret
(
conn
,
ret
=
virGetSecret
(
conn
,
new_attrs
->
uuid
,
new_attrs
->
uuid
,
new_attrs
->
usage_type
,
new_attrs
->
usage_type
,
...
@@ -276,6 +287,8 @@ secretDefineXML(virConnectPtr conn,
...
@@ -276,6 +287,8 @@ secretDefineXML(virConnectPtr conn,
cleanup:
cleanup:
virSecretDefFree
(
new_attrs
);
virSecretDefFree
(
new_attrs
);
virSecretObjEndAPI
(
&
secret
);
virSecretObjEndAPI
(
&
secret
);
if
(
event
)
virObjectEventStateQueue
(
driver
->
secretEventState
,
event
);
return
ret
;
return
ret
;
}
}
...
@@ -381,6 +394,7 @@ secretUndefine(virSecretPtr obj)
...
@@ -381,6 +394,7 @@ secretUndefine(virSecretPtr obj)
int
ret
=
-
1
;
int
ret
=
-
1
;
virSecretObjPtr
secret
;
virSecretObjPtr
secret
;
virSecretDefPtr
def
;
virSecretDefPtr
def
;
virObjectEventPtr
event
=
NULL
;
if
(
!
(
secret
=
secretObjFromSecret
(
obj
)))
if
(
!
(
secret
=
secretObjFromSecret
(
obj
)))
goto
cleanup
;
goto
cleanup
;
...
@@ -392,6 +406,12 @@ secretUndefine(virSecretPtr obj)
...
@@ -392,6 +406,12 @@ secretUndefine(virSecretPtr obj)
if
(
virSecretObjDeleteConfig
(
secret
)
<
0
)
if
(
virSecretObjDeleteConfig
(
secret
)
<
0
)
goto
cleanup
;
goto
cleanup
;
event
=
virSecretEventLifecycleNew
(
def
->
uuid
,
def
->
usage_type
,
def
->
usage_id
,
VIR_SECRET_EVENT_UNDEFINED
,
0
);
virSecretObjDeleteData
(
secret
);
virSecretObjDeleteData
(
secret
);
virSecretObjListRemove
(
driver
->
secrets
,
secret
);
virSecretObjListRemove
(
driver
->
secrets
,
secret
);
...
@@ -400,6 +420,8 @@ secretUndefine(virSecretPtr obj)
...
@@ -400,6 +420,8 @@ secretUndefine(virSecretPtr obj)
cleanup:
cleanup:
virSecretObjEndAPI
(
&
secret
);
virSecretObjEndAPI
(
&
secret
);
if
(
event
)
virObjectEventStateQueue
(
driver
->
secretEventState
,
event
);
return
ret
;
return
ret
;
}
}
...
@@ -415,6 +437,8 @@ secretStateCleanup(void)
...
@@ -415,6 +437,8 @@ secretStateCleanup(void)
virObjectUnref
(
driver
->
secrets
);
virObjectUnref
(
driver
->
secrets
);
VIR_FREE
(
driver
->
configDir
);
VIR_FREE
(
driver
->
configDir
);
virObjectUnref
(
driver
->
secretEventState
);
secretDriverUnlock
();
secretDriverUnlock
();
virMutexDestroy
(
&
driver
->
lock
);
virMutexDestroy
(
&
driver
->
lock
);
VIR_FREE
(
driver
);
VIR_FREE
(
driver
);
...
@@ -438,6 +462,8 @@ secretStateInitialize(bool privileged,
...
@@ -438,6 +462,8 @@ secretStateInitialize(bool privileged,
}
}
secretDriverLock
();
secretDriverLock
();
driver
->
secretEventState
=
virObjectEventStateNew
();
if
(
privileged
)
{
if
(
privileged
)
{
if
(
VIR_STRDUP
(
base
,
SYSCONFDIR
"/libvirt"
)
<
0
)
if
(
VIR_STRDUP
(
base
,
SYSCONFDIR
"/libvirt"
)
<
0
)
goto
error
;
goto
error
;
...
@@ -479,6 +505,48 @@ secretStateReload(void)
...
@@ -479,6 +505,48 @@ secretStateReload(void)
return
0
;
return
0
;
}
}
static
int
secretConnectSecretEventRegisterAny
(
virConnectPtr
conn
,
virSecretPtr
secret
,
int
eventID
,
virConnectSecretEventGenericCallback
callback
,
void
*
opaque
,
virFreeCallback
freecb
)
{
int
callbackID
=
-
1
;
if
(
virConnectSecretEventRegisterAnyEnsureACL
(
conn
)
<
0
)
goto
cleanup
;
if
(
virSecretEventStateRegisterID
(
conn
,
driver
->
secretEventState
,
secret
,
eventID
,
callback
,
opaque
,
freecb
,
&
callbackID
)
<
0
)
callbackID
=
-
1
;
cleanup:
return
callbackID
;
}
static
int
secretConnectSecretEventDeregisterAny
(
virConnectPtr
conn
,
int
callbackID
)
{
int
ret
=
-
1
;
if
(
virConnectSecretEventDeregisterAnyEnsureACL
(
conn
)
<
0
)
goto
cleanup
;
if
(
virObjectEventStateDeregisterID
(
conn
,
driver
->
secretEventState
,
callbackID
)
<
0
)
goto
cleanup
;
ret
=
0
;
cleanup:
return
ret
;
}
static
virSecretDriver
secretDriver
=
{
static
virSecretDriver
secretDriver
=
{
.
name
=
"secret"
,
.
name
=
"secret"
,
.
connectNumOfSecrets
=
secretConnectNumOfSecrets
,
/* 0.7.1 */
.
connectNumOfSecrets
=
secretConnectNumOfSecrets
,
/* 0.7.1 */
...
@@ -491,6 +559,8 @@ static virSecretDriver secretDriver = {
...
@@ -491,6 +559,8 @@ static virSecretDriver secretDriver = {
.
secretSetValue
=
secretSetValue
,
/* 0.7.1 */
.
secretSetValue
=
secretSetValue
,
/* 0.7.1 */
.
secretGetValue
=
secretGetValue
,
/* 0.7.1 */
.
secretGetValue
=
secretGetValue
,
/* 0.7.1 */
.
secretUndefine
=
secretUndefine
,
/* 0.7.1 */
.
secretUndefine
=
secretUndefine
,
/* 0.7.1 */
.
connectSecretEventRegisterAny
=
secretConnectSecretEventRegisterAny
,
/* 3.0.0 */
.
connectSecretEventDeregisterAny
=
secretConnectSecretEventDeregisterAny
,
/* 3.0.0 */
};
};
static
virStateDriver
stateDriver
=
{
static
virStateDriver
stateDriver
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录