From patchwork Thu Nov 5 10:01:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 57862 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 nA5A3lGK016980 for ; Thu, 5 Nov 2009 10:03:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751443AbZKEKDj (ORCPT ); Thu, 5 Nov 2009 05:03:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751252AbZKEKDj (ORCPT ); Thu, 5 Nov 2009 05:03:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7266 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbZKEKDh (ORCPT ); Thu, 5 Nov 2009 05:03:37 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA5A3gSd020139; Thu, 5 Nov 2009 05:03:42 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA5A3fZI013147; Thu, 5 Nov 2009 05:03:41 -0500 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id nA5A3aFe017064; Thu, 5 Nov 2009 05:03:40 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 2/7] KVM test: kvm_vm.py: use kvm_utils.get_path() for floppy and tftp Date: Thu, 5 Nov 2009 12:01:07 +0200 Message-Id: <1257415272-9423-2-git-send-email-mgoldish@redhat.com> In-Reply-To: <1257415272-9423-1-git-send-email-mgoldish@redhat.com> References: <1257415272-9423-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 ee6796b..e1f5cad 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -270,12 +270,12 @@ class VM: # {fat:floppy:}/path/. However vvfat is not usually recommended floppy = params.get("floppy") if floppy: - floppy = os.path.join(root_dir, floppy) + floppy = kvm_utils.get_path(root_dir, floppy) qemu_cmd += " -fda %s" % floppy tftp = params.get("tftp") if tftp: - tftp = os.path.join(root_dir, tftp) + tftp = kvm_utils.get_path(root_dir, tftp) qemu_cmd += " -tftp %s" % tftp extra_params = params.get("extra_params")