External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cédric Bosdonnat 2014-04-07 09:22:39 +02:00 committed by Eric Blake
parent 627d1439c2
commit 8f4ef7e6b6
12 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lxc/lxc_native.c
View File

@ -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;

2
tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-simple.xml
View File

@ -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>

2
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
View File

@ -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>