From patchwork Fri May 6 14:08:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841218 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBA75C433EF for ; Fri, 6 May 2022 14:09:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442023AbiEFOM4 (ORCPT ); Fri, 6 May 2022 10:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442006AbiEFOMr (ORCPT ); Fri, 6 May 2022 10:12:47 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DEA505A2DF for ; Fri, 6 May 2022 07:09:04 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B9345152B; Fri, 6 May 2022 07:09:04 -0700 (PDT) Received: from godel.lab.cambridge.arm.com (godel.lab.cambridge.arm.com [10.7.66.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E08303F885; Fri, 6 May 2022 07:09:03 -0700 (PDT) From: Nikos Nikoleris To: Paolo Bonzini Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 01/23] lib: Move acpi header and implementation to lib Date: Fri, 6 May 2022 15:08:33 +0100 Message-Id: <20220506140855.353337-2-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This change is in preparation of using ACPI in arm64 systems booting with EFI. Signed-off-by: Nikos Nikoleris --- x86/Makefile.common | 2 +- lib/x86/asm/setup.h | 2 +- lib/{x86 => }/acpi.h | 4 ++-- lib/{x86 => }/acpi.c | 0 x86/s3.c | 2 +- x86/vmexit.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename lib/{x86 => }/acpi.h (99%) rename lib/{x86 => }/acpi.c (100%) diff --git a/x86/Makefile.common b/x86/Makefile.common index b903988..4cdba79 100644 --- a/x86/Makefile.common +++ b/x86/Makefile.common @@ -2,6 +2,7 @@ all: directories test_cases +cflatobjs += lib/acpi.o cflatobjs += lib/pci.o cflatobjs += lib/pci-edu.o cflatobjs += lib/alloc.o @@ -18,7 +19,6 @@ cflatobjs += lib/x86/apic.o cflatobjs += lib/x86/atomic.o cflatobjs += lib/x86/desc.o cflatobjs += lib/x86/isr.o -cflatobjs += lib/x86/acpi.o cflatobjs += lib/x86/stack.o cflatobjs += lib/x86/fault_test.o cflatobjs += lib/x86/delay.o diff --git a/lib/x86/asm/setup.h b/lib/x86/asm/setup.h index 24d4fa9..f46462c 100644 --- a/lib/x86/asm/setup.h +++ b/lib/x86/asm/setup.h @@ -4,7 +4,7 @@ unsigned long setup_tss(u8 *stacktop); #ifdef CONFIG_EFI -#include "x86/acpi.h" +#include "acpi.h" #include "x86/apic.h" #include "x86/processor.h" #include "x86/smp.h" diff --git a/lib/x86/acpi.h b/lib/acpi.h similarity index 99% rename from lib/x86/acpi.h rename to lib/acpi.h index 67ba389..1e89840 100644 --- a/lib/x86/acpi.h +++ b/lib/acpi.h @@ -1,5 +1,5 @@ -#ifndef _X86_ACPI_H_ -#define _X86_ACPI_H_ +#ifndef _ACPI_H_ +#define _ACPI_H_ #include "libcflat.h" diff --git a/lib/x86/acpi.c b/lib/acpi.c similarity index 100% rename from lib/x86/acpi.c rename to lib/acpi.c diff --git a/x86/s3.c b/x86/s3.c index 6e41d0c..378d37a 100644 --- a/x86/s3.c +++ b/x86/s3.c @@ -1,5 +1,5 @@ #include "libcflat.h" -#include "x86/acpi.h" +#include "acpi.h" #include "asm/io.h" static u32* find_resume_vector_addr(void) diff --git a/x86/vmexit.c b/x86/vmexit.c index 4adec78..2bac049 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -1,9 +1,9 @@ +#include "acpi.h" #include "libcflat.h" #include "smp.h" #include "pci.h" #include "x86/vm.h" #include "x86/desc.h" -#include "x86/acpi.h" #include "x86/apic.h" #include "x86/isr.h"