commit fb4a3b57886c5413f9f742218a71d2c6840790f4 Author: Jan Tluka jtluka@redhat.com Date: Mon Apr 20 14:36:31 2015 +0200

Revert "recipes: use proper virtio_net driver name in virtual setups"

This reverts commit 6062bbad7862eccce94a66afbc4b3bb0d487dbfa.

Let's stay with original 'virtio' value so that we won't have to add workaround in LNST.

Signed-off-by: Jiri Pirko jiri@resnulli.us

.../phase1/virtual_bridge_vlan_in_guest.xml | 6 +----- .../phase1/virtual_bridge_vlan_in_host.xml | 3 --- .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 6 +----- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) --- diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml index 0d448a8..fb5bf61 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -20,11 +20,7 @@ </host> <host id="guest1"> <interfaces> - <eth id="guestnic" label="to_guest"> - <params> - <param name="driver" value="virtio_net"/> - </params> - </eth> + <eth id="guestnic" label="to_guest" /> <vlan id="vlan10"> <options> <option name="vlan_tci" value="10" /> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml index 26a16c3..8636ce0 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -29,9 +29,6 @@ <host id="guest1"> <interfaces> <eth id="guestnic" label="to_guest"> - <params> - <param name="driver" value="virtio_net"/> - </params> <addresses> <address>192.168.10.10/24</address> <address>2002::10:10/64</address> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml index 0cfd079..c262cab 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml @@ -17,11 +17,7 @@ </host> <host id="guest1"> <interfaces> - <eth id="guestnic" label="to_guest"> - <params> - <param name="driver" value="virtio_net"/> - </params> - </eth> + <eth id="guestnic" label="to_guest" /> <vlan id="vlan10"> <options> <option name="vlan_tci" value="10" /> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml index 6b2c978..d425b82 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml @@ -24,7 +24,7 @@ <interfaces> <eth id="guestnic" label="to_guest"> <params> - <param name="driver" value="virtio_net"/> + <param name="driver" value="virtio"/> </params> <addresses> <address>192.168.10.10/24</address>