File 0001-Specify-the-default-cdrom-type-scsi-for-AARCH64.patch of Package openstack-nova

From 83dc79acb2a957e82511ea5c2ddb1f32f0249927 Mon Sep 17 00:00:00 2001
From: Kevin Zhao <kevin.zhao@linaro.org>
Date: Tue, 31 May 2016 02:54:40 +0000
Subject: [PATCH] Specify the default cdrom type "scsi" for AARCH64.

In AARCH64,ide is not the proper type for cdrom device just like
in x86_64.So change this to scsi in case of qemu error. Also add
a test for this.

Close-Bug: #1585893

Change-Id: Ia1cfde9f96fa54de0b352a7e6e903898b1eb7476
Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
(cherry picked from commit 36998c05d5b3c23a6b35bd0620d8a0f5f7e5d80c)
---
 nova/tests/unit/virt/libvirt/test_blockinfo.py | 4 +++-
 nova/virt/libvirt/blockinfo.py                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nova/tests/unit/virt/libvirt/test_blockinfo.py b/nova/tests/unit/virt/libvirt/test_blockinfo.py
index 146caab..0109d0e 100644
--- a/nova/tests/unit/virt/libvirt/test_blockinfo.py
+++ b/nova/tests/unit/virt/libvirt/test_blockinfo.py
@@ -712,7 +712,9 @@ class LibvirtBlockInfoTest(test.NoDBTestCase):
                 (arch.S390, 'disk', 'virtio'),
                 (arch.S390, 'cdrom', 'scsi'),
                 (arch.S390X, 'disk', 'virtio'),
-                (arch.S390X, 'cdrom', 'scsi')
+                (arch.S390X, 'cdrom', 'scsi'),
+                (arch.AARCH64, 'disk', 'virtio'),
+                (arch.AARCH64, 'cdrom', 'scsi')
                 )
         image_meta = objects.ImageMeta.from_dict(self.test_image_meta)
         for guestarch, dev, res in expected:
diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py
index f770bbc..da7bcab 100644
--- a/nova/virt/libvirt/blockinfo.py
+++ b/nova/virt/libvirt/blockinfo.py
@@ -262,7 +262,7 @@ def get_disk_bus_for_device_type(instance,
         if device_type == "cdrom":
             guestarch = libvirt_utils.get_arch(image_meta)
             if guestarch in (arch.PPC, arch.PPC64, arch.PPCLE, arch.PPC64LE,
-                arch.S390, arch.S390X):
+                arch.S390, arch.S390X, arch.AARCH64):
                 return "scsi"
             else:
                 return "ide"
-- 
2.10.0