These days, the current versions of Ubuntu ship sufficiently
new qemu, also, we had a recent patch that only adds boot=on/off
if qemu supports it. So now, finally, it *should* be
safe to have virtio_net and virtio_blk on the default
sample test sets for linux.
Signed-off-by: Lucas Meneghel Rodrigues <l...@redhat.com>
---
client/tests/kvm/tests.cfg.sample | 13 ++++++-------
client/tests/libvirt/tests.cfg.sample | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/client/tests/kvm/tests.cfg.sample
b/client/tests/kvm/tests.cfg.sample
index 912232e..46ac571 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -64,9 +64,8 @@ variants:
qemu_img_binary = /usr/bin/qemu-img
qemu_io_binary = /usr/bin/qemu-io
only qcow2
- # The default nw card for qemu is e1000
- only e1000
- only ide
+ only virtio_net
+ only virtio_blk
# qemu using kvm doesn't support smp yet
only up
only no_9p_export
@@ -84,8 +83,8 @@ variants:
qemu_img_binary = /usr/bin/qemu-img
qemu_io_binary = /usr/bin/qemu-io
only qcow2
- only rtl8139
- only ide
+ only virtio_net
+ only virtio_blk
only smp2
only no_9p_export
only no_pci_assignable
@@ -119,8 +118,8 @@ variants:
qemu_img_binary = /usr/bin/qemu-img
qemu_io_binary = /usr/bin/qemu-io
only qcow2
- only rtl8139
- only ide
+ only virtio_net
+ only virtio_blk
only smp2
only no_9p_export
only no_pci_assignable
diff --git a/client/tests/libvirt/tests.cfg.sample
b/client/tests/libvirt/tests.cfg.sample
index 2b17d50..fb89d58 100644
--- a/client/tests/libvirt/tests.cfg.sample
+++ b/client/tests/libvirt/tests.cfg.sample
@@ -13,7 +13,7 @@ variants:
hvm_or_pv = hvm
only raw
only virtio_net
- only ide
+ only virtio_blk
only smp2
only no_9p_export
only no_pci_assignable
--
1.7.10.4
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
