Use virsh for kvm devices

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>

diff --git a/lava/devices/kvm01.jinja2 b/lava/devices/kvm01.jinja2
index 1eac22e84b59f48d2b43c634c5c32f4705c3134f..d78a57fe28ba9c099c5243fa046efd40d2dae3b0 100644 (file)
--- a/lava/devices/kvm01.jinja2
+++ b/lava/devices/kvm01.jinja2
@@ -1,8 +1,8 @@
-{% extends 'qemu.jinja2' %}
-{% set mac_addr = 'DE:AD:BE:EF:00:00' %}
-{% set memory = '2096' %}
-{% set netdevice = 'tap' %}
-{% set extra_options = (
-"
-          - -smp 2"
-) %}
+{% extends 'x86.jinja2' %}
+{% set connection_command = 'virsh console --force kvm1' %}
+{% set hard_reset_command = 'virsh reset kvm1' %}
+{% set power_off_command = 'virsh destroy kvm1' %}
+{% set power_on_command = 'virsh start kvm1'' %}
+{% set soft_reset_command = 'reboot'}
+{% set boot_interface = 'net0'}
+{% set kernel_extra_args = 'cpuidle.off=1'}

diff --git a/lava/devices/kvm02.jinja2 b/lava/devices/kvm02.jinja2
index 0ae3c21a671ca52143d4348e9243a5e28da540fd..3f57c3ded2ba0deb9f4e2f6511211fc665b3a94e 100644 (file)
--- a/lava/devices/kvm02.jinja2
+++ b/lava/devices/kvm02.jinja2
@@ -1,9 +1,8 @@
-{% extends 'qemu.jinja2' %}
-{% set mac_addr = 'DE:AD:BE:FF:00:01' %}
-{% set memory = '2096' %}
-{% set netdevice = 'tap' %}
-{% set extra_options = (
-"
-          - -smp 2"
-) %}
-
+{% extends 'x86.jinja2' %}
+{% set connection_command = 'virsh console --force kvm2' %}
+{% set hard_reset_command = 'virsh reset kvm2' %}
+{% set power_off_command = 'virsh destroy kvm2' %}
+{% set power_on_command = 'virsh start kvm2'' %}
+{% set soft_reset_command = 'reboot'}
+{% set boot_interface = 'net0'}
+{% set kernel_extra_args = 'cpuidle.off=1'}