From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 942E71B3DC for ; Wed, 16 May 2018 07:37:47 +0200 (CEST) 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 8BA271435; Tue, 15 May 2018 22:37:46 -0700 (PDT) Received: from net-x86-lenovo_01.shanghai.arm.com (lenovo-a010984.shanghai.arm.com [10.169.40.105]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1D9D03F53D; Tue, 15 May 2018 22:37:45 -0700 (PDT) From: Joyce Kong To: dts@dpdk.org Cc: Joyce Kong Date: Wed, 16 May 2018 13:37:37 +0800 Message-Id: <1526449057-1879-1-git-send-email-joyce.kong@arm.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH] framework/qemu_kvm: set opt_gic_version for virt machine on qemu-system-aarch64 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: Wed, 16 May 2018 05:37:47 -0000 Vm can not be setup successfully without opt_gic_version option for virt machine on qemu-system-aarch64. Signed-off-by: Joyce Kong --- conf/vhost_sample.cfg | 3 ++- framework/qemu_kvm.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/conf/vhost_sample.cfg b/conf/vhost_sample.cfg index 16abfad..4f0700c 100644 --- a/conf/vhost_sample.cfg +++ b/conf/vhost_sample.cfg @@ -3,7 +3,8 @@ # name: vm0 # # machine -# machine: [virt | ...] +# machine: [virt | opt_gic_version | ...] +# note: opt_gic_version is mandatory on qemu-system-aarch64 # # enable_kvm # enable: [yes | no] diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py index ec33669..79d8ce5 100644 --- a/framework/qemu_kvm.py +++ b/framework/qemu_kvm.py @@ -297,11 +297,17 @@ class QEMUKvm(VirtBase): def add_vm_machine(self, **options): """ - 'machine': 'virt' + 'machine': 'virt','opt_gic_version' """ + machine_boot_line='-machine' + separator = ',' if 'machine' in options.keys() and \ options['machine']: - machine_boot_line = '-machine %s' % options['machine'] + machine_boot_line += '%s' % options['machine'] + if 'opt_gic_version' in options.keys() and \ + options['opt_gic_version']: + machine_boot_line += separator + 'gic_version=%s' % options['opt_gic_version'] + self.__add_boot_line(machine_boot_line) def set_vm_pid_file(self): -- 1.8.3.1