From nobody Tue Mar 3 03:25:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1771320142; cv=none; d=zohomail.com; s=zohoarc; b=DqdOUVaasXX1PmbMAGRH7oG9X3MMWg2rc3hHg7vQJfDPG1dM0xK3t8Fk6dy5xZcc+1Ex1HEtLfRADoUfu67PGFn8y7G4nxpao0Y1rytcGtmXdvykMEQpVfX4+L1Tj7X06LZNLMntSdxeyGchJbjDTVNLqWnBQk3mVJervlkY/jY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771320142; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=XD8chooaDRhI5TSXp42+dx6oh5wfoc54DtT1eiwhwGo=; b=n5HImGCk3gMXRsb4Vlzigs4+7Bk4M+Wq6es9R9iGlWidnAYl1PRW+zX6ioIWtN5xRo9kkePpF/5xB0ojxmBiEGAFDncrzU/Uq1G94eol35egMw1REslVW02fDbFiNSz56kYPUkV/vHP7ouW2PUOIXg93XC9bGUntcO2Gr4xeAxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1771320142233326.45512605454735; Tue, 17 Feb 2026 01:22:22 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 01E6E3F976; Tue, 17 Feb 2026 04:22:22 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 9428C417DE; Tue, 17 Feb 2026 04:21:45 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2695A3F817; Tue, 17 Feb 2026 04:21:41 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 592843F36C for ; Tue, 17 Feb 2026 04:21:40 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-583-VG1a-4N2MRiKNVys_n5HAQ-1; Tue, 17 Feb 2026 04:21:37 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1DCFD180047F for ; Tue, 17 Feb 2026 09:21:37 +0000 (UTC) Received: from antique-laptop.redhat.com (unknown [10.45.242.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4D7C530001BF for ; Tue, 17 Feb 2026 09:21:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771320100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XD8chooaDRhI5TSXp42+dx6oh5wfoc54DtT1eiwhwGo=; b=Q2302AD5vm3hrsL9PTze93tGPn+Ub0RFi/w4xI+4gf7WKGZq6Bp9u9AfCX18WUkZbeNaN6 c8Uf1Zj3OA80o2gfBvuZNmsgu4gz9IY7xyFZmNGtXOOETI0Xarz/3LN+2NObNSzz29lHPX ncdDTZPdO2C5wcxwuJ878X9LHT2TUCU= X-MC-Unique: VG1a-4N2MRiKNVys_n5HAQ-1 X-Mimecast-MFC-AGG-ID: VG1a-4N2MRiKNVys_n5HAQ_1771320097 To: devel@lists.libvirt.org Subject: [libvirt PATCH] tests: fix mocking on macOS Date: Tue, 17 Feb 2026 10:21:34 +0100 Message-ID: <0287f4d5d791ff812bf569c9c2424b2b08122bbb.1771320080.git.phrdina@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9C9vvqVc7wHfafU0C4b4g3zen9osNMeMoANSFGJ788Y_1771320097 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7GD7LTB4XIHVANGU4X4AC5CJ6G3646K2 X-Message-ID-Hash: 7GD7LTB4XIHVANGU4X4AC5CJ6G3646K2 X-MailFrom: phrdina@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Pavel Hrdina via Devel Reply-To: Pavel Hrdina X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1771320145172158500 Content-Type: text/plain; charset="utf-8"; x-default="true" On macOS we use flat namespace so we cannot have multiple mocks for the same function. Fixes: 63434db800b921e96fec424a667b7161af1f02de Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- tests/domaincapsmock.c | 4 ++++ tests/qemuhotplugmock.c | 23 ----------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index aa13deb324..4fb44f7244 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -95,6 +95,10 @@ virFileExists(const char *path) if (STREQ(path, "/dev/vfio/vfio")) return true; =20 + /* required by qemuhotplugtest */ + if (STREQ(path, "/dev/mapper/virt")) + return true; + return real_virFileExists(path); } =20 diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index dd7e2c67e0..79e9bdd8a8 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -24,22 +24,11 @@ #include "testutilsqemu.h" #include "conf/domain_conf.h" #include "virdevmapper.h" -#include "virmock.h" #include =20 #define LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW #include "qemu/qemu_monitor_priv.h" =20 -static bool (*real_virFileExists)(const char *path); - -static void -init_syms(void) -{ - if (real_virFileExists) - return; - - VIR_MOCK_REAL_INIT(virFileExists); -} =20 unsigned long long qemuDomainGetUnplugTimeout(virDomainObj *vm) @@ -69,18 +58,6 @@ virDevMapperGetTargets(const char *path, } =20 =20 -bool -virFileExists(const char *path) -{ - init_syms(); - - if (STREQ(path, "/dev/mapper/virt")) - return true; - - return real_virFileExists(path); -} - - int qemuProcessStartManagedPRDaemon(virDomainObj *vm G_GNUC_UNUSED) { --=20 2.53.0