Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c63f08e0
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,发现更多精彩内容 >>
提交
c63f08e0
编写于
9月 03, 2006
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow trailing ',' in lists, and '_' in names
上级
184c0bba
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
14 addition
and
2 deletion
+14
-2
ChangeLog
ChangeLog
+7
-0
src/conf.c
src/conf.c
+4
-1
tests/confdata/fc4.conf
tests/confdata/fc4.conf
+2
-1
tests/confdata/fc4.out
tests/confdata/fc4.out
+1
-0
未找到文件。
ChangeLog
浏览文件 @
c63f08e0
Sun Sep 3 12:50:12 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/conf.c: Allow '_' in variable names, and don't fail if there
is a trailing ',' at the end of a list.
* tests/confdata/fc4.conf, tests/confdata/fc4.out: Expand test
config to include a '_' in a name, and a trailing ',' in a list.
Sun Sep 3 12:47:42 EDT 2006 Daniel Berrange <berrange@redhat.com>
* tests/.cvsignore, tests/confdata/.cvsignore: Ignore autogenerated
...
...
src/conf.c
浏览文件 @
c63f08e0
...
...
@@ -443,6 +443,9 @@ virConfParseValue(virConfParserCtxtPtr ctxt)
}
NEXT
;
SKIP_BLANKS
;
if
(
CUR
==
']'
)
{
break
;
}
tmp
=
virConfParseValue
(
ctxt
);
if
(
tmp
==
NULL
)
{
virConfFreeList
(
lst
);
...
...
@@ -508,7 +511,7 @@ virConfParseName(virConfParserCtxtPtr ctxt)
virConfError
(
NULL
,
VIR_ERR_CONF_SYNTAX
,
"expecting a name"
,
ctxt
->
line
);
return
(
NULL
);
}
while
((
ctxt
->
cur
<
ctxt
->
end
)
&&
((
IS_CHAR
(
CUR
))
||
(
IS_DIGIT
(
CUR
))))
while
((
ctxt
->
cur
<
ctxt
->
end
)
&&
((
IS_CHAR
(
CUR
))
||
(
IS_DIGIT
(
CUR
))
||
(
CUR
==
'_'
)
))
NEXT
;
ret
=
strndup
(
base
,
ctxt
->
cur
-
base
);
if
(
ret
==
NULL
)
{
...
...
tests/confdata/fc4.conf
浏览文件 @
c63f08e0
...
...
@@ -2,9 +2,10 @@ kernel="/boot/vmlinuz-2.6.15-1.2054_FC5xenU"
ramdisk
=
"/boot/initrd-2.6.15-1.2054_FC5xenU.img"
memory
=
128
# should be enough
name
=
"fc4"
vif
= [
'mac=aa:00:00:00:00:11, bridge=xenbr0'
]
vif
= [
'mac=aa:00:00:00:00:11, bridge=xenbr0'
,
]
disk
= [
'file:/xen/fc4.img,sda1,w'
]
root
=
"/dev/sda1"
extra
=
"ro selinux=0 3"
on_reboot
=
'restart'
# just for testing ...
tst
= [
1
,
2
, [
3
,
4
],
5
]
tests/confdata/fc4.out
浏览文件 @
c63f08e0
...
...
@@ -6,5 +6,6 @@ vif = [ "mac=aa:00:00:00:00:11, bridge=xenbr0" ]
disk = [ "file:/xen/fc4.img,sda1,w" ]
root = "/dev/sda1"
extra = "ro selinux=0 3"
on_reboot = "restart"
# just for testing ...
tst = [ 1, 2, [ 3, 4 ], 5 ]
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录