From patchwork Thu Dec 12 19:54:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 300746 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 C73B32C00A1 for ; Fri, 13 Dec 2013 06:54:58 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VrCLZ-0007Gx-OE; Thu, 12 Dec 2013 19:54:57 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VrCLU-0007Gs-2s for fwts-devel@lists.ubuntu.com; Thu, 12 Dec 2013 19:54:52 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginm.net ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VrCLU-0003rn-0B for fwts-devel@lists.ubuntu.com; Thu, 12 Dec 2013 19:54:52 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] Enable ACPI table dumping for non-x86 systems (LP: #1260470) Date: Thu, 12 Dec 2013 19:54:51 +0000 Message-Id: <1386878091-27193-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.5.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 From: Colin Ian King We now have non-x86 systems (such as ACPI enabled 64 bit ARM devices) that support ACPI, so we should turn on the ACPI table dump for non-x86 systems. Signed-off-by: Colin Ian King Acked-by: Ivan Hu Acked-by: Keng-Yu Lin --- src/lib/src/fwts_dump.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/src/fwts_dump.c b/src/lib/src/fwts_dump.c index 532ff58..9cbe936 100644 --- a/src/lib/src/fwts_dump.c +++ b/src/lib/src/fwts_dump.c @@ -134,7 +134,6 @@ static int dump_lspci(fwts_framework *fw) return dump_exec("lspci.log", command); } -#ifdef FWTS_ARCH_INTEL /* * dump_acpi_table() * hex dump of a ACPI table @@ -185,7 +184,6 @@ static int dump_acpi_tables(fwts_framework *fw) return FWTS_OK; } -#endif /* * dump_readme() @@ -232,9 +230,8 @@ static int dump_readme(void) int fwts_dump_info(fwts_framework *fw) { char path[PATH_MAX+1]; -#ifdef FWTS_ARCH_INTEL bool root_priv = (fwts_check_root_euid(fw, false) == FWTS_OK); -#endif + if (getcwd(path, PATH_MAX) == NULL) strcpy(path, "./"); @@ -268,7 +265,6 @@ int fwts_dump_info(fwts_framework *fw) else printf("Dumped lspci data to lspci.log\n"); -#ifdef FWTS_ARCH_INTEL if (root_priv) { if (dump_acpi_tables(fw) != FWTS_OK) fprintf(stderr, "Failed to dump ACPI tables.\n"); @@ -276,7 +272,6 @@ int fwts_dump_info(fwts_framework *fw) printf("Dumped ACPI tables to acpidump.log\n"); } else fprintf(stderr, "Need root privilege to dump ACPI tables.\n"); -#endif return FWTS_OK; }