From patchwork Thu Apr 7 21:41:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 693921 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p388EDtL003611 for ; Fri, 8 Apr 2011 08:15:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757324Ab1DHBmL (ORCPT ); Thu, 7 Apr 2011 21:42:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47592 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757258Ab1DHBmL (ORCPT ); Thu, 7 Apr 2011 21:42:11 -0400 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.14.4/8.14.4) with ESMTP id p381g9Nu021306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 7 Apr 2011 21:42:09 -0400 Received: from autotest.virt.bos.redhat.com (autotest.virt.bos.redhat.com [10.16.72.47]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p381g82Y019741; Thu, 7 Apr 2011 21:42:08 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 4/9] For win7/2k8, only copy virtio drivers to floppy if there is a floppy Date: Thu, 7 Apr 2011 17:41:46 -0400 Message-Id: <1302212506-31274-1-git-send-email-lmr@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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 08 Apr 2011 08:15:14 +0000 (UTC) You can specify drivers from a CDROM for those Operating Systems, so no need of drivers in the floppy. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/test_setup.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/tests/kvm/test_setup.py b/client/tests/kvm/test_setup.py index 844108f..997b9f9 100644 --- a/client/tests/kvm/test_setup.py +++ b/client/tests/kvm/test_setup.py @@ -173,12 +173,17 @@ class FloppyDisk(Disk): Win2008, Vista and 7 require people to point out the path to the drivers on the unattended file, so we just need to copy the drivers to the - driver floppy disk. + driver floppy disk. If we provide a path inside a CDROM with the drivers, + then there is no need to use a floppy at all. Process: 1) Copy the virtio drivers on the virtio floppy to the install floppy + (if there is one) """ - self._copy_virtio_drivers(virtio_floppy) + if os.path.isfile(virtio_floppy): + self._copy_virtio_drivers(virtio_floppy) + else: + logging.debug("No virtio floppy present, not needed for this OS anyway") class CdromDisk(Disk):