From: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
To: Thomas Huth <thuth@redhat.com>, Nico Boehr <nrb@linux.ibm.com>,
Nikos Nikoleris <nikos.nikoleris@arm.com>,
Shaoqin Huang <shahuang@redhat.com>,
Andrew Jones <andrew.jones@linux.dev>,
Sean Christopherson <seanjc@google.com>,
Colton Lewis <coltonlewis@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: David Hildenbrand <david@redhat.com>,
Ricardo Koller <ricarkol@google.com>,
Janosch Frank <frankja@linux.ibm.com>,
linux-s390@vger.kernel.org,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
kvm@vger.kernel.org
Subject: Re: [kvm-unit-tests PATCH 09/10] scripts: Implement multiline strings for extra_params
Date: Wed, 25 Oct 2023 19:58:27 +0200 [thread overview]
Message-ID: <9891f55d84cb16748003ff202136172ed59c26a5.camel@linux.ibm.com> (raw)
In-Reply-To: <9b525819-f284-43fd-8093-3856dcc6d288@redhat.com>
On Wed, 2023-10-25 at 19:50 +0200, Thomas Huth wrote:
> On 20/10/2023 16.48, Nina Schoetterl-Glausch wrote:
> > Implement a rudimentary form only.
> > extra_params can get long when passing a lot of arguments to qemu.
> > Multiline strings help with readability of the .cfg file.
> > Multiline strings begin and end with """, which must occur on separate
> > lines.
> >
> > For example:
> > extra_params = """-cpu max,ctop=on -smp cpus=1,cores=16,maxcpus=128 \
> > -append '-drawers 2 -books 2 -sockets 2 -cores 16' \
> > -device max-s390x-cpu,core-id=31,drawer-id=0,book-id=0,socket-id=0"""
> >
> > The command string built with extra_params is eval'ed by the runtime
> > script, so the newlines need to be escaped with \.
> >
> > Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
> > ---
> > scripts/common.bash | 16 ++++++++++++++++
> > scripts/runtime.bash | 4 ++--
> > 2 files changed, 18 insertions(+), 2 deletions(-)
> >
> > diff --git a/scripts/common.bash b/scripts/common.bash
> > index 7b983f7d..b9413d68 100644
> > --- a/scripts/common.bash
> > +++ b/scripts/common.bash
> > @@ -36,6 +36,22 @@ function for_each_unittest()
> > kernel=$TEST_DIR/${BASH_REMATCH[1]}
> > elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then
> > smp=${BASH_REMATCH[1]}
> > + elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then
> > + opts=${BASH_REMATCH[1]}$'\n'
> > + while read -r -u $fd; do
> > + #escape backslash newline, but not double backslash
> > + if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then
> > + if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then
> > + opts=${opts%\\$'\n'}
> > + fi
> > + fi
> > + if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then
> > + opts+=${BASH_REMATCH[1]}
> > + break
> > + else
> > + opts+=$REPLY$'\n'
> > + fi
> > + done
>
> Phew, TIL that there is something like $'\n' in bash ...
> Now with that knowledge, the regular expression make sense 8-)
Uh yeah, it's very write only, with backslash escaping, " inside ' and $'\n'.
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
Thanks!
next prev parent reply other threads:[~2023-10-25 17:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 14:48 [kvm-unit-tests PATCH 00/10] s390x: topology: Fixes and extension Nina Schoetterl-Glausch
2023-10-20 14:48 ` [kvm-unit-tests PATCH 01/10] s390x: topology: Introduce enums for polarization & cpu type Nina Schoetterl-Glausch
2023-10-25 11:56 ` Nico Boehr
2023-10-25 11:58 ` Janosch Frank
2023-10-20 14:48 ` [kvm-unit-tests PATCH 02/10] s390x: topology: Fix report message Nina Schoetterl-Glausch
2023-10-25 11:59 ` Janosch Frank
2023-10-20 14:48 ` [kvm-unit-tests PATCH 03/10] s390x: topology: Use function parameter in stsi_get_sysib Nina Schoetterl-Glausch
2023-10-20 14:48 ` [kvm-unit-tests PATCH 04/10] s390x: topology: Fix parsing loop Nina Schoetterl-Glausch
2023-10-25 12:00 ` Janosch Frank
2023-10-20 14:48 ` [kvm-unit-tests PATCH 05/10] s390x: topology: Make some report messages unique Nina Schoetterl-Glausch
2023-10-20 14:48 ` [kvm-unit-tests PATCH 06/10] s390x: topology: Refine stsi header test Nina Schoetterl-Glausch
2023-10-25 14:11 ` Janosch Frank
2023-10-20 14:48 ` [kvm-unit-tests PATCH 07/10] s390x: topology: Rename topology_core to topology_cpu Nina Schoetterl-Glausch
2023-10-20 14:48 ` [kvm-unit-tests PATCH 08/10] s390x: topology: Rewrite topology list test Nina Schoetterl-Glausch
2023-10-20 14:48 ` [kvm-unit-tests PATCH 09/10] scripts: Implement multiline strings for extra_params Nina Schoetterl-Glausch
2023-10-25 17:50 ` Thomas Huth
2023-10-25 17:58 ` Nina Schoetterl-Glausch [this message]
2023-10-20 14:49 ` [kvm-unit-tests PATCH 10/10] s390x: topology: Add complex topology test Nina Schoetterl-Glausch
2023-10-25 12:21 ` [kvm-unit-tests PATCH 00/10] s390x: topology: Fixes and extension Nico Boehr
[not found] ` <0f132157ec6437326c6bd63f8be18976b19f058a.camel@linux.ibm.com>
2023-10-30 7:30 ` Nico Boehr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9891f55d84cb16748003ff202136172ed59c26a5.camel@linux.ibm.com \
--to=nsg@linux.ibm.com \
--cc=andrew.jones@linux.dev \
--cc=coltonlewis@google.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=nikos.nikoleris@arm.com \
--cc=nrb@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=ricarkol@google.com \
--cc=seanjc@google.com \
--cc=shahuang@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox