From nobody Thu Nov 6 18:20:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154229265279526.07251462573754; Thu, 15 Nov 2018 06:37:32 -0800 (PST) Received: from localhost ([::1]:39214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNIlv-0006Gv-Nd for importer@patchew.org; Thu, 15 Nov 2018 09:37:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNIgY-0002SU-Sl for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:32:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNIgV-00045c-65 for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:58 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gNIgU-0003xX-PT for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:54 -0500 Received: by mail-wr1-x442.google.com with SMTP id r10so3915335wrs.10 for ; Thu, 15 Nov 2018 06:31:37 -0800 (PST) Received: from localhost.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id x194-v6sm55262620wmd.41.2018.11.15.06.31.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Nov 2018 06:31:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n3Z4Wkp/6Rcmbei2bnIHPlmtAbA3I6U//zg9UvWDla4=; b=uTtRnTEcmV1GxjgqCN4Ynjp7QCdBUGOTacFIHETmJhXR5KbxWaCzmvFOV/vVh6iZEp ohTKJ+1AFWjPHXBIrs4XDCsBF42hKKPDU6f8GoKcpNn+ci6LWHx9xbgPRx8FV7wo/6Cc y9eQ2oNJmgbBjPnU6TVa+Z63WM8l6o2hOkFUUL7K8jpcV28KM233R6//18oSrn3mofU7 HOoeqFBPoMYnugPuitozB+lUXvp/k5DMq0HXtmNmTxDe5efKI7AmNdA5kc8KqkhKtoep 2nkW9xOZyuqqF2J8ToI7nJT9qL7BEb1eLWwkKmMbBRlLdvyt5AxUIGZcmTcUGDV6x+i+ xXGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=n3Z4Wkp/6Rcmbei2bnIHPlmtAbA3I6U//zg9UvWDla4=; b=TOx+cZ4Fe/YOFFtVYV2MwcrSlUOOgAq+ULVXOjo0oo9HxywX2UMSUOQYJ+cRzVOVwC GaIflRoEGj9g2wnnQexi+EMT1+9E6zKTaDGo4B8kco2K6nEsBDY8gqakZ56rRiz6qZ6F CY+xI0G6HkqY0PjtHS0+IKX+7NGWh4Hy30IYRYRGOtrP+CHcN0Qn7pdL3VbelF040xJ5 v90LhZ0RLJ/jvqmc2ka1Tb8ETlh/moItqXnvF8UJpYrbMkfw1zj0wS8KLDnc0KZCOEad 2z88h7Pjwm3Lj2MSNJVl45EzTGu1I6G4DxlO8Qyaw9FMdf9uVD6vGMIbe1VmwZHg48CB aTLQ== X-Gm-Message-State: AGRZ1gIGc3g2YXzB8ti+dJZ/S5358KJwXufbdutmGjf/mO5p4/6NhefF VfS2gSMHzn1vZkkulTL2Cd0agy5l X-Google-Smtp-Source: AJdET5e9Nzf+SuZXeNU8fzuowD25/78gd9vFRqY/+aHQ5JbG6n7rt78ZWO3gP3BbQyTaFKJ5ZXV+Aw== X-Received: by 2002:adf:dc87:: with SMTP id r7-v6mr6147982wrj.143.1542292296174; Thu, 15 Nov 2018 06:31:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2018 15:31:23 +0100 Message-Id: <20181115143124.19234-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115143124.19234-1-pbonzini@redhat.com> References: <20181115143124.19234-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 09/10] vhost-user-test: small changes to init_hugepagefs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , jasowang@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" After the conversion to qgraph, the equivalent of "main" will be in a constructor and will run even if the tests are not being requested. Therefore, it should not assert that init_hugepagefs succeeds and will be called when creating the TestServer. This patch changes the prototype of init_hugepagefs, this way the next patch looks nicer. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/vhost-user-test.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 93d5157b13..a282fc57c8 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -461,13 +461,19 @@ static void chr_read(void *opaque, const uint8_t *buf= , int size) g_mutex_unlock(&s->data_mutex); } =20 -static const char *init_hugepagefs(const char *path) +static const char *init_hugepagefs(void) { + const char *path =3D getenv("QTEST_HUGETLBFS_PATH"); struct statfs fs; int ret; =20 + if (!path) { + return NULL; + } + if (access(path, R_OK | W_OK | X_OK)) { g_test_message("access on path (%s): %s\n", path, strerror(errno)); + abort(); return NULL; } =20 @@ -477,11 +483,13 @@ static const char *init_hugepagefs(const char *path) =20 if (ret !=3D 0) { g_test_message("statfs on path (%s): %s\n", path, strerror(errno)); + abort(); return NULL; } =20 if (fs.f_type !=3D HUGETLBFS_MAGIC) { g_test_message("Warning: path not on HugeTLBFS: %s\n", path); + abort(); return NULL; } =20 @@ -974,7 +982,6 @@ static void test_multiqueue(void) =20 int main(int argc, char **argv) { - const char *hugefs; int ret; char template[] =3D "/tmp/vhost-test-XXXXXX"; =20 @@ -989,13 +996,7 @@ int main(int argc, char **argv) } g_assert(tmpfs); =20 - hugefs =3D getenv("QTEST_HUGETLBFS_PATH"); - if (hugefs) { - root =3D init_hugepagefs(hugefs); - g_assert(root); - } else { - root =3D tmpfs; - } + root =3D init_hugepagefs() ? : tmpfs; =20 if (qemu_memfd_check(0)) { qtest_add_data_func("/vhost-user/read-guest-mem/memfd", --=20 2.19.1