From patchwork Tue Mar 27 01:34:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 7474 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2520B23E12 for ; Tue, 27 Mar 2012 01:34:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id C69D2A18355 for ; Tue, 27 Mar 2012 01:34:13 +0000 (UTC) Received: by iage36 with SMTP id e36so12006169iag.11 for ; Mon, 26 Mar 2012 18:34:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:content-type; bh=W12SQNPsJ8d7y3w8ulD2XIsrIA42N5XDAlYSjBuqt5U=; b=AS4yvtl90l3dMi0Bqib5W6iagXtvYTp9AY2Wuz8ahyoFgESkFKGzFUBtTtIm8DfvLq DuMP2AP2GJwBtmxguEtons/Q3TvzkzBAlZm0QO3rrWrtCcoj06Wg3d/pvA9ycEqWL7pJ hTf+7RqXPSmiiU16KSf2OOcpbaxcbSxGwTbFIcet7QwrfP+AoDqJdu7fgNssJjEvjhL/ AbYAyyfNEK0Wsk153BPHxwLVICtJkMJ+aJDJf3cPQKx0O5W3vLxggvoBVMZJ636bTsdZ bPg/xwziGhrspvN/xv5jOCCG3VB+faq6Pkj4SHXJKvQiaOzSUYtvBOIsiZs5LBfrYCRi eGKQ== Received: by 10.50.194.226 with SMTP id hz2mr7133485igc.44.1332812053267; Mon, 26 Mar 2012 18:34:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.5.205 with SMTP id 13csp4231ibw; Mon, 26 Mar 2012 18:34:11 -0700 (PDT) Received: by 10.180.24.66 with SMTP id s2mr23217554wif.7.1332812050758; Mon, 26 Mar 2012 18:34:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id g51si19037659wee.30.2012.03.26.18.34.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 18:34:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SCLIY-0002eH-6T for ; Tue, 27 Mar 2012 01:34:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 25F2EE01A0 for ; Tue, 27 Mar 2012 01:34:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 265 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 265: Add qemu_drive_interface configuration option for the LAVA QEMU client. Message-Id: <20120327013410.30233.40259.launchpad@ackee.canonical.com> Date: Tue, 27 Mar 2012 01:34:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15011"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c064ec82bb70b16409d4f3fbc1db8aec91dc33d9 X-Gm-Message-State: ALoCoQmpKf4hYumttYnWz6b5SQCc92r1D6rE06xv4PAF0j9bQYMUeroPTtl4QzSWdEWMGLp2OoMr Merge authors: Luis Araujo (luis-araujo) Related merge proposals: https://code.launchpad.net/~luis-araujo/lava-dispatcher/qemu-client/+merge/99345 proposed by: Luis Araujo (luis-araujo) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 265 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Tue 2012-03-27 14:33:15 +1300 message: Add qemu_drive_interface configuration option for the LAVA QEMU client. modified: doc/changes.rst lava_dispatcher/client/qemu.py lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'doc/changes.rst' --- doc/changes.rst 2012-03-27 01:32:13 +0000 +++ doc/changes.rst 2012-03-27 01:33:15 +0000 @@ -5,6 +5,7 @@ Version 0.5.11 ============== +* Add qemu_drive_interface configuration option for the LAVA QEMU client. .. _version_0_5_10: === modified file 'lava_dispatcher/client/qemu.py' --- lava_dispatcher/client/qemu.py 2012-02-29 22:38:07 +0000 +++ lava_dispatcher/client/qemu.py 2012-03-26 11:46:50 +0000 @@ -99,12 +99,13 @@ self.proc.sendline('sync') self.proc.expect([self.tester_str, pexpect.TIMEOUT], timeout=10) self.proc.close() - qemu_cmd = ('%s -M %s -drive if=sd,cache=writeback,file=%s ' + qemu_cmd = ('%s -M %s -drive if=%s,cache=writeback,file=%s ' '-clock unix -device usb-kbd -device usb-mouse -usb ' '-device usb-net,netdev=mynet -netdev user,id=mynet ' '-nographic') % ( self.context.config.get('default_qemu_binary'), self.device_option('qemu_machine_type'), + self.device_option('qemu_drive_interface'), self._lava_image) logging.info('launching qemu with command %r' % qemu_cmd) self.proc = logging_spawn( === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-03-06 09:02:09 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-03-26 11:46:50 +0000 @@ -96,6 +96,9 @@ # The value to pass to qemu-system-arm's -M option. qemu_machine_type = %(device_type)s +# QEMU drive interface. +qemu_drive_interface = sd + # This is used for snowball soft reset fix, since the reboot command is hanging. soft_boot_cmd =