Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
42dd6a99
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,体验更适合开发者的 AI 搜索 >>
提交
42dd6a99
编写于
5月 21, 2015
作者:
C
Cole Robinson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
conf: storage: Don't emit empty <permissions> block
上级
7c2d65dd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
26 addition
and
22 deletion
+26
-22
src/conf/storage_conf.c
src/conf/storage_conf.c
+26
-16
tests/storagepoolxml2xmlout/pool-netfs-gluster.xml
tests/storagepoolxml2xmlout/pool-netfs-gluster.xml
+0
-2
tests/storagevolxml2xmlout/vol-gluster-dir.xml
tests/storagevolxml2xmlout/vol-gluster-dir.xml
+0
-2
tests/storagevolxml2xmlout/vol-sheepdog.xml
tests/storagevolxml2xmlout/vol-sheepdog.xml
+0
-2
未找到文件。
src/conf/storage_conf.c
浏览文件 @
42dd6a99
...
...
@@ -1179,22 +1179,28 @@ virStoragePoolDefFormatBuf(virBufferPtr buf,
virBufferEscapeString
(
buf
,
"<path>%s</path>
\n
"
,
def
->
target
.
path
);
virBufferAddLit
(
buf
,
"<permissions>
\n
"
);
virBufferAdjustIndent
(
buf
,
2
);
if
(
def
->
target
.
perms
.
mode
!=
(
mode_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<mode>0%o</mode>
\n
"
,
def
->
target
.
perms
.
mode
);
if
(
def
->
target
.
perms
.
uid
!=
(
uid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<owner>%d</owner>
\n
"
,
(
int
)
def
->
target
.
perms
.
uid
);
if
(
def
->
target
.
perms
.
gid
!=
(
gid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<group>%d</group>
\n
"
,
(
int
)
def
->
target
.
perms
.
gid
);
virBufferEscapeString
(
buf
,
"<label>%s</label>
\n
"
,
def
->
target
.
perms
.
label
);
if
(
def
->
target
.
perms
.
mode
!=
(
mode_t
)
-
1
||
def
->
target
.
perms
.
uid
!=
(
uid_t
)
-
1
||
def
->
target
.
perms
.
gid
!=
(
gid_t
)
-
1
||
def
->
target
.
perms
.
label
)
{
virBufferAddLit
(
buf
,
"<permissions>
\n
"
);
virBufferAdjustIndent
(
buf
,
2
);
if
(
def
->
target
.
perms
.
mode
!=
(
mode_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<mode>0%o</mode>
\n
"
,
def
->
target
.
perms
.
mode
);
if
(
def
->
target
.
perms
.
uid
!=
(
uid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<owner>%d</owner>
\n
"
,
(
int
)
def
->
target
.
perms
.
uid
);
if
(
def
->
target
.
perms
.
gid
!=
(
gid_t
)
-
1
)
virBufferAsprintf
(
buf
,
"<group>%d</group>
\n
"
,
(
int
)
def
->
target
.
perms
.
gid
);
virBufferEscapeString
(
buf
,
"<label>%s</label>
\n
"
,
def
->
target
.
perms
.
label
);
virBufferAdjustIndent
(
buf
,
-
2
);
virBufferAddLit
(
buf
,
"</permissions>
\n
"
);
}
virBufferAdjustIndent
(
buf
,
-
2
);
virBufferAddLit
(
buf
,
"</permissions>
\n
"
);
virBufferAdjustIndent
(
buf
,
-
2
);
virBufferAddLit
(
buf
,
"</target>
\n
"
);
}
...
...
@@ -1513,7 +1519,11 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options,
virBufferAsprintf
(
buf
,
"<format type='%s'/>
\n
"
,
format
);
}
if
(
def
->
perms
)
{
if
(
def
->
perms
&&
(
def
->
perms
->
mode
!=
(
mode_t
)
-
1
||
def
->
perms
->
uid
!=
(
uid_t
)
-
1
||
def
->
perms
->
gid
!=
(
gid_t
)
-
1
||
def
->
perms
->
label
))
{
virBufferAddLit
(
buf
,
"<permissions>
\n
"
);
virBufferAdjustIndent
(
buf
,
2
);
...
...
tests/storagepoolxml2xmlout/pool-netfs-gluster.xml
浏览文件 @
42dd6a99
...
...
@@ -11,7 +11,5 @@
</source>
<target>
<path>
/mnt/gluster
</path>
<permissions>
</permissions>
</target>
</pool>
tests/storagevolxml2xmlout/vol-gluster-dir.xml
浏览文件 @
42dd6a99
...
...
@@ -8,7 +8,5 @@
<target>
<path>
gluster://example.com/vol/dir
</path>
<format
type=
'dir'
/>
<permissions>
</permissions>
</target>
</volume>
tests/storagevolxml2xmlout/vol-sheepdog.xml
浏览文件 @
42dd6a99
...
...
@@ -7,7 +7,5 @@
<target>
<path>
sheepdog:test2
</path>
<format
type=
'unknown'
/>
<permissions>
</permissions>
</target>
</volume>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录