diff options
| author |   Ricardo Noriega <rnoriega@redhat.com> | 2018-11-21 10:24:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-21 10:24:52 +0000 |
| commit | 9fde9e2987871ccf16d16adf6efa6b47bf5608bb (patch) | |
| tree | d735d36c746a7fded1d3376e9397af5ab5af5d2b /apex/virtual/configure_vm.py | |
| parent | 1fc27d26a7e2dab1fdd0718d2d8a3c751a6cb701 (diff) | |
| parent | 8f75445a37099590f36ce6044109209c67ef0deb (diff) | |
Merge "Bring in aarch64 support in apex"
Diffstat (limited to 'apex/virtual/configure_vm.py')
| -rwxr-xr-x | apex/virtual/configure_vm.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apex/virtual/configure_vm.py b/apex/virtual/configure_vm.py index ba0398bb..9d47bf03 100755 --- a/apex/virtual/configure_vm.py +++ b/apex/virtual/configure_vm.py @@ -102,6 +102,10 @@ def create_vm(name, image, diskbus='sata', baremetal_interfaces=['admin'], with open(os.path.join(template_dir, 'domain.xml'), 'r') as f: source_template = f.read() imagefile = os.path.realpath(image) + + if arch == 'aarch64' and diskbus == 'sata': + diskbus = 'virtio' + memory = int(memory) * 1024 params = { 'name': name, @@ -118,9 +122,6 @@ def create_vm(name, image, diskbus='sata', baremetal_interfaces=['admin'], 'user_interface': '', } - # assign virtio as default for aarch64 - if arch == 'aarch64' and diskbus == 'sata': - diskbus = 'virtio' # Configure the bus type for the target disk device params['diskbus'] = diskbus nicparams = { @@ -171,7 +172,7 @@ def create_vm(name, image, diskbus='sata', baremetal_interfaces=['admin'], """ params['user_interface'] = """ <controller type='virtio-serial' index='0'> - <address type='virtio-mmio'/> + <address type='pci'/> </controller> <serial type='pty'> <target port='0'/> |