From patchwork Mon Aug 3 22:38:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 39023 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n73MdArw017586 for ; Mon, 3 Aug 2009 22:39:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755001AbZHCWjH (ORCPT ); Mon, 3 Aug 2009 18:39:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754998AbZHCWjH (ORCPT ); Mon, 3 Aug 2009 18:39:07 -0400 Received: from mx2.redhat.com ([66.187.237.31]:60567 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753221AbZHCWjA (ORCPT ); Mon, 3 Aug 2009 18:39:00 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Md1IV002349; Mon, 3 Aug 2009 18:39:01 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73Md0Qb026941; Mon, 3 Aug 2009 18:39:00 -0400 Received: from localhost.localdomain (vpn-10-57.bos.redhat.com [10.16.10.57]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73MctNf025566; Mon, 3 Aug 2009 18:38:58 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, dhuff@redhat.com, Lucas Meneghel Rodrigues Subject: [PATCH 1/6] KVM test: Added floppy and tftp options to qemu command Date: Mon, 3 Aug 2009 19:38:49 -0300 Message-Id: <1249339134-5600-2-git-send-email-lmr@redhat.com> In-Reply-To: <1249339134-5600-1-git-send-email-lmr@redhat.com> References: <1249339134-5600-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This allows you to not specify the full path in the config file, appends to the image dir. Signed-off-by: David Huff --- client/tests/kvm/kvm_vm.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 2ea6681..f65b78c 100644 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -256,6 +256,18 @@ class VM: iso = os.path.join(iso_dir, iso) qemu_cmd += " -cdrom %s" % iso + # We may want to add {floppy_otps} parameter for -fda + # {fat:floppy:}/path/. However vvfat is not usually recommended + floppy = params.get("floppy") + if floppy: + floppy = os.path.join(image_dir, floppy) + qemu_cmd += " -fda %s" % floppy + + tftp = params.get("tftp") + if tftp: + tftp = os.path.join(image_dir, tftp) + qemu_cmd += " -tftp %s" % tftp + extra_params = params.get("extra_params") if extra_params: qemu_cmd += " %s" % extra_params