Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
61dab0f7
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,发现更多精彩内容 >>
提交
61dab0f7
编写于
6月 25, 2015
作者:
C
Cédric Bosdonnat
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virt-aa-helper: rename ctl->hvm to ctl->os
ctl->hvm contains os.type string value, change the name to reflect it.
上级
a55a5e7c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
6 addition
and
6 deletion
+6
-6
src/security/virt-aa-helper.c
src/security/virt-aa-helper.c
+6
-6
未找到文件。
src/security/virt-aa-helper.c
浏览文件 @
61dab0f7
...
@@ -73,7 +73,7 @@ typedef struct {
...
@@ -73,7 +73,7 @@ typedef struct {
virDomainDefPtr
def
;
/* VM definition */
virDomainDefPtr
def
;
/* VM definition */
virCapsPtr
caps
;
/* VM capabilities */
virCapsPtr
caps
;
/* VM capabilities */
virDomainXMLOptionPtr
xmlopt
;
/* XML parser data */
virDomainXMLOptionPtr
xmlopt
;
/* XML parser data */
char
*
hvm
;
/* type of hypervisor (eg hvm, xen
) */
char
*
os
;
/* type of os (eg hvm, xen, exe
) */
virArch
arch
;
/* machine architecture */
virArch
arch
;
/* machine architecture */
char
*
newfile
;
/* newly added file */
char
*
newfile
;
/* newly added file */
bool
append
;
/* append to .files instead of rewrite */
bool
append
;
/* append to .files instead of rewrite */
...
@@ -89,7 +89,7 @@ vahDeinit(vahControl * ctl)
...
@@ -89,7 +89,7 @@ vahDeinit(vahControl * ctl)
virObjectUnref
(
ctl
->
caps
);
virObjectUnref
(
ctl
->
caps
);
virObjectUnref
(
ctl
->
xmlopt
);
virObjectUnref
(
ctl
->
xmlopt
);
VIR_FREE
(
ctl
->
files
);
VIR_FREE
(
ctl
->
files
);
VIR_FREE
(
ctl
->
hvm
);
VIR_FREE
(
ctl
->
os
);
VIR_FREE
(
ctl
->
newfile
);
VIR_FREE
(
ctl
->
newfile
);
return
0
;
return
0
;
...
@@ -641,7 +641,7 @@ verify_xpath_context(xmlXPathContextPtr ctxt)
...
@@ -641,7 +641,7 @@ verify_xpath_context(xmlXPathContextPtr ctxt)
/*
/*
* Parse the xml we received to fill in the following:
* Parse the xml we received to fill in the following:
* ctl->
hvm
* ctl->
os
* ctl->arch
* ctl->arch
*
*
* These are suitable for setting up a virCapsPtr
* These are suitable for setting up a virCapsPtr
...
@@ -668,8 +668,8 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
...
@@ -668,8 +668,8 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
if
(
verify_xpath_context
(
ctxt
)
!=
0
)
if
(
verify_xpath_context
(
ctxt
)
!=
0
)
goto
cleanup
;
goto
cleanup
;
ctl
->
hvm
=
virXPathString
(
"string(./os/type[1])"
,
ctxt
);
ctl
->
os
=
virXPathString
(
"string(./os/type[1])"
,
ctxt
);
if
(
!
ctl
->
hvm
)
{
if
(
!
ctl
->
os
)
{
vah_error
(
ctl
,
0
,
_
(
"os.type is not defined"
));
vah_error
(
ctl
,
0
,
_
(
"os.type is not defined"
));
goto
cleanup
;
goto
cleanup
;
}
}
...
@@ -714,7 +714,7 @@ get_definition(vahControl * ctl, const char *xmlStr)
...
@@ -714,7 +714,7 @@ get_definition(vahControl * ctl, const char *xmlStr)
goto
exit
;
goto
exit
;
}
}
if
((
ostype
=
virDomainOSTypeFromString
(
ctl
->
hvm
))
<
0
)
{
if
((
ostype
=
virDomainOSTypeFromString
(
ctl
->
os
))
<
0
)
{
vah_error
(
ctl
,
0
,
_
(
"unknown OS type"
));
vah_error
(
ctl
,
0
,
_
(
"unknown OS type"
));
goto
exit
;
goto
exit
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录