From 8f4ef7e6b6da2a5df5d65b3948083346965eb58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Mon, 7 Apr 2014 09:22:39 +0200
Subject: [PATCH] lxc conf2xml: don't let current vcpus at 0: define won't like
 it

---
 src/lxc/lxc_native.c                                 | 1 +
 tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml      | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml     | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-cputune.xml        | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-idmap.xml          | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-memtune.xml        | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml    | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml      | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml    | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-simple.xml         | 2 +-
 tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml    | 2 +-
 12 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 2b09fae437..f4c4556671 100644
--- 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 628798dd32..36b8e52f28 100644
--- 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 1b8fb0ca13..932ab6168e 100644
--- 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 a511dcfee4..1bab1c65ac 100644
--- 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 576c903487..050ccd6f72 100644
--- 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 aa0683a5cf..996c0f7496 100644
--- 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 0264356748..b7c919e7a0 100644
--- 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 eebcb4ed58..6d9e16de45 100644
--- 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 511e3dd7ac..101324ad1c 100644
--- 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 35a2a96233..5fe1b03b37 100644
--- 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 6ec0f17ad7..b3c3659c1d 100644
--- 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 7d6d51b5c3..45348ed159 100644
--- 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>
-- 
GitLab