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 X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DB0EC33CB3 for ; Fri, 17 Jan 2020 13:40:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DC1820661 for ; Fri, 17 Jan 2020 13:40:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YJXaRx4N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DC1820661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isRri-0002Eu-5j for qemu-devel@archiver.kernel.org; Fri, 17 Jan 2020 08:40:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48901) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isRkS-0002cC-FD for qemu-devel@nongnu.org; Fri, 17 Jan 2020 08:33:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isRkM-00084d-Hy for qemu-devel@nongnu.org; Fri, 17 Jan 2020 08:33:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:39261 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isRkM-00083c-Di for qemu-devel@nongnu.org; Fri, 17 Jan 2020 08:33:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579267989; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hnzy45dwlG0rl6JrsPjiOMNPuy28u2DoYDAroEsLWbs=; b=YJXaRx4ND0/wOulrUVUPGe/65kHvOT4PNfHM8eKNnjOFb+ypl7fJM7xG2WjSiIBk/+k6TO PGGMMqsPAwExJ3xT1jvtkuJkx2CjY3IEzLb/CmlOJkD+AnfgEU/rR+9y2LpgjpuhYz/GoY g31HR8KkV6yx5rFOinRpPcFRPJtHqps= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-Q2rzLsdCOsKiC3VFzkUzDQ-1; Fri, 17 Jan 2020 08:33:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A3B5DB62 for ; Fri, 17 Jan 2020 13:33:07 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BBBD19C4F; Fri, 17 Jan 2020 13:33:06 +0000 (UTC) Date: Fri, 17 Jan 2020 14:33:05 +0100 From: Igor Mammedov To: Thomas Huth Subject: Re: [PATCH v2 83/86] tests:numa-test: make top level args dynamic and g_autofree(cli) cleanups Message-ID: <20200117143305.7eb9571e@redhat.com> In-Reply-To: References: <1579100861-73692-1-git-send-email-imammedo@redhat.com> <1579100861-73692-84-git-send-email-imammedo@redhat.com> <20e88588-13b4-8c7d-3f97-cb2d50b85edd@redhat.com> <20200116180606.134cb1a6@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: Q2rzLsdCOsKiC3VFzkUzDQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 17 Jan 2020 12:14:11 +0100 Thomas Huth wrote: > On 16/01/2020 18.06, Igor Mammedov wrote: > > On Thu, 16 Jan 2020 17:35:32 +0100 > > Thomas Huth wrote: > > > >> On 15/01/2020 16.07, Igor Mammedov wrote: > >>> Use GString to pass argument to make_cli() so that it would be easy > >>> to dynamically change test case arguments from main(). The follow up > >>> patch will use it to change RAM size options depending on target. > >>> > >>> While at it cleanup 'cli' freeing, using g_autofree annotation. > >> > >> Hmm, I'd use g_autofree for new code or do it in a separate cleanup > >> patch, but doing this here distracts quite a bit from the real changes > >> that you are doing... > > I'll split it into separate patch > > > >> > >>> Signed-off-by: Igor Mammedov > >>> --- > >>> PS: > >>> made as a separate patch so it won't clutter followup testcase changes. > >>> > >>> CC: thuth@redhat.com > >>> CC: lvivier@redhat.com > >>> --- > >>> tests/qtest/numa-test.c | 38 ++++++++++++++------------------------ > >>> 1 file changed, 14 insertions(+), 24 deletions(-) > >>> > >>> diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c > >>> index 17dd807..a696dfd 100644 > >>> --- a/tests/qtest/numa-test.c > >>> +++ b/tests/qtest/numa-test.c > >>> @@ -14,16 +14,16 @@ > >>> #include "qapi/qmp/qdict.h" > >>> #include "qapi/qmp/qlist.h" > >>> > >>> -static char *make_cli(const char *generic_cli, const char *test_cli) > >>> +static char *make_cli(const GString *generic_cli, const char *test_cli) > >>> { > >>> - return g_strdup_printf("%s %s", generic_cli ? generic_cli : "", test_cli); > >>> + return g_strdup_printf("%s %s", generic_cli->str, test_cli); > >>> } > >> [...] > >>> @@ -539,11 +529,11 @@ static void pc_hmat_erange_cfg(const void *data) > >>> > >>> int main(int argc, char **argv) > >>> { > >>> - const char *args = NULL; > >>> + g_autoptr(GString) args = g_string_new(""); > >> > >> I think g_string_new(NULL) would be better? > >> > >>> const char *arch = qtest_get_arch(); > >>> > >>> if (strcmp(arch, "aarch64") == 0) { > >>> - args = "-machine virt"; > >>> + g_string_append(args, " -machine virt")> } > >> > >> Is this really required? Looking at your next patch, you could also > >> simply do > >> > >> args = " -object memory-backend-ram,id=ram,size=xxxM" > > xxx is variable so options are > > 1 build this part of CLI dynamically > > 2 mostly duplicate testcase function and include per target size there > > 3 make up a test data structure and pass that to test cases > > > > Given simplicity of current testcases, I'd prefer continue with > > passing CLI as testcase data (option #1). > > Sorry, I think I missed something here... currently I see in the next patch: > > + if (!strcmp(arch, "ppc64")) { > + g_string_append(args, " -object > memory-backend-ram,id=ram,size=512M"); > + } else { > + g_string_append(args, " -object > memory-backend-ram,id=ram,size=128M"); > + } > > ... so these are static strings which could also be handled fine without > GString? Or do you plan to update this in later patches? it's 1 or concatenation of 2 strings " -object memory-backend-ram,id=ram,size=128M" " -object memory-backend-ram,id=ram,size=512M" " -machine virt" + " -object memory-backend-ram,id=ram,size=128M" It's possible to use static strings in expense of a bit of duplication and long winded "if" chain. So using dynamic string here, looks better to me. > Thomas