Revision 472cc1e9 lib/hypervisor/hv_kvm.py
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 1 | 1 |
# |
| 2 | 2 |
# |
| 3 | 3 |
|
| 4 |
# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Google Inc. |
|
| 4 |
# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Google Inc.
|
|
| 5 | 5 |
# |
| 6 | 6 |
# This program is free software; you can redistribute it and/or modify |
| 7 | 7 |
# it under the terms of the GNU General Public License as published by |
| ... | ... | |
| 1349 | 1349 |
return dev_opts |
| 1350 | 1350 |
|
| 1351 | 1351 |
@staticmethod |
| 1352 |
def CdromOption(kvm_cmd, cdrom_disk_type, cdrom_image, cdrom_boot, |
|
| 1353 |
needs_boot_flag): |
|
| 1352 |
def _CdromOption(kvm_cmd, cdrom_disk_type, cdrom_image, cdrom_boot,
|
|
| 1353 |
needs_boot_flag):
|
|
| 1354 | 1354 |
"""Extends L{kvm_cmd} with the '-drive' option for a cdrom, and
|
| 1355 | 1355 |
optionally the '-boot' option. |
| 1356 | 1356 |
|
| ... | ... | |
| 1500 | 1500 |
cdrom_image1 = hvp[constants.HV_CDROM_IMAGE_PATH] |
| 1501 | 1501 |
if cdrom_image1: |
| 1502 | 1502 |
needs_boot_flag = self._BOOT_RE.search(kvmhelp) |
| 1503 |
self.CdromOption(kvm_cmd, cdrom_disk_type, cdrom_image1, boot_cdrom, |
|
| 1504 |
needs_boot_flag) |
|
| 1503 |
self._CdromOption(kvm_cmd, cdrom_disk_type, cdrom_image1, boot_cdrom,
|
|
| 1504 |
needs_boot_flag)
|
|
| 1505 | 1505 |
|
| 1506 | 1506 |
cdrom_image2 = hvp[constants.HV_KVM_CDROM2_IMAGE_PATH] |
| 1507 | 1507 |
if cdrom_image2: |
| 1508 |
self.CdromOption(kvm_cmd, cdrom_disk_type, cdrom_image2, False, False) |
|
| 1508 |
self._CdromOption(kvm_cmd, cdrom_disk_type, cdrom_image2, False, False)
|
|
| 1509 | 1509 |
|
| 1510 | 1510 |
floppy_image = hvp[constants.HV_KVM_FLOPPY_IMAGE_PATH] |
| 1511 | 1511 |
if floppy_image: |
Also available in: Unified diff