Since qemu-kvm has as default nic rtl8139,
and qemu has as default e1000, let's allways
pass on the nic_model parameter. Also, let's
append an @ to e1000 session, so its name
is not appended to the test tag.

Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
 client/tests/kvm/tests_base.cfg.sample |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/tests/kvm/tests_base.cfg.sample 
b/client/tests/kvm/tests_base.cfg.sample
index 2d03f1f..917b007 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -276,12 +276,11 @@ variants:
 # NICs
 variants:
     - @rtl8139:
-    - virtio:       rtl8139.install rtl8139.setup
-        no install setup
-        nic_model = virtio
-    - e1000:        rtl8139.install rtl8139.setup
-        no install setup
+        nic_model = rtl8139
+    - @e1000:
         nic_model = e1000
+    - virtio:
+        nic_model = virtio
 
 
 # Guests
-- 
1.6.6

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to