Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
8f4ef7e6
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看板
提交
8f4ef7e6
编写于
4月 07, 2014
作者:
C
Cédric Bosdonnat
提交者:
Eric Blake
4月 07, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lxc conf2xml: don't let current vcpus at 0: define won't like it
上级
627d1439
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
12 addition
and
11 deletion
+12
-11
src/lxc/lxc_native.c
src/lxc/lxc_native.c
+1
-0
tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-simple.xml
tests/lxcconf2xmldata/lxcconf2xml-simple.xml
+1
-1
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
+1
-1
未找到文件。
src/lxc/lxc_native.c
浏览文件 @
8f4ef7e6
...
...
@@ -868,6 +868,7 @@ lxcParseConfigString(const char *config)
/* Value not handled by the LXC driver, setting to
* minimum required to make XML parsing pass */
vmdef
->
maxvcpus
=
1
;
vmdef
->
vcpus
=
1
;
vmdef
->
nfss
=
0
;
...
...
tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
浏览文件 @
8f4ef7e6
...
...
@@ -18,7 +18,7 @@
<weight>
300
</weight>
</device>
</blkiotune>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
cpuset=
'1-2,5-7'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
cpuset=
'1-2,5-7'
>
1
</vcpu>
<numatune>
<memory
mode=
'strict'
nodeset=
'1-4'
/>
</numatune>
...
...
tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<cputune>
<shares>
1024
</shares>
<period>
500000
</period>
...
...
tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
浏览文件 @
8f4ef7e6
...
...
@@ -8,7 +8,7 @@
<soft_limit
unit=
'KiB'
>
131072
</soft_limit>
<swap_hard_limit
unit=
'KiB'
>
2097152
</swap_hard_limit>
</memtune>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-simple.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type
arch=
'i686'
>
exe
</type>
<init>
/sbin/init
</init>
...
...
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
浏览文件 @
8f4ef7e6
...
...
@@ -3,7 +3,7 @@
<uuid>
c7a5fdbd-edaf-9455-926a-d65c16db1809
</uuid>
<memory
unit=
'KiB'
>
65536
</memory>
<currentMemory
unit=
'KiB'
>
0
</currentMemory>
<vcpu
placement=
'static'
current=
'0'
>
1
</vcpu>
<vcpu
placement=
'static'
>
1
</vcpu>
<os>
<type>
exe
</type>
<init>
/sbin/init
</init>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录