From 8c06b696222077b9c68b75d029a0e3a270d3c6d4 Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 9 May 2018 11:30:55 +0800 Subject: [PATCH] dm: Reorganize ACRN DM directory. The current dm, all non-pci and non-acpi related files are put into hw/platform directory. This is actually disturbed the meaning of *platform*. The platform devices are mean of board and SoC specific non-PCI devices, like usb devices, etc. This patch refines the ACRN dm directory architecture. For some common device logic files, likes block_if.c/uart_core.c or usb_core.c. They will move to hw/ directly. For platform architecture depended files, create arch/ under root dir. And create sub-dir arch/x86 for x86 architecture, will create more architectures in future. The pm.c will move to this new dir. The hw/acpi will be moved to hw/platform/acpi due to acpi also be considered as part of platform. Signed-off-by: Yu Wang --- devicemodel/Makefile | 15 +++++++++------ devicemodel/{hw/platform => arch/x86}/pm.c | 0 devicemodel/hw/{platform => }/block_if.c | 0 devicemodel/hw/{ => platform}/acpi/acpi.c | 0 devicemodel/hw/{ => platform}/acpi/acpi_pm.c | 0 devicemodel/hw/{platform => }/uart_core.c | 0 devicemodel/hw/{platform => }/usb_core.c | 0 7 files changed, 9 insertions(+), 6 deletions(-) rename devicemodel/{hw/platform => arch/x86}/pm.c (100%) rename devicemodel/hw/{platform => }/block_if.c (100%) rename devicemodel/hw/{ => platform}/acpi/acpi.c (100%) rename devicemodel/hw/{ => platform}/acpi/acpi_pm.c (100%) rename devicemodel/hw/{platform => }/uart_core.c (100%) rename devicemodel/hw/{platform => }/usb_core.c (100%) diff --git a/devicemodel/Makefile b/devicemodel/Makefile index 570a1a632..8fea6124a 100644 --- a/devicemodel/Makefile +++ b/devicemodel/Makefile @@ -50,21 +50,22 @@ LIBS += -lz LIBS += -luuid # hw +SRCS += hw/block_if.c +SRCS += hw/usb_core.c +SRCS += hw/uart_core.c SRCS += hw/pci/virtio/virtio.c SRCS += hw/pci/virtio/virtio_kernel.c SRCS += hw/platform/usb_mouse.c -SRCS += hw/platform/usb_core.c SRCS += hw/platform/atkbdc.c SRCS += hw/platform/ps2mouse.c SRCS += hw/platform/rtc.c SRCS += hw/platform/ps2kbd.c -SRCS += hw/platform/pm.c -SRCS += hw/platform/uart_core.c -SRCS += hw/platform/block_if.c SRCS += hw/platform/ioapic.c SRCS += hw/platform/cmos_io.c SRCS += hw/platform/ioc.c SRCS += hw/platform/ioc_cbc.c +SRCS += hw/platform/acpi/acpi.c +SRCS += hw/platform/acpi/acpi_pm.c SRCS += hw/pci/wdt_i6300esb.c SRCS += hw/pci/lpc.c SRCS += hw/pci/xhci.c @@ -81,8 +82,6 @@ SRCS += hw/pci/virtio/virtio_hyper_dmabuf.c SRCS += hw/pci/virtio/virtio_heci.c SRCS += hw/pci/irq.c SRCS += hw/pci/uart.c -SRCS += hw/acpi/acpi.c -SRCS += hw/acpi/acpi_pm.c # core #SRCS += core/bootrom.c @@ -103,6 +102,10 @@ SRCS += core/mptbl.c SRCS += core/main.c SRCS += core/hugetlb.c +# arch +SRCS += arch/x86/pm.c + + OBJS := $(patsubst %.c,$(DM_OBJDIR)/%.o,$(SRCS)) HEADERS := $(shell find $(BASEDIR) -name '*.h') diff --git a/devicemodel/hw/platform/pm.c b/devicemodel/arch/x86/pm.c similarity index 100% rename from devicemodel/hw/platform/pm.c rename to devicemodel/arch/x86/pm.c diff --git a/devicemodel/hw/platform/block_if.c b/devicemodel/hw/block_if.c similarity index 100% rename from devicemodel/hw/platform/block_if.c rename to devicemodel/hw/block_if.c diff --git a/devicemodel/hw/acpi/acpi.c b/devicemodel/hw/platform/acpi/acpi.c similarity index 100% rename from devicemodel/hw/acpi/acpi.c rename to devicemodel/hw/platform/acpi/acpi.c diff --git a/devicemodel/hw/acpi/acpi_pm.c b/devicemodel/hw/platform/acpi/acpi_pm.c similarity index 100% rename from devicemodel/hw/acpi/acpi_pm.c rename to devicemodel/hw/platform/acpi/acpi_pm.c diff --git a/devicemodel/hw/platform/uart_core.c b/devicemodel/hw/uart_core.c similarity index 100% rename from devicemodel/hw/platform/uart_core.c rename to devicemodel/hw/uart_core.c diff --git a/devicemodel/hw/platform/usb_core.c b/devicemodel/hw/usb_core.c similarity index 100% rename from devicemodel/hw/platform/usb_core.c rename to devicemodel/hw/usb_core.c