Revision 8b1ebecb lib/hypervisor/hv_kvm.py
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 92 | 92 |
constants.HOTPLUG_TARGET_NIC: |
| 93 | 93 |
lambda nic, kvm_nics: [n for n in kvm_nics if n.uuid == nic.uuid], |
| 94 | 94 |
constants.HOTPLUG_TARGET_DISK: |
| 95 |
lambda disk, kvm_disks: [(d, l, u) for (d, l, u) in kvm_disks
|
|
| 95 |
lambda disk, kvm_disks: [(d, l) for (d, l) in kvm_disks
|
|
| 96 | 96 |
if d.uuid == disk.uuid] |
| 97 | 97 |
} |
| 98 | 98 |
_RUNTIME_DEVICE = {
|
| 99 | 99 |
constants.HOTPLUG_TARGET_NIC: lambda d: d, |
| 100 |
constants.HOTPLUG_TARGET_DISK: lambda (d, e, _): d
|
|
| 100 |
constants.HOTPLUG_TARGET_DISK: lambda (d, e): d |
|
| 101 | 101 |
} |
| 102 | 102 |
_RUNTIME_ENTRY = {
|
| 103 | 103 |
constants.HOTPLUG_TARGET_NIC: lambda d, e: d, |
| 104 |
constants.HOTPLUG_TARGET_DISK: lambda d, e: (d, e, None)
|
|
| 104 |
constants.HOTPLUG_TARGET_DISK: lambda d, e: (d, e) |
|
| 105 | 105 |
} |
| 106 | 106 |
|
| 107 | 107 |
|
| ... | ... | |
| 148 | 148 |
kvm_cmd, serialized_nics, hvparams, serialized_blockdevs = loaded_runtime |
| 149 | 149 |
|
| 150 | 150 |
kvm_nics = [objects.NIC.FromDict(snic) for snic in serialized_nics] |
| 151 |
block_devices = [(objects.Disk.FromDict(sdisk), link, uri)
|
|
| 152 |
for sdisk, link, uri in serialized_blockdevs]
|
|
| 151 |
block_devices = [(objects.Disk.FromDict(sdisk), link) |
|
| 152 |
for sdisk, link in serialized_blockdevs] |
|
| 153 | 153 |
|
| 154 | 154 |
return (kvm_cmd, kvm_nics, hvparams, block_devices) |
| 155 | 155 |
|
| ... | ... | |
| 1531 | 1531 |
kvm_cmd, kvm_nics, hvparams, block_devices = kvm_runtime |
| 1532 | 1532 |
|
| 1533 | 1533 |
serialized_nics = [nic.ToDict() for nic in kvm_nics] |
| 1534 |
serialized_blockdevs = [(blk.ToDict(), link, uri)
|
|
| 1535 |
for blk, link, uri in block_devices]
|
|
| 1534 |
serialized_blockdevs = [(blk.ToDict(), link) |
|
| 1535 |
for blk, link in block_devices] |
|
| 1536 | 1536 |
serialized_form = serializer.Dump((kvm_cmd, serialized_nics, hvparams, |
| 1537 | 1537 |
serialized_blockdevs)) |
| 1538 | 1538 |
|
Also available in: Unified diff