e2e: pass Qemu -smp argument from topology2qemuopts to Vagrant

Signed-off-by: Antti Kervinen <antti.kervinen@intel.com>

Author: askervin

test/e2e/files/Vagrantfile.in

@@ -88,7 +88,7 @@ Vagrant.configure("2") do |config|
     qemu.memory = "QEMU_MEM"
     qemu.arch = "x86_64"
     qemu.machine = "QEMU_MACHINE"
-    qemu.cpu = "host"
+    qemu.cpu = "QEMU_CPU"
     qemu.net_device = "virtio-net-pci"
     qemu.extra_netdev_args = "net=192.168.76.0/24,dhcpstart=192.168.76.9"
     qemu.ssh_port = SSH_PORT

test/e2e/lib/vm.bash

@@ -126,11 +126,12 @@ vm-setup() {
         error "error in topology"
     fi
 
-    MACHINE=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:-machine \([^|]*\).*/\1/g')
-    CPU=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:-smp \([^|]*\).*/\1/g')
-    MEM=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:.*MEM:-m \([^|]*\).*/\1/g')
-    EXTRA_ARGS=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:.*MEM:.*EXTRA:\([^|]*\).*/\1/g')
-    EXTRA_ARGS+="${EXTRA_ARGS:+,} \"-monitor\", \"unix:monitor.sock,server,nowait\""
+    local MACHINE=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:-machine \([^|]*\).*/\1/g')
+    local CPU=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:-cpu \([^|]*\).*/\1/g')
+    local SMP=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:.*SMP:-smp \([^|]*\).*/\1/g')
+    local MEM=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:.*SMP:.*MEM:-m \([^|]*\).*/\1/g')
+    local EXTRA_ARGS=$(echo $VM_QEMU_CPUMEM | sed 's/MACHINE:.*CPU:.*SMP:.*MEM:.*EXTRA:\([^|]*\).*/\1/g')
+    local EXTRA_ARGS+="${EXTRA_ARGS:+,} \"-monitor\", \"unix:monitor.sock,server,nowait\""
 
     case $efi in
         "") ;;
@@ -167,6 +168,7 @@ vm-setup() {
     if [ "$vagrant_debug" == "1" ]; then
 	echo "MACHINE: $MACHINE"
 	echo "CPU: $CPU"
+	echo "SMP: $SMP"
 	echo "MEM: $MEM"
 	echo "EXTRA: $EXTRA_ARGS"
         echo "image: ${distro_img:-vagrant default}"
@@ -182,8 +184,9 @@ vm-setup() {
 	sed -e "s/SERVER_NAME/$vmname/g" \
 	    -e "s/DISTRO/$distro_name/g" \
 	    -e "s/QEMU_MACHINE/$MACHINE/" \
+	    -e "s/QEMU_CPU/$CPU/" \
+	    -e "s/QEMU_SMP/$SMP/" \
 	    -e "s/QEMU_MEM/$MEM/" \
-	    -e "s/QEMU_SMP/$CPU/" \
 	    -e "s|QEMU_EXTRA_ARGS|$EXTRA_ARGS|" \
             -e "s:QEMU_DIR:$qemu_dir:" \
             -e "s|^.*config.vm.box_url.*$|$CUSTOM_IMAGE|g" \