[dts] [PATCH v2 7/9] tests/vf_offload: use virt_common for VM creation
Herbert Guan
herbert.guan at arm.com
Mon Feb 12 10:57:40 CET 2018
Use 'VM' form virt_common instead of 'QEMUKvm' from qemu_kvm for VM
creation. This will allow VM type selection (kvm/libvirt etc.) for
each VM defined in test suite's config file.
Signed-off-by: Herbert Guan <herbert.guan at arm.com>
---
conf/vf_offload.cfg | 89 +++----------------------------------------
tests/TestSuite_vf_offload.py | 4 +-
2 files changed, 7 insertions(+), 86 deletions(-)
diff --git a/conf/vf_offload.cfg b/conf/vf_offload.cfg
index 5820660..bff1035 100644
--- a/conf/vf_offload.cfg
+++ b/conf/vf_offload.cfg
@@ -1,87 +1,4 @@
-# QEMU options
-# name
-# name: vm0
-#
-# enable_kvm
-# enable: [yes | no]
-#
-# cpu
-# model: [host | core2duo | ...]
-# usage:
-# choose model value from the command
-# qemu-system-x86_64 -cpu help
-# number: '4' #number of vcpus
-# cpupin: '3 4 5 6' # host cpu list
-#
-# mem
-# size: 1024
-#
-# disk
-# file: /path/to/image/test.img
-#
-# net
-# type: [nic | user | tap | bridge | ...]
-# nic
-# opt_vlan: 0
-# note: Default is 0.
-# opt_macaddr: 00:00:00:00:01:01
-# note: if creating a nic, it`s better to specify a MAC,
-# else it will get a random number.
-# opt_model:["e1000" | "virtio" | "i82551" | ...]
-# note: Default is e1000.
-# opt_name: 'nic1'
-# opt_addr: ''
-# note: PCI cards only.
-# opt_vectors:
-# note: This option currently only affects virtio cards.
-# user
-# opt_vlan: 0
-# note: default is 0.
-# opt_hostfwd: [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport
-# note: If not specified, it will be setted automatically.
-# tap
-# opt_vlan: 0
-# note: default is 0.
-# opt_br: br0
-# note: if choosing tap, need to specify bridge name,
-# else it will be br0.
-# opt_script: QEMU_IFUP_PATH
-# note: if not specified, default is self.QEMU_IFUP_PATH.
-# opt_downscript: QEMU_IFDOWN_PATH
-# note: if not specified, default is self.QEMU_IFDOWN_PATH.
-#
-# device
-# driver: [pci-assign | virtio-net-pci | ...]
-# pci-assign
-# prop_host: 08:00.0
-# prop_addr: 00:00:00:00:01:02
-# virtio-net-pci
-# prop_netdev: mynet1
-# prop_id: net1
-# prop_mac: 00:00:00:00:01:03
-# prop_bus: pci.0
-# prop_addr: 0x3
-#
-# monitor
-# port: 6061
-# note: if adding monitor to vm, need to specicy
-# this port, else it will get a free port
-# on the host machine.
-#
-# serial_port
-# enable: [yes | no]
-#
-# vnc
-# displayNum: 1
-# note: you can choose a number not used on the host.
-#
-# daemon
-# enable: 'yes'
-# note:
-# By default VM will start with the daemonize status.
-# Not support starting it on the stdin now.
-
-# vm configuration for pmd sriov case
+# Configuration sample: sriov_kvm.cfg
[vm0]
cpu =
model=host,number=4,cpupin=4 5 6 7;
@@ -91,12 +8,16 @@ mem =
size=4096;
login =
user=root,password=tester;
+# net option is not necessary for libvirt, comment out below 2 lines if using libvirt
net =
type=nic,opt_vlan=0;
type=user,opt_vlan=0;
+# monitor option is not supported by libvirt yet, comment out below 2 lines if using libvirt
monitor =
port=;
+# vnc option is not supported by libvirt yet, comment out below 2 lines if using libvirt
vnc =
displayNum=11;
+# daemon option is not supported by libvirt yet, comment out below 2 lines if using libvirt
daemon =
enable=yes;
diff --git a/tests/TestSuite_vf_offload.py b/tests/TestSuite_vf_offload.py
index 69ee592..cb4b368 100644
--- a/tests/TestSuite_vf_offload.py
+++ b/tests/TestSuite_vf_offload.py
@@ -5,7 +5,7 @@ import time
import string
import utils
-from qemu_kvm import QEMUKvm
+from virt_common import VM
from test_case import TestCase
from pmd_output import PmdOutput
from utils import RED, GREEN
@@ -73,7 +73,7 @@ class TestVfOffload(TestCase):
self.host_testpmd.start_testpmd("1S/2C/2T", eal_param=eal_param)
# set up VM0 ENV
- self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_offload')
+ self.vm0 = VM(self.dut, 'vm0', 'vf_offload')
self.vm0.set_vm_device(driver=self.vf_assign_method, **vf0_prop)
self.vm0.set_vm_device(driver=self.vf_assign_method, **vf1_prop)
self.vm_dut_0 = self.vm0.start()
--
1.8.3.1
More information about the dts
mailing list