[dts] [PATCH] framwork/qemu_kvm: Fix add_vm_disk single field parameter support.

Phil Yang phil.yang at arm.com
Fri Jan 5 11:28:02 CET 2018


Fix add_vm_disk: Should allow single field parameter configuration for disk.

Signed-off-by: Phil Yang <phil.yang at arm.com>
---
 framework/qemu_kvm.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index 84f961b..5671de8 100644
--- a/framework/qemu_kvm.py
+++ b/framework/qemu_kvm.py
@@ -362,6 +362,9 @@ class QEMUKvm(VirtBase):
         if 'file' in options.keys() and \
                 options['file']:
             disk_boot_line = '-drive file=%s' % options['file']
+        else:
+            return False
+
         if 'opt_format' in options.keys() and \
                 options['opt_format']:
             disk_boot_line += separator + 'format=%s' % options['opt_format']
@@ -375,8 +378,7 @@ class QEMUKvm(VirtBase):
                 options['opt_media']:
             disk_boot_line += separator + 'media=%s' % options['opt_media']
 
-        if self.__string_has_multi_fields(disk_boot_line, separator):
-            self.__add_boot_line(disk_boot_line)
+        self.__add_boot_line(disk_boot_line)
 
     def add_vm_pflash(self, **options):
         """
-- 
2.7.4



More information about the dts mailing list