From patchwork Mon Jan 18 02:36:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 73616 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0I2apSc028120 for ; Mon, 18 Jan 2010 02:36:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751933Ab0ARCgs (ORCPT ); Sun, 17 Jan 2010 21:36:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751959Ab0ARCgs (ORCPT ); Sun, 17 Jan 2010 21:36:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52127 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751653Ab0ARCgs (ORCPT ); Sun, 17 Jan 2010 21:36:48 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0I2akma018108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 17 Jan 2010 21:36:46 -0500 Received: from localhost.localdomain (vpn-8-173.rdu.redhat.com [10.11.8.173]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0I2aiQv016266; Sun, 17 Jan 2010 21:36:45 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 1/2] KVM test: Add a new (optional) extra param to VM, cdrom_extra Date: Mon, 18 Jan 2010 00:36:41 -0200 Message-Id: <1263782202-8086-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index ed6d5ad..483204c 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -268,7 +268,15 @@ class VM: iso = params.get("cdrom") if iso: iso = kvm_utils.get_path(root_dir, iso) - qemu_cmd += " -cdrom %s" % iso + qemu_cmd += " -drive file=%s,index=2,media=cdrom" % iso + + # Even though this is not a really scalable approach, + # it doesn't seem like we are going to need more than + # 2 CDs active on the same VM. + iso_extra = params.get("cdrom_extra") + if iso_extra: + iso_extra = kvm_utils.get_path(root_dir, iso_extra) + qemu_cmd += " -drive file=%s,index=3,media=cdrom" % iso_extra # We may want to add {floppy_otps} parameter for -fda # {fat:floppy:}/path/. However vvfat is not usually recommended