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 4B69AC38A02 for ; Fri, 28 Oct 2022 13:02:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooOyh-0003r2-8D; Fri, 28 Oct 2022 09:00:51 -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 1ooOyE-0003oX-QW for qemu-devel@nongnu.org; Fri, 28 Oct 2022 09:00:34 -0400 Received: from kylie.crudebyte.com ([5.189.157.229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooOyC-0001Pc-SE for qemu-devel@nongnu.org; Fri, 28 Oct 2022 09:00:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=kylie; h=Content-Type:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Content-ID:Content-Description; bh=T7Ja3h5E5N43oTSd1K4oTa6P4JV3Xz6suGTN8QPRQkU=; b=VzUKqZXfhm4tKW6CIIrKKNSYch HqC1Rfqo0ZcLX0mqjVCR8KV5nMpmcVqrtl7vMeYC4wBBEllPVs9s7FkWCPh0ujAinwL/knw8zRZR2 3xI/VsMkJWB9idxBPInmKFuZ6dRWh/LBjL3Q9dAGWP9VEHM6dao7GJjYdPRq5bl6T+Y6jSESjF6hE PXTGRbD76dyuqDiLqnD9mXqcm6cfoALz8xqbIGyT5izrXLupkISpHg/+5dD5WszAIfrknHEcb0lBi aMZAYBD/OqPw7NEWHBKIS15U1i55VcaQKecxcHGI1QNzs9fkBEEwMQXe+O5k26b9N1Shxu77uSzH7 Otuh3cL5kVQEsYjAK1V7zW/4GSNgepidAspoEFiZqWQhzG7kEv5Uz812h14nEZJ3+qWlzTb6OxkK7 5qYSUiDvWmrEyPHHmRb4ma9jeWxwqBiH2/BOz8MOhGhbt07jFdlctCGLd8AsNJBTNL7B1NE1gHftV u9oiTvjDSkSk9sEFi7TYxrDADL+T7uoiIx0Ujnxn75d8mGl6cDzy32zW6AkYxwYFsGpjZ8GQEtwJL 1PQ5hFOV/WNTmdPbjAIsneGxUrjrscn0TriSoiCyn7Dl+CywM3OLa8N4E3Pd7T1DhwkfqJ9Y+H0CK X0LCpmcRN4ArhO18xOktKsjfTl57JoOGVdEWRd2m8=; From: Christian Schoenebeck To: qemu-devel@nongnu.org Cc: =?ISO-8859-1?Q?Marc=2DAndr=E9?= Lureau , Laurent Vivier , Paolo Bonzini , Thomas Huth , Bin Meng Subject: Re: [PATCH v6 08/11] tests/qtest: libqos: Do not build virtio-9p unconditionally Date: Fri, 28 Oct 2022 14:59:46 +0200 Message-ID: <5007365.dktPthMeyv@silver> In-Reply-To: <20221028045736.679903-9-bin.meng@windriver.com> References: <20221028045736.679903-1-bin.meng@windriver.com> <20221028045736.679903-9-bin.meng@windriver.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: pass client-ip=5.189.157.229; envelope-from=qemu_oss@crudebyte.com; helo=kylie.crudebyte.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Friday, October 28, 2022 6:57:33 AM CEST Bin Meng wrote: > At present the virtio-9p related codes are built into libqos > unconditionally. Change to build them conditionally by testing > the 'virtfs' config option. > > Signed-off-by: Bin Meng > > --- > > Changes in v6: > - new patch: "test/qtest/libqos: meson.build: Do not build virtio-9p unconditionally" > > tests/qtest/libqos/meson.build | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build > index 113c80b4e4..32f028872c 100644 > --- a/tests/qtest/libqos/meson.build > +++ b/tests/qtest/libqos/meson.build > @@ -33,8 +33,6 @@ libqos_srcs = files( > 'sdhci.c', > 'tpci200.c', > 'virtio.c', > - 'virtio-9p.c', > - 'virtio-9p-client.c', > 'virtio-balloon.c', > 'virtio-blk.c', > 'vhost-user-blk.c', > @@ -62,6 +60,10 @@ libqos_srcs = files( > 'x86_64_pc-machine.c', > ) > > +if have_virtfs > + libqos_srcs += files('virtio-9p.c', 'virtio-9p-client.c') > +endif > + > libqos = static_library('qos', libqos_srcs + genh, > name_suffix: 'fa', > build_by_default: false) > I wondered why this change would no longer execute the 9p tests here. Apparently because it changes the order of tests being executed, i.e. 9p tests would then be scheduled after: # Start of vhost-user-blk-pci tests # Start of vhost-user-blk-pci-tests tests Environment variable QTEST_QEMU_STORAGE_DAEMON_BINARY required [EXIT] and I never cared about QEMU storage binary. Can we make a hack like the following to not change the order of the tests? diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index 32f028872c..389bca9804 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -1,7 +1,13 @@ libqos_srcs = files( '../libqtest.c', '../libqmp.c', +) +if have_virtfs + libqos_srcs += files('virtio-9p.c', 'virtio-9p-client.c') +endif + +libqos_srcs += files( 'qgraph.c', 'qos_external.c', 'pci.c', @@ -60,10 +66,6 @@ libqos_srcs = files( 'x86_64_pc-machine.c', ) -if have_virtfs - libqos_srcs += files('virtio-9p.c', 'virtio-9p-client.c') -endif - libqos = static_library('qos', libqos_srcs + genh, name_suffix: 'fa', build_by_default: false) Too ugly? Best regards, Christian Schoenebeck