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.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 smtp.lore.kernel.org (Postfix) with ESMTPS id E1122CDB47E for ; Thu, 12 Oct 2023 07:50:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqqSP-0003EL-I9; Thu, 12 Oct 2023 03:50:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqqSN-0003EA-U4 for qemu-devel@nongnu.org; Thu, 12 Oct 2023 03:50:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqqSL-0008JL-WE for qemu-devel@nongnu.org; Thu, 12 Oct 2023 03:50:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697097005; 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:autocrypt:autocrypt; bh=dKOvhsu9Fii0Pz4WpSYmAPGQjlDrWCtSQ1QW5/riD4Y=; b=VN7eJ+vRl7tnQ2txz1yhQH3Xx2Ufu0dw9LIfRWV1K72+6VyRHu/P1V/DIT1G6M8Fjz3A1e /QMbsdK6jg58Um6xgqm9C/6NSoJdKkYD8qaa03fiO3gKGSF2/+VYTalreeTxYikF4zBBKn e7CoxD97+F/4fUlc38ITIBXLtd/qB/I= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-afsOAhguOda4TRUaD0NJDQ-1; Thu, 12 Oct 2023 03:49:58 -0400 X-MC-Unique: afsOAhguOda4TRUaD0NJDQ-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-41810af14a4so8147381cf.0 for ; Thu, 12 Oct 2023 00:49:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697096997; x=1697701797; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dKOvhsu9Fii0Pz4WpSYmAPGQjlDrWCtSQ1QW5/riD4Y=; b=EmmRUhKn7I7KMCzytXqrLsG2G/kPYnQyomRPVOn+r6IvTW/pLfAAWkonLAwOsZhQ2H HWWUqcfSYOKneZ6u9n9d8XRJCtguhkljCDVkwb+VsUPZyxjkJ901QFYjD68XvhNtteQj WxuBfI8/DR/2DKtgZ6vOesfqa529QOWZ2ScO5f94JKNEbj0Lo26ReMZ58NOiHRaj3Mvs zyypw6c4p9VRcmdwzBPOFadOOvhKw9o52h9R7Eq/FjOzbxF8rCzMAy0B1PnraEThxglH 6uTXAZUxeirJm3h3x1WOD95UFQyAVtMADmSCWWmrH1B1cnN2jnP4wx8+jN1eBCAYrtTv 4/Pg== X-Gm-Message-State: AOJu0YzOb2tpnBAxUn1OUPPJl8ss67nG/DcDGlrgtiwgw/KJkfaKlQcX ZFHpFaDouVWigaME+nDrD7bemo4oEQAfqz8CxOZOOeOl2jHEGgsFyISx0somOcvCLsQ//j0GcA2 lxBpTRcAw0bEQtGQ= X-Received: by 2002:a05:622a:289:b0:40f:dd92:5c91 with SMTP id z9-20020a05622a028900b0040fdd925c91mr26570925qtw.37.1697096997548; Thu, 12 Oct 2023 00:49:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1tqYnbBRY44BCaWQCoyKTk5cIyybR8RuzdeuFE/ebID1tN9YAt0+7hChokjhyZ4ZEayf1mg== X-Received: by 2002:a05:622a:289:b0:40f:dd92:5c91 with SMTP id z9-20020a05622a028900b0040fdd925c91mr26570911qtw.37.1697096997305; Thu, 12 Oct 2023 00:49:57 -0700 (PDT) Received: from [192.168.0.5] (ip-109-43-176-176.web.vodafone.de. [109.43.176.176]) by smtp.gmail.com with ESMTPSA id r8-20020ac87948000000b004196d75d79csm5973309qtt.46.2023.10.12.00.49.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Oct 2023 00:49:56 -0700 (PDT) Message-ID: <84d1dbe6-560e-46d1-93c3-0d6243131c2e@redhat.com> Date: Thu, 12 Oct 2023 09:49:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/9] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary Content-Language: en-US To: Fabiano Rosas , qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , =?UTF-8?Q?Daniel_P_=2E_Berrang=C3=A9?= , =?UTF-8?Q?Alex_Benn=C3=A9e?= , Laurent Vivier , Paolo Bonzini References: <20231006123910.17759-1-farosas@suse.de> <20231006123910.17759-4-farosas@suse.de> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20231006123910.17759-4-farosas@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 06/10/2023 14.39, Fabiano Rosas wrote: > We're adding support for using more than one QEMU binary in > tests. Modify qtest_get_machines() to take an environment variable > that contains the QEMU binary path. > > Since the function keeps a cache of the machines list in the form of a > static variable, refresh it any time the environment variable changes. > > Signed-off-by: Fabiano Rosas > --- > tests/qtest/libqtest.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c > index 88b79cb477..47c8b6d46f 100644 > --- a/tests/qtest/libqtest.c > +++ b/tests/qtest/libqtest.c > @@ -1441,9 +1441,10 @@ struct MachInfo { > * Returns an array with pointers to the available machine names. > * The terminating entry has the name set to NULL. > */ > -static struct MachInfo *qtest_get_machines(void) > +static struct MachInfo *qtest_get_machines(const char *var) > { > static struct MachInfo *machines; > + static char *qemu_var; > QDict *response, *minfo; > QList *list; > const QListEntry *p; > @@ -1452,11 +1453,19 @@ static struct MachInfo *qtest_get_machines(void) > QTestState *qts; > int idx; > > + if (g_strcmp0(qemu_var, var)) { > + qemu_var = g_strdup(var); > + > + /* new qemu, clear the cache */ > + g_free(machines); > + machines = NULL; > + } > + > if (machines) { > return machines; > } After sleeping on the topic of the string handling in this patch series a little bit I think it was maybe a bad idea to suggest to remove the g_strdups in the other patches. If you actually clear the cache here, the strings that previously were guaranteed to stay around until the end of the program might now vanish. So instead of returning the pointer to the cache here, it might be better to create a copy of the whole structure here and let the callers decide whether they want to keep it around or free it at the end? Thomas