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

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 2b09fae43729ce52e82abeccc78ea48aba2fd152..f4c4556671eb8bf8cc246b94d03c7bf0df02b5a7 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -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;
 

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
index 628798dd32fd2f77a4572af71c543f51b0cba5f9..36b8e52f28dac2e66cdfaa027a76d89dd732152d 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
index 1b8fb0ca13a0ca930d155b589e67383a887cfbb8..932ab6168e94270e86ad6d283a1137ce6ec7c1da 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
index a511dcfee47b39e9d88b01700c8053153de0f87d..1bab1c65ac25392b52a15135eb7f8012c9061965 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
index 576c903487b9406836443c1a12e6767feb0410b5..050ccd6f72033deaf0c2be37669801570fe435db 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
index aa0683a5cfcd7e9d15ef3fbcda5de5286eca5dd2..996c0f7496bcb4cce637379a7d2d61edc2efbedc 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
index 026435674852cf147f5567e9c007c381a3c3b6f0..b7c919e7a02ef2cd99f1b75bd43b313199188e4b 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
index eebcb4ed5825833cdc33456143c3e051d4fb284a..6d9e16de45beb00ebb7ceca04c003a7ff3492e2d 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
index 511e3dd7acedd23ef8008821da96dbe68e08b84f..101324ad1c2968fbc65d77889c057ac5a86aa635 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
index 35a2a9623332b6cf0a0f42ab1d0b54cf9f8bec1f..5fe1b03b37b19a6bb19ce5a6e3566eab21147ec4 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
index 6ec0f17ad7660c009ae4961f5f8eb9d2ba54671d..b3c3659c1da1ec4a12d71f6c081dfff8cf2c37d2 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
@@ -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>

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
index 7d6d51b5c3a3587eee55836a8c77d72f8bd733cd..45348ed159686600f1a009196e681ce10ddba1ba 100644 (file)
--- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
@@ -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>