[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/13] acpi: move acpi_build_facs to acpi-common.c
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 04/13] acpi: move acpi_build_facs to acpi-common.c |
Date: |
Tue, 5 May 2020 15:42:56 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/i386/acpi-common.h | 1 +
hw/i386/acpi-build.c | 11 +----------
hw/i386/acpi-common.c | 7 +++++++
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
index 9cac18dddf5b..583c320bbe7d 100644
--- a/hw/i386/acpi-common.h
+++ b/hw/i386/acpi-common.h
@@ -11,5 +11,6 @@
void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
X86MachineState *x86ms, AcpiDeviceIf *adev,
bool has_pci);
+void acpi_build_facs(GArray *table_data);
#endif
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4cce2192eeb0..a69b85a266e7 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -316,15 +316,6 @@ static void acpi_align_size(GArray *blob, unsigned align)
g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align));
}
-/* FACS */
-static void
-build_facs(GArray *table_data)
-{
- AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs);
- memcpy(&facs->signature, "FACS", 4);
- facs->length = cpu_to_le32(sizeof(*facs));
-}
-
static void build_append_pcihp_notify_entry(Aml *method, int slot)
{
Aml *if_ctx;
@@ -2417,7 +2408,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState
*machine)
* requirements.
*/
facs = tables_blob->len;
- build_facs(tables_blob);
+ acpi_build_facs(tables_blob);
/* DSDT is pointed to by FADT */
dsdt = tables_blob->len;
diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
index ab9b00581a15..5187653893a8 100644
--- a/hw/i386/acpi-common.c
+++ b/hw/i386/acpi-common.c
@@ -154,3 +154,10 @@ void acpi_build_madt(GArray *table_data, BIOSLinker
*linker,
table_data->len - madt_start, 1, NULL, NULL);
}
+/* FACS */
+void acpi_build_facs(GArray *table_data)
+{
+ AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs);
+ memcpy(&facs->signature, "FACS", 4);
+ facs->length = cpu_to_le32(sizeof(*facs));
+}
--
2.18.4
- Re: [PATCH v2 09/13] microvm: add minimal acpi support, (continued)
[PATCH v2 03/13] acpi: madt: skip pci override on pci-less systems (microvm), Gerd Hoffmann, 2020/05/05
[PATCH v2 11/13] microvm: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/05/05
[PATCH v2 13/13] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/05/05
[PATCH v2 04/13] acpi: move acpi_build_facs to acpi-common.c,
Gerd Hoffmann <=
[PATCH v2 12/13] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/05/05
[PATCH v2 05/13] acpi: move acpi_init_common_fadt_data to acpi-common.c, Gerd Hoffmann, 2020/05/05
[PATCH v2 08/13] acpi: generic event device for x86, Gerd Hoffmann, 2020/05/05