[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kvm
Subject:    [PATCH 3/5] virt: Move vm_type into separate tests.cfg.sample
From:       Lucas Meneghel Rodrigues <lmr () redhat ! com>
Date:       2011-12-30 4:41:55
Message-ID: 1325220117-10430-4-git-send-email-lmr () redhat ! com
[Download RAW message or body]

Moved vm_type setting into seperate tests.cfg.sample so that
base.cfg.sample can be shared between virt test types.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 client/tests/kvm/tests.cfg.sample     |    5 +++++
 client/tests/libvirt/tests.cfg.sample |    5 +++++
 client/virt/base.cfg.sample           |    4 ----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index bd0d05e..9048884 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -10,6 +10,11 @@ include guest-hw.cfg
 include cdkeys.cfg
 include virtio-win.cfg
 
+# Virtualization type (kvm or libvirt)
+# TODO: Update code to use vm_library + vm_type + vm_subtype
+#           i.e.        (libvirt/none) + (qemu/kvm/xen) + (hvm/paravirt)
+vm_type = kvm
+
 # Here you can override the image name for our custom linux and windows guests
 #
 CustomGuestLinux:
diff --git a/client/tests/libvirt/tests.cfg.sample b/client/tests/libvirt/tests.cfg.sample
index 831ff4e..158c7b1 100644
--- a/client/tests/libvirt/tests.cfg.sample
+++ b/client/tests/libvirt/tests.cfg.sample
@@ -8,6 +8,11 @@ include guest-hw.cfg
 include cdkeys.cfg
 include virtio-win.cfg
 
+# Virtualization type (kvm or libvirt)
+# TODO: Update code to use vm_library + vm_type + vm_subtype
+#           i.e.        (libvirt/none) + (qemu/kvm/xen) + (hvm/paravirt)
+vm_type = libvirt
+
 variants:
     # Runs virt-install, f16 64 bit guest OS, install, boot, shutdown
     - @libvirt_f16_quick:
diff --git a/client/virt/base.cfg.sample b/client/virt/base.cfg.sample
index eda511c..7bd998a 100644
--- a/client/virt/base.cfg.sample
+++ b/client/virt/base.cfg.sample
@@ -9,10 +9,6 @@ qemu_io_binary = qemu-io
 vms = vm1
 # Default virtual machine to use, when not specified by test.
 main_vm = vm1
-# Virtualization type (kvm or libvirt)
-# TODO: Update code to use vm_library + vm_type + vm_subtype
-#           i.e.        (libvirt/none) + (qemu/kvm/xen) + (hvm/paravirt)
-vm_type = kvm
 
 # List of network device object names (whitespace seperated)
 nics = nic1
-- 
1.7.7.4

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]