From nobody Sat May 4 00:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=canonical.com ARC-Seal: i=1; a=rsa-sha256; t=1579106272; cv=none; d=zohomail.com; s=zohoarc; b=nP72i0T9EDQBSzr9+xEEksexr03INxp6uVjBmTH5zfhdReBkNdlinJobKhVHj2hTjTWAqvn3XfhTE1lgD91ZrFE/KLWVDgb/VeOS8I5sEvNXmNQpnK5dCqgaxYoGRg5AkThHMpQFsTpYwqNpfXbkJuvtdsP2tJ1lwk1ybAztikA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579106272; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0R7L9uGU4IdcZJnPoIeTKcEURoaNKPAo69Gpj06QAYM=; b=mSYVEPy+ZhMUYIkkcvSP0Dh8oQjs+61wBULf6XdfuG7kwNkzoM08Vv1pEA7+TsqiJ3HAsyveqJjR9TIowDfGmAvEHBMjq4Vpff0QUxQneZG4hkCdG4YeGSfOV58JqLnoqigy4sMaSeFs9ETdlmJayvYJ8QksjXHzbvRopyCF+0M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1579106272692569.1931200331686; Wed, 15 Jan 2020 08:37:52 -0800 (PST) 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-93-sCehXFeXMwCbkZRZaalKww-1; Wed, 15 Jan 2020 11:37:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01E36800EBF; Wed, 15 Jan 2020 16:37:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 776E1842A4; Wed, 15 Jan 2020 16:37:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5ADB3845C1; Wed, 15 Jan 2020 16:37:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00FGbcgu016141 for ; Wed, 15 Jan 2020 11:37:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id DEA982026D67; Wed, 15 Jan 2020 16:37:37 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D926F2022EB2 for ; Wed, 15 Jan 2020 16:37:36 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18220803882 for ; Wed, 15 Jan 2020 16:37:36 +0000 (UTC) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-57-NboxdOqhNomdt_wKXDvUlw-1; Wed, 15 Jan 2020 11:37:32 -0500 Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1irlff-0003fZ-7E; Wed, 15 Jan 2020 16:37:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579106271; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0R7L9uGU4IdcZJnPoIeTKcEURoaNKPAo69Gpj06QAYM=; b=K8+bnyVqBCppKJ3fmYz5pJQKN/XwL92RxGGgyzjXCTCQfZgeMI+Hug7X35cBknzfdluPN9 e7oO3QuMC5aDJa42QTEwE+7juZMvIwoffCqU56rlDuQh890NeXRQ6S3IFQGGKuvg8tNIV1 3aPdyFjEmOKI+baez/qyzQNvra1X4xk= From: Christian Ehrhardt To: libvir-list@redhat.com Date: Wed, 15 Jan 2020 17:37:27 +0100 Message-Id: <20200115163728.4990-2-christian.ehrhardt@canonical.com> In-Reply-To: <20200115163728.4990-1-christian.ehrhardt@canonical.com> References: <20200115163728.4990-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 X-MC-Unique: NboxdOqhNomdt_wKXDvUlw-1 X-MC-Unique: sCehXFeXMwCbkZRZaalKww-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 00FGbcgu016141 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Guido=20G=C3=BCnther?= , Christian Ehrhardt Subject: [libvirt] [PATCH 1/2] test: let qemuhotplugtest report details of init fails X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If virHostdevManagerGetDefault in qemuhotplugtest fails it works for quite a while to later segfault when accessing mgr->activePCIHostdevs. Report the error details and break on a failed init to see the real issue right away. Signed-off-by: Christian Ehrhardt Reviewed-by: Daniel Henrique Barboza --- tests/qemuhotplugtest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index a60c8d1c93..94440791d5 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -634,6 +634,11 @@ mymain(void) return EXIT_FAILURE; =20 driver.hostdevMgr =3D virHostdevManagerGetDefault(); + if (driver.hostdevMgr =3D=3D NULL) { + VIR_TEST_VERBOSE("Could not initialize HostdevManager - %s\n", + virGetLastErrorMessage()); + return EXIT_FAILURE; + } =20 =20 #define DO_TEST(file, ACTION, dev, fial, kep, ...) \ --=20 2.25.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=canonical.com ARC-Seal: i=1; a=rsa-sha256; t=1579106285; cv=none; d=zohomail.com; s=zohoarc; b=nLmjBrDix0TCw1Tdt/+g2Ik5IRkLo4NkOCJkItQIcUKzvASli+BFaQwxf50c663s4O35fZG9ad3YeCRQeEeMVWxeZNo8SRQ0UUWcOhCnfa0bLlpnAB13excF5frlzoUPgecYiL17Iiei/29r/lNRqdqPT2fgn3991tIRhDUsjcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579106285; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HH/qKCI4606NNaLKeNbMBsCUjSNyKIe5wAqyl1E8xVU=; b=QBg82QrP24mpsbSFthxpMokQlHzo/1+gjrLspr18rpMzCCfoBPZabgY1y8JwiM9BK/uTJ8bxXAPje435G1cIfomMvJXoNBrnGwWq/y+ymETJHHiLv2rDwf4UZQiKncGFwtD3u3mtH9VzBE2oGWgxmeQ8scEbi7vSLZPam1aagvo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1579106285986903.2979379808891; Wed, 15 Jan 2020 08:38:05 -0800 (PST) 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-80-D1uCBES0N_WdCX56JVvgnw-1; Wed, 15 Jan 2020 11:38:02 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 090EA107ACC4; Wed, 15 Jan 2020 16:37:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C21301084200; Wed, 15 Jan 2020 16:37:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 60181845E1; Wed, 15 Jan 2020 16:37:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00FGbbB2016132 for ; Wed, 15 Jan 2020 11:37:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 04E152166B31; Wed, 15 Jan 2020 16:37:37 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 009D72166B2E for ; Wed, 15 Jan 2020 16:37:35 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E24CD8032A2 for ; Wed, 15 Jan 2020 16:37:34 +0000 (UTC) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-209-pQOocS-rOMGl8B4K0rR-zw-1; Wed, 15 Jan 2020 11:37:32 -0500 Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1irlff-0003fZ-Fg; Wed, 15 Jan 2020 16:37:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579106283; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HH/qKCI4606NNaLKeNbMBsCUjSNyKIe5wAqyl1E8xVU=; b=HLm3VAey/Yqu+2I2VX0yw4STpzeY7Y/iVYIQPWm3vCN2gCDNNdeKK0M4UZI/LZOhg0ekAb vPMabVhmMb9CXjVLOF2YTZ1xTmBuqkQeWDlrwpBthAer7p6hpvLIjpy89Oa0VfJ00zqzYq 6MFEmdX/YtCWflPkUnU7k22OwwetEts= From: Christian Ehrhardt To: libvir-list@redhat.com Date: Wed, 15 Jan 2020 17:37:28 +0100 Message-Id: <20200115163728.4990-3-christian.ehrhardt@canonical.com> In-Reply-To: <20200115163728.4990-1-christian.ehrhardt@canonical.com> References: <20200115163728.4990-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 X-MC-Unique: pQOocS-rOMGl8B4K0rR-zw-1 X-MC-Unique: D1uCBES0N_WdCX56JVvgnw-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 00FGbbB2016132 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Guido=20G=C3=BCnther?= , Christian Ehrhardt Subject: [libvirt] [PATCH 2/2] test: qemuhotplugtest mock virFileMakePath X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In certain build environments (e.g. Debian and Ubuntu) $HOME is set to a non existing path intentionally. That breaks and crashes qemuhotplugtest by failing the init in virHostdevManagerGetDefault. Avoid that issue by mocking the virFileMakePath behavior if it is passed a path that matches $HOME and doesn't exists. That fixes qemuhotplugtest in Debian/Ubuntu builds of v6.0.0. Signed-off-by: Christian Ehrhardt Reviewed-by: Daniel Henrique Barboza --- tests/qemuhotplugmock.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index 43a9d79051..bd5eb3ceb6 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -18,6 +18,7 @@ =20 #include =20 +#include "virmock.h" #include "qemu/qemu_hotplug.h" #include "conf/domain_conf.h" =20 @@ -31,3 +32,20 @@ qemuDomainGetUnplugTimeout(virDomainObjPtr vm G_GNUC_UNU= SED) return 200; return 100; } + +VIR_MOCK_IMPL_RET_ARGS(virFileMakePath, int, + const char *, path) +{ + const char *home; + + VIR_MOCK_REAL_INIT(virFileMakePath); + + /* ignore non-existing homes (e.g. in build environments) */ + home =3D getenv("HOME"); + if (strstr(path, home)) { + if (!g_file_test (home, G_FILE_TEST_EXISTS)) { + return 0; + } + } + return real_virFileMakePath(path); +} --=20 2.25.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list