diff options
author | lmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4> | 2011-06-06 21:54:11 +0000 |
---|---|---|
committer | lmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4> | 2011-06-06 21:54:11 +0000 |
commit | ac7028f78b75d4f3d099450a2e7a9ce887b53a4c (patch) | |
tree | 9c3b0c307a014b4112d72f2a8134da03126c1a42 | |
parent | 15f6c96b3eb9c4c87f06248ac1b931b222a700d0 (diff) |
KVM test: ahci disk images
This patch adds support for AHCI disk images.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
git-svn-id: svn://test.kernel.org/autotest/trunk@5413 592f7852-d20e-0410-864c-8624ca9c26a4
-rw-r--r-- | client/virt/kvm_vm.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/client/virt/kvm_vm.py b/client/virt/kvm_vm.py index 270f7b9e..43408f6a 100644 --- a/client/virt/kvm_vm.py +++ b/client/virt/kvm_vm.py @@ -198,6 +198,13 @@ class VM(virt_vm.BaseVM): def add_drive(help, filename, index=None, format=None, cache=None, werror=None, serial=None, snapshot=False, boot=False): + name = None; + dev = ""; + if format == "ahci": + name = "ahci%s" % index + dev += " -device ide-drive,bus=ahci.%s,drive=%s" % (index, name) + format = "none" + index = None cmd = " -drive file='%s'" % filename if index is not None: cmd += ",index=%s" % index @@ -213,7 +220,9 @@ class VM(virt_vm.BaseVM): cmd += ",snapshot=on" if boot: cmd += ",boot=on" - return cmd + if name: + cmd += ",id=%s" % name + return cmd + dev def add_nic(help, vlan, model=None, mac=None, device_id=None, netdev_id=None, nic_extra_params=None): @@ -352,6 +361,8 @@ class VM(virt_vm.BaseVM): if root_dir is None: root_dir = self.root_dir + have_ahci = False + # Clone this VM using the new params vm = self.clone(name, params, root_dir, copy_state=True) @@ -391,6 +402,9 @@ class VM(virt_vm.BaseVM): image_params = params.object_params(image_name) if image_params.get("boot_drive") == "no": continue + if image_params.get("drive_format") == "ahci" and not have_ahci: + qemu_cmd += " -device ahci,id=ahci" + have_ahci = True qemu_cmd += add_drive(help, virt_vm.get_image_filename(image_params, root_dir), image_params.get("drive_index"), |