From patchwork Wed Mar 12 20:00:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3820711 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 983109F369 for ; Wed, 12 Mar 2014 20:00:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA991202B4 for ; Wed, 12 Mar 2014 20:00:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F1AC5201D5 for ; Wed, 12 Mar 2014 20:00:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05701FB285; Wed, 12 Mar 2014 13:00:37 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 9371FFB203 for ; Wed, 12 Mar 2014 13:00:15 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id h10so69876eak.8 for ; Wed, 12 Mar 2014 13:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WHDZzdsWt6o4dwR558NCIjMJRuyvxiyyeggKcC/nziQ=; b=JNinilMzmEUJ8wUAJ/A995pHYL9BOCLOZKsrYola8Gb8xPRAFF+3WTzT4LPBnHTj2g bMW+Z4Rb/rKh1jrE27LqOiFrxpgH39+k1Z/6PU7MSuXtnDxJCzLK2Am5j5M6iw5cgKqj /bjI3jKsPapYu26MpeEvSDGIDwk0nTbyNPYUs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WHDZzdsWt6o4dwR558NCIjMJRuyvxiyyeggKcC/nziQ=; b=WVGcLZmVz6GLpnNWxKvOjPlHNO9JWYPc9PmEr/QAS4+Q5FEXWy+ycpo7KVc0ASYfPR UXdkaTPjdXqAdYRttZd58UUBrcNfbkRTz8V3b/oKY8Ci+uMnm1pJPF19tSn26Vn27ip6 JBSMiDHKwc9P42pkMEu5WA5DQouWMZuMsEPypalrOr4xPhLtchnMnhcgk2vtNzPomUb+ HNG6hFAHiCyi+I1RaBDJonfKxRm6LvPqx/iVTSXpHST9HU2m+4lSWGl8/Y17IPDyW6/g sYJR30EPRHKJqEcG3r3IYZcwg0HLspewEdIaabekC8b+xBb4wvCzySKMFmAgnzFFgptZ zANw== X-Gm-Message-State: ALoCoQnL0ZUG0s0ijKdYGEIDn3T/Lp1msg0LYVz+jCXVn2YJ6xiHo3EJ2B4/Nr2t6GfyUYSAMfk/ X-Received: by 10.14.179.73 with SMTP id g49mr69590eem.116.1394654413737; Wed, 12 Mar 2014 13:00:13 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id q44sm73637308eez.1.2014.03.12.13.00.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Mar 2014 13:00:12 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 12 Mar 2014 21:00:01 +0100 Message-Id: <1394654403-2004-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1394654403-2004-1-git-send-email-daniel.vetter@ffwll.ch> References: <1394654403-2004-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 3/5] lib: make igt_debugfs_open infallible X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP (Almost) no one cared anyway. --- lib/igt_debugfs.c | 13 ++++++------- lib/igt_debugfs.h | 2 +- tests/gem_reset_stats.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index 32edc435e4bc..9c4c989c5437 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -37,7 +37,7 @@ /* * General debugfs helpers */ -int igt_debugfs_init(igt_debugfs_t *debugfs) +void igt_debugfs_init(igt_debugfs_t *debugfs) { const char *path = "/sys/kernel/debug"; struct stat st; @@ -51,11 +51,9 @@ int igt_debugfs_init(igt_debugfs_t *debugfs) if (stat("/sys/kernel/debug/dri", &st) == 0) goto find_minor; - if (stat("/sys/kernel/debug", &st)) - return errno; + igt_assert(stat("/sys/kernel/debug", &st) == 0); - if (mount("debug", "/sys/kernel/debug", "debugfs", 0, 0)) - return errno; + igt_assert(mount("debug", "/sys/kernel/debug", "debugfs", 0, 0) == 0); find_minor: strcpy(debugfs->root, path); @@ -64,12 +62,13 @@ find_minor: sprintf(debugfs->dri_path + len, "/i915_error_state"); if (stat(debugfs->dri_path, &st) == 0) { debugfs->dri_path[len] = '\0'; - return 0; + return; } } debugfs->dri_path[0] = '\0'; - return ENOENT; + + igt_fail(4); } int igt_debugfs_open(igt_debugfs_t *debugfs, const char *filename, int mode) diff --git a/lib/igt_debugfs.h b/lib/igt_debugfs.h index 43fa0fc504bf..5f940cb23e57 100644 --- a/lib/igt_debugfs.h +++ b/lib/igt_debugfs.h @@ -36,7 +36,7 @@ typedef struct { char dri_path[128]; } igt_debugfs_t; -int igt_debugfs_init(igt_debugfs_t *debugfs); +void igt_debugfs_init(igt_debugfs_t *debugfs); int igt_debugfs_open(igt_debugfs_t *debugfs, const char *filename, int mode); FILE *igt_debugfs_fopen(igt_debugfs_t *debugfs, const char *filename, const char *mode); diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c index a7d6550df07a..71ba6dfe1659 100644 --- a/tests/gem_reset_stats.c +++ b/tests/gem_reset_stats.c @@ -1041,7 +1041,7 @@ igt_main "Kernel is too old, or contexts not supported: %s\n", strerror(errno)); - assert(igt_debugfs_init(&dfs) == 0); + igt_debugfs_init(&dfs); } igt_subtest("params")