提交 8f4ef7e6 编写于 作者: C Cédric Bosdonnat 提交者: Eric Blake

lxc conf2xml: don't let current vcpus at 0: define won't like it

上级 627d1439
...@@ -868,6 +868,7 @@ lxcParseConfigString(const char *config) ...@@ -868,6 +868,7 @@ lxcParseConfigString(const char *config)
/* Value not handled by the LXC driver, setting to /* Value not handled by the LXC driver, setting to
* minimum required to make XML parsing pass */ * minimum required to make XML parsing pass */
vmdef->maxvcpus = 1; vmdef->maxvcpus = 1;
vmdef->vcpus = 1;
vmdef->nfss = 0; vmdef->nfss = 0;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<weight>300</weight> <weight>300</weight>
</device> </device>
</blkiotune> </blkiotune>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <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> <numatune>
<memory mode='strict' nodeset='1-4'/> <memory mode='strict' nodeset='1-4'/>
</numatune> </numatune>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<cputune> <cputune>
<shares>1024</shares> <shares>1024</shares>
<period>500000</period> <period>500000</period>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<soft_limit unit='KiB'>131072</soft_limit> <soft_limit unit='KiB'>131072</soft_limit>
<swap_hard_limit unit='KiB'>2097152</swap_hard_limit> <swap_hard_limit unit='KiB'>2097152</swap_hard_limit>
</memtune> </memtune>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='i686'>exe</type> <type arch='i686'>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>65536</memory> <memory unit='KiB'>65536</memory>
<currentMemory unit='KiB'>0</currentMemory> <currentMemory unit='KiB'>0</currentMemory>
<vcpu placement='static' current='0'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册