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 D629CC47258 for ; Wed, 31 Jan 2024 16:43:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVDfl-0007SI-Sf; Wed, 31 Jan 2024 11:42:49 -0500 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 1rVDfj-0007S4-TF for qemu-devel@nongnu.org; Wed, 31 Jan 2024 11:42:47 -0500 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 1rVDfh-000437-4N for qemu-devel@nongnu.org; Wed, 31 Jan 2024 11:42:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706719363; h=from:from:reply-to: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=m39sIacBB+7GCrvSgLc/bvl4Bew+wcetUvpu+45g/5A=; b=QxKQlwF4Fu8ZYSB08Vgngos/30Jw3pdBcbvnGySElktMesUjBS2YLk4LRbUfDPINEnG9KC Lg+KPGsJc04Y8K2rBYXysklkNC0gE+J8XAWtiOahR+pVLrL4oUqo/JxzP7fK4SzU1bcYTi xZq9eKxf0ah2VALE+RGOZDdXLknep3s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-149-nr9RUSx4MWuP5h-clAizKA-1; Wed, 31 Jan 2024 11:42:39 -0500 X-MC-Unique: nr9RUSx4MWuP5h-clAizKA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D817B827D89; Wed, 31 Jan 2024 16:42:38 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC3471121306; Wed, 31 Jan 2024 16:42:36 +0000 (UTC) Date: Wed, 31 Jan 2024 16:42:34 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: Ilya Leoshkevich , Paolo Bonzini , Ed Maste , Li-Wen Hsu , Warner Losh , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Kyle Evans , qemu-devel@nongnu.org, Alex =?utf-8?Q?Benn=C3=A9e?= , Richard Henderson , Peter Maydell Subject: Re: [PATCH 3/3] meson: Disable CONFIG_NOTIFY1 on FreeBSD Message-ID: References: <20240125194840.1564-1-iii@linux.ibm.com> <20240125194840.1564-4-iii@linux.ibm.com> <33c9ccef-fa8f-41e4-a7a1-17c3dffb9d9d@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <33c9ccef-fa8f-41e4-a7a1-17c3dffb9d9d@linaro.org> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.292, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, Jan 31, 2024 at 05:24:10PM +0100, Philippe Mathieu-Daudé wrote: > Hi, > > Warner, do you remember what this is about? > > (https://cgit.freebsd.org/ports/commit/emulators/qemu-devel/files/patch-util_meson.build?id=2ab482e2c8f51eae7ffd747685b7f181fe1b3809 > isn't very verbose). That's simply going to workaround our incomplete feature check. We look for sys/inotify.h and if present, we assume that is in the C library. That's true on Linux, but not true on *BSD, hence the undefined symbol. We need to augment the header file check with a linker symbol check for the C library. If we wanted to also check for -linotify that'd make it portable to BSD, but not the behaviour difference mentioned below. > > On 25/1/24 20:48, Ilya Leoshkevich wrote: > > make vm-build-freebsd fails with: > > > > ld: error: undefined symbol: inotify_init1 > > >>> referenced by filemonitor-inotify.c:183 (../src/util/filemonitor-inotify.c:183) > > >>> util_filemonitor-inotify.c.o:(qemu_file_monitor_new) in archive libqemuutil.a > > > > On FreeBSD inotify functions are defined in libinotify.so, so it might > > be tempting to add it to the dependencies. Doing so, however, reveals > > that this library handles rename events differently from Linux: > > > > $ FILEMONITOR_DEBUG=1 build/tests/unit/test-util-filemonitor > > Rename /tmp/test-util-filemonitor-K13LI2/fish/one.txt -> /tmp/test-util-filemonitor-K13LI2/two.txt > > Event id=200000000 event=2 file=one.txt > > Queue event id 200000000 event 2 file one.txt > > Queue event id 100000000 event 2 file two.txt > > Queue event id 100000002 event 2 file two.txt > > Queue event id 100000000 event 0 file two.txt > > Queue event id 100000002 event 0 file two.txt > > Event id=100000000 event=0 file=two.txt > > Expected event 0 but got 2 Interesting. So In the "Rename" test, the destination already exists. BSD is thus reporting that 'two.txt' is deleted, before being (re)created Linux is only reporting 'two.txt' is created. I don't think we can easily paper over this difference. The easiest is probably to conditionalize the test git diff diff --git a/tests/unit/test-util-filemonitor.c b/tests/unit/test-util-filemonitor.c index a22de27595..c3b2006365 100644 --- a/tests/unit/test-util-filemonitor.c +++ b/tests/unit/test-util-filemonitor.c @@ -281,6 +281,14 @@ test_file_monitor_events(void) { .type = QFILE_MONITOR_TEST_OP_EVENT, .filesrc = "one.txt", .watchid = &watch1, .eventid = QFILE_MONITOR_EVENT_DELETED }, +#ifdef __FreeBSD__ + { .type = QFILE_MONITOR_TEST_OP_EVENT, + .filesrc = "two.txt", .watchid = &watch0, + .eventid = QFILE_MONITOR_EVENT_DELETED }, + { .type = QFILE_MONITOR_TEST_OP_EVENT, + .filesrc = "two.txt", .watchid = &watch2, + .eventid = QFILE_MONITOR_EVENT_DELETED }, +#endif { .type = QFILE_MONITOR_TEST_OP_EVENT, .filesrc = "two.txt", .watchid = &watch0, .eventid = QFILE_MONITOR_EVENT_CREATED }, With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|