From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52A7DC3ABC0 for ; Wed, 7 May 2025 16:18:17 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Zt0mm012wz30D3; Thu, 8 May 2025 02:18:16 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=95.215.58.174 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1746634695; cv=none; b=gsyOqIIB6ahPyhdtUY+M9Nrprvfz5mhIZ5y51BuuBNsGX5CA4Td0YU+mdgaSwPFVKGW7Zg9B74TLvg/9nqZwGeYFP0O8KzvMuA0oyY2GWjApy3c7grIDwOQ2wGTya+YUXNQwWIIyDOdFc7W0SydgBWn7UH3siJjfqEMk0BUWTk2TExIzt2fdX5Ux/Fp0ig5I9omL9y9IOJHm2qGhcwNPBYijOie9fRyaVb4o2or/NgC/j6DvEHqDPaUGgW4MZGYyUYhj2cJcM4NvkDinaxja6xEs3RpmDmVnwFu8iXeh/QTqLqRW10ZFaQz/CZO72ZxmHLky2DB1xQBiphyZfgB4wg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1746634695; c=relaxed/relaxed; bh=cvzrKWSBHnMhA2RqFe405bpG/qFetQkaUeKHPSMDdpk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=maBwNNSyQdnbM1tgM7PjpfWr0JcDFWF6GlOpBJ0dm7y+k75gRmaxNH1S6I3BWL08VInbjFgjKFzLqaQa2TUE2inKee4pGaMxrWgYTxmKYWtpRtSP8pZfNLA+8BOw4mDuEsIwg0f+H1CwscQzpP4Wq5s4pmCYFKpbcOOsW3AwGLX/x5zWEm8rs4xmDD2MOKfibA3/qftsPadXFHXeYPG6YoVgs3DZGE/My7QIJGL/lOBNlQKiE9Vr3dSG/d+cFperFOE/bGvH71pld9Q0nEk9IKS7dZlp4Xnzp220ZFPneKos2bVx0qVXwpu4hdVTzfa0y3VdiVmpVl8uG3OJYU7HAQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.dev; dkim=pass (1024-bit key; unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=eYAp/u49; dkim-atps=neutral; spf=pass (client-ip=95.215.58.174; helo=out-174.mta1.migadu.com; envelope-from=andrew.jones@linux.dev; receiver=lists.ozlabs.org) smtp.mailfrom=linux.dev Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=eYAp/u49; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.dev (client-ip=95.215.58.174; helo=out-174.mta1.migadu.com; envelope-from=andrew.jones@linux.dev; receiver=lists.ozlabs.org) X-Greylist: delayed 2250 seconds by postgrey-1.37 at boromir; Thu, 08 May 2025 02:18:13 AEST Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Zt0mj4rHLz307K for ; Thu, 8 May 2025 02:18:13 +1000 (AEST) Date: Wed, 7 May 2025 18:17:26 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1746634674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cvzrKWSBHnMhA2RqFe405bpG/qFetQkaUeKHPSMDdpk=; b=eYAp/u49dgcTnoK4dpzVAsZUHnnaaMFHBKzM0e2CsX8PZ33mf+KNqyvbKnwwVLxis1itev onS4YWS4YGVN+DopyLEVFZJXWDWKnfiNsg3iuWjWryPYiQYFXHoGvPllp3TUW+r3UTr/rg O7J0M24B+QteHbV3x/qT/w1xIw/u8Ks= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Andrew Jones To: Alexandru Elisei Cc: eric.auger@redhat.com, lvivier@redhat.com, thuth@redhat.com, frankja@linux.ibm.com, imbrenda@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, pbonzini@redhat.com, kvm@vger.kernel.org, kvmarm@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-s390@vger.kernel.org, will@kernel.org, julien.thierry.kdev@gmail.com, maz@kernel.org, oliver.upton@linux.dev, suzuki.poulose@arm.com, yuzenghui@huawei.com, joey.gouly@arm.com, andre.przywara@arm.com Subject: Re: [kvm-unit-tests PATCH v3 07/16] scripts: Use an associative array for qemu argument names Message-ID: <20250507-adc41db1939a5a6bd92e1322@orel> References: <20250507151256.167769-1-alexandru.elisei@arm.com> <20250507151256.167769-8-alexandru.elisei@arm.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250507151256.167769-8-alexandru.elisei@arm.com> X-Migadu-Flow: FLOW_OUT On Wed, May 07, 2025 at 04:12:47PM +0100, Alexandru Elisei wrote: > Move away from hardcoded qemu arguments and use instead an associative > array to get the needed arguments. This paves the way for adding kvmtool > support to the scripts, which has a different syntax for the same VM > configuration parameters. > > Suggested-by: Andrew Jones > Signed-off-by: Alexandru Elisei > --- > scripts/common.bash | 10 +++++++--- > scripts/runtime.bash | 7 +------ > scripts/vmm.bash | 7 +++++++ > 3 files changed, 15 insertions(+), 9 deletions(-) > > diff --git a/scripts/common.bash b/scripts/common.bash > index 9deb87d4050d..649f1c737617 100644 > --- a/scripts/common.bash > +++ b/scripts/common.bash > @@ -1,4 +1,5 @@ > source config.mak > +source scripts/vmm.bash > > function for_each_unittest() > { > @@ -26,8 +27,11 @@ function for_each_unittest() > $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" > fi > testname=$rematch > - smp=1 > + smp="${vmm_opts[$TARGET:nr_cpus]} 1" I think the wrapper functions you suggested in the cover letter might be nice just to keep Bash from hurting people's brains too much. At least to me, smp="$(vmm_optname_nr_cpus) 1" would read better. Also note the use of 'optname' in the name to try and help self-document that this array is holding option names, not option values. > kernel="" > + # Intentionally don't use -append if test_args is empty > + # because qemu interprets the first argument after > + # -append as a kernel parameter. > test_args="" > opts="" > groups="" > @@ -39,9 +43,9 @@ function for_each_unittest() > elif [[ $line =~ ^file\ *=\ *(.*)$ ]]; then > kernel=$TEST_DIR/${BASH_REMATCH[1]} > elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then > - smp=${BASH_REMATCH[1]} > + smp="${vmm_opts[$TARGET:nr_cpus]} ${BASH_REMATCH[1]}" > elif [[ $line =~ ^test_args\ *=\ *(.*)$ ]]; then > - test_args=${BASH_REMATCH[1]} > + test_args="${vmm_opts[$TARGET:args]} ${BASH_REMATCH[1]}" > elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *'"""'(.*)$ ]]; then > opts=${BASH_REMATCH[2]}$'\n' > while read -r -u $fd; do > diff --git a/scripts/runtime.bash b/scripts/runtime.bash > index 06cc58e79b69..86d8a2cd8528 100644 > --- a/scripts/runtime.bash > +++ b/scripts/runtime.bash > @@ -34,7 +34,7 @@ premature_failure() > get_cmdline() > { > local kernel=$1 > - echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" > + echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel $smp $test_args $opts" > } > > skip_nodefault() > @@ -88,11 +88,6 @@ function run() > local accel="${10}" > local timeout="${11:-$TIMEOUT}" # unittests.cfg overrides the default > > - # If $test_args is empty, qemu will interpret the first option after -append > - # as a kernel parameter instead of a qemu option, so make sure the -append > - # option is used only if $test_args is not empy. > - [ -n "$test_args" ] && opts="-append $test_args $opts" > - > if [ "${CONFIG_EFI}" == "y" ]; then > kernel=${kernel/%.flat/.efi} > fi > diff --git a/scripts/vmm.bash b/scripts/vmm.bash > index 39325858c6b3..b02055a5c0b6 100644 > --- a/scripts/vmm.bash > +++ b/scripts/vmm.bash > @@ -1,5 +1,12 @@ > source config.mak > > +declare -A vmm_opts=( > + [qemu:nr_cpus]='-smp' > + [qemu:kernel]='-kernel' > + [qemu:args]='-append' > + [qemu:initrd]='-initrd' > +) > + > function check_vmm_supported() > { > case "$TARGET" in > -- > 2.49.0 Otherwise, Reviewed-by: Andrew Jones Thanks, drew