From 6822727eecc6e204e4ca6b4cf887dfa58437328b Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 15 Nov 2018 17:00:56 -0500 Subject: [PATCH] Use virsh for kvm devices Signed-off-by: Jonathan Rajotte --- lava/devices/kvm01.jinja2 | 16 ++++++++-------- lava/devices/kvm02.jinja2 | 17 ++++++++--------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lava/devices/kvm01.jinja2 b/lava/devices/kvm01.jinja2 index 1eac22e..d78a57f 100644 --- 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 0ae3c21..3f57c3d 100644 --- 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'} -- 2.34.1