diff mbox

[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
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson March 27, 2012, 1:34 a.m. UTC 
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 <michael.hudson@linaro.org>
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
diff mbox

Patch

=== 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 =