[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 7/8] acpi: move PC stubs out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 7/8] acpi: move PC stubs out of stubs/ |
Date: |
Thu, 12 Dec 2019 18:29:13 +0100 |
This is a small cleanup that lets libqemuutil build without
include/hw/i386/pc.h.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/acpi/Makefile.objs | 1 +
stubs/pc_madt_cpu_entry.c => hw/acpi/acpi-x86-stub.c | 0
stubs/Makefile.objs | 1 -
3 files changed, 1 insertion(+), 1 deletion(-)
rename stubs/pc_madt_cpu_entry.c => hw/acpi/acpi-x86-stub.c (100%)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 655a9c1..e772e89 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -8,6 +8,7 @@ common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
+common-obj-$(call lnot,$(CONFIG_PC)) += acpi-x86-stub.o
common-obj-y += acpi_interface.o
common-obj-y += bios-linker-loader.o
diff --git a/stubs/pc_madt_cpu_entry.c b/hw/acpi/acpi-x86-stub.c
similarity index 100%
rename from stubs/pc_madt_cpu_entry.c
rename to hw/acpi/acpi-x86-stub.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 4a50e95..8b0ff25 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -33,7 +33,6 @@ stub-obj-y += fd-register.o
stub-obj-y += qmp_memory_device.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
-stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += vmgenid.o
stub-obj-y += xen-common.o
stub-obj-y += xen-hvm.o
--
1.8.3.1
- [PATCH v2 2/8] fw_cfg: allow building without other devices, (continued)
[PATCH v2 5/8] x86: move SMM property to X86MachineState, Paolo Bonzini, 2019/12/12
[PATCH v2 7/8] acpi: move PC stubs out of stubs/,
Paolo Bonzini <=
[PATCH v2 6/8] x86: move more x86-generic functions out of PC files, Paolo Bonzini, 2019/12/12
[PATCH v2 8/8] pc: stubify x86 iommu, Paolo Bonzini, 2019/12/12