Revision 5397e0b7 lib/hypervisor/hv_xen.py
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
431 | 431 |
|
432 | 432 |
vif_data = [] |
433 | 433 |
for nic in instance.nics: |
434 |
nic_str = "mac=%s, bridge=%s, type=ioemu" % (nic.mac, nic.bridge) |
|
434 |
if instance.hvm_nic_type is None: # ensure old instances don't change |
|
435 |
nic_type = ", type=ioemu" |
|
436 |
elif instance.hvm_nic_type == constants.HT_HVM_DEV_PARAVIRTUAL: |
|
437 |
nic_type = ", type=paravirtualized" |
|
438 |
else: |
|
439 |
nic_type = ", model=%s, type=ioemu" % instance.hvm_nic_type |
|
440 |
|
|
441 |
nic_str = "mac=%s, bridge=%s%s" % (nic.mac, nic.bridge, nic_type) |
|
435 | 442 |
ip = getattr(nic, "ip", None) |
436 | 443 |
if ip is not None: |
437 | 444 |
nic_str += ", ip=%s" % ip |
... | ... | |
440 | 447 |
config.write("vif = [%s]\n" % ",".join(vif_data)) |
441 | 448 |
disk_data = cls._GetConfigFileDiskData(instance.disk_template, |
442 | 449 |
block_devices) |
443 |
disk_data = [line.replace(",sd", ",ioemu:hd") for line in disk_data] |
|
450 |
if ((instance.hvm_disk_type is None) or |
|
451 |
(instance.hvm_disk_type == constants.HT_HVM_DEV_IOEMU)): |
|
452 |
replacement = ",ioemu:hd" |
|
453 |
else: |
|
454 |
replacement = ",hd" |
|
455 |
disk_data = [line.replace(",sd", replacement) for line in disk_data] |
|
444 | 456 |
if instance.hvm_cdrom_image_path is not None: |
445 | 457 |
iso = "'file:%s,hdc:cdrom,r'" % (instance.hvm_cdrom_image_path) |
446 | 458 |
disk_data.append(iso) |
Also available in: Unified diff