From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id D1EF21B026 for ; Fri, 5 Jan 2018 11:28:17 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 11AC21529; Fri, 5 Jan 2018 02:28:17 -0800 (PST) Received: from phil-VirtualBox.shanghai.arm.com (phil-virtualbox.shanghai.arm.com [10.169.38.30]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4D8BB3F53D; Fri, 5 Jan 2018 02:28:16 -0800 (PST) From: Phil Yang To: dts@dpdk.org Cc: nd@arm.com, phil.yang@arm.com, yong.liu@intel.com Date: Fri, 5 Jan 2018 18:28:02 +0800 Message-Id: <1515148082-28353-1-git-send-email-phil.yang@arm.com> X-Mailer: git-send-email 2.7.4 Subject: [dts] [PATCH] framwork/qemu_kvm: Fix add_vm_disk single field parameter support. X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2018 10:28:18 -0000 Fix add_vm_disk: Should allow single field parameter configuration for disk. Signed-off-by: Phil Yang --- 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