From patchwork Wed Jul 22 05:17:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Wong X-Patchwork-Id: 498405 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 25D871402C6; Wed, 22 Jul 2015 15:17:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZHmPH-0004au-Vt; Wed, 22 Jul 2015 05:17:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZHmPE-0004aB-2P for fwts-devel@lists.ubuntu.com; Wed, 22 Jul 2015 05:17:24 +0000 Received: from [128.199.255.134] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ZHmPD-00051l-4l for fwts-devel@lists.ubuntu.com; Wed, 22 Jul 2015 05:17:24 +0000 From: Anthony Wong To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: Allow reading ACPI dump file by non-root user Date: Wed, 22 Jul 2015 13:17:10 +0800 Message-Id: <1437542230-13086-1-git-send-email-anthony.wong@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com Signed-off-by: Anthony Wong Acked-by: Colin Ian King Acked-by: Ivan Hu --- src/lib/src/fwts_dump.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lib/src/fwts_dump.c b/src/lib/src/fwts_dump.c index 5c23313..97c6555 100644 --- a/src/lib/src/fwts_dump.c +++ b/src/lib/src/fwts_dump.c @@ -170,10 +170,11 @@ static int dump_acpi_tables(fwts_framework *fw) for (i=0;;i++) { fwts_acpi_table_info *table; - if (fwts_acpi_get_table(fw, i, &table) == FWTS_ERROR) { + int ret = fwts_acpi_get_table(fw, i, &table); + if (ret != FWTS_OK) { fprintf(stderr, "Cannot read ACPI tables.\n"); fclose(fp); - return FWTS_ERROR; + return ret; } if (table == NULL) break; @@ -290,13 +291,17 @@ int fwts_dump_info(fwts_framework *fw) else printf("Dumped lspci data to lspci.log\n"); - if (root_priv) { - if (dump_acpi_tables(fw) != FWTS_OK) - fprintf(stderr, "Failed to dump ACPI tables.\n"); - else + switch (dump_acpi_tables(fw)) { + case FWTS_OK: printf("Dumped ACPI tables to acpidump.log\n"); - } else - fprintf(stderr, "Need root privilege to dump ACPI tables.\n"); + break; + case FWTS_ERROR_NO_PRIV: + fprintf(stderr, "Need root privilege to dump ACPI tables.\n"); + break; + default: + fprintf(stderr, "Failed to dump ACPI tables.\n"); + break; + } if (dump_cpuinfo() != FWTS_OK) fprintf(stderr, "Failed to dump cpuinfo.\n");