From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 1/9] KVM test: kvm_vm.py: make -drive index optional for both images and cdrom ISOs Date: Thu, 15 Jul 2010 18:57:30 +0300 Message-ID: <1279209458-19590-1-git-send-email-mgoldish@redhat.com> Cc: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:29009 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932437Ab0GOP5d (ORCPT ); Thu, 15 Jul 2010 11:57:33 -0400 Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_vm.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 6cd0688..248aeca 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -214,16 +214,18 @@ class VM: def add_smp(help, smp): return " -smp %s" % smp - def add_cdrom(help, filename, index=2): + def add_cdrom(help, filename, index=None): if has_option(help, "drive"): - return " -drive file='%s',index=%d,media=cdrom" % (filename, - index) + cmd = " -drive file='%s',media=cdrom" % filename + if index is not None: cmd += ",index=%s" % index + return cmd else: return " -cdrom '%s'" % filename - def add_drive(help, filename, format=None, cache=None, werror=None, - serial=None, snapshot=False, boot=False): + def add_drive(help, filename, index=None, format=None, cache=None, + werror=None, serial=None, snapshot=False, boot=False): cmd = " -drive file='%s'" % filename + if index is not None: cmd += ",index=%s" % index if format: cmd += ",if=%s" % format if cache: cmd += ",cache=%s" % cache if werror: cmd += ",werror=%s" % werror @@ -362,6 +364,7 @@ class VM: continue qemu_cmd += add_drive(help, get_image_filename(image_params, root_dir), + image_params.get("drive_index"), image_params.get("drive_format"), image_params.get("drive_cache"), image_params.get("drive_werror"), @@ -414,7 +417,7 @@ class VM: iso = params.get("cdrom") if iso: iso = kvm_utils.get_path(root_dir, iso) - qemu_cmd += add_cdrom(help, iso) + qemu_cmd += add_cdrom(help, iso, 2) # Even though this is not a really scalable approach, # it doesn't seem like we are going to need more than -- 1.5.4.1