Revision 8feeb253 lib/hypervisor/hv_kvm.py
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 571 | 571 |
# dashes not preceeded by a new line (which would mean another option |
| 572 | 572 |
# different than -drive is starting) |
| 573 | 573 |
_BOOT_RE = re.compile(r"^-drive\s([^-]|(?<!^)-)*,boot=on\|off", re.M | re.S) |
| 574 |
_UUID_RE = re.compile(r"^-uuid\s", re.M) |
|
| 574 | 575 |
|
| 575 | 576 |
ANCILLARY_FILES = [ |
| 576 | 577 |
_KVM_NETWORK_SCRIPT, |
| ... | ... | |
| 1386 | 1387 |
for dev in hvp[constants.HV_USB_DEVICES].split(","):
|
| 1387 | 1388 |
kvm_cmd.extend(["-usbdevice", dev]) |
| 1388 | 1389 |
|
| 1390 |
# Set system UUID to instance UUID |
|
| 1391 |
if self._UUID_RE.search(kvmhelp): |
|
| 1392 |
kvm_cmd.extend(["-uuid", instance.uuid]) |
|
| 1393 |
|
|
| 1389 | 1394 |
if hvp[constants.HV_KVM_EXTRA]: |
| 1390 | 1395 |
kvm_cmd.extend([hvp[constants.HV_KVM_EXTRA]]) |
| 1391 | 1396 |
|
Also available in: Unified diff