Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/{misc => i386}/pvpanic.c | 0 hw/i386/Makefile.objs | 2 +- hw/misc/Makefile.objs | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) rename hw/{misc => i386}/pvpanic.c (100%)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index dbc4e65652..541ec8604d 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -46,7 +46,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_NVDIMM=y CONFIG_ACPI_NVDIMM=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index f1fe508ff4..23488d324f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -46,7 +46,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_NVDIMM=y CONFIG_ACPI_NVDIMM=y diff --git a/hw/misc/pvpanic.c b/hw/i386/pvpanic.c similarity index 100% rename from hw/misc/pvpanic.c rename to hw/i386/pvpanic.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index feff56a9b7..41574096f1 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -7,6 +7,6 @@ obj-y += amd_iommu.o obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o -obj-y += acpi-build.o +obj-y += acpi-build.o pvpanic.o obj-y += pci-assign-load-rom.o obj-y += vmport.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 03bc758592..182f9a7d54 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -53,7 +53,6 @@ obj-$(CONFIG_MIPS_CPS) += mips_cpc.o obj-$(CONFIG_MIPS_ITU) += mips_itu.o obj-$(CONFIG_MPS2_SCC) += mps2-scc.o -obj-$(CONFIG_PVPANIC) += pvpanic.o obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o obj-$(CONFIG_AUX) += auxbus.o obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o aspeed_sdmc.o -- 2.15.0.rc0