From a9c38a5cfbee239db6fcbb65e4ed6dcd79f6f199 Mon Sep 17 00:00:00 2001 From: Terry Zou Date: Mon, 29 Jul 2019 12:21:54 +0800 Subject: [PATCH] HV:Acrn-hypvervisor Root Directory Clean-up and create misc/ folder for Acrn daemons, services and tools. This patch is to clean-up acrn-hypervisor root directory, targt only 5 folders under acrn-hypervisor:1.hypervisor,2.devicemodel,3.misc,4.doc,5.build Tracked-On: #3482 Signed-off-by: Terry Zou Acked-by: Eddie Dong --- .gitignore | 1 + Makefile | 16 +++---- doc/Makefile | 2 +- doc/getting-started/apl-nuc.rst | 2 +- doc/tutorials/debug.rst | 6 +-- doc/tutorials/static-ip.rst | 6 +-- doc/user-guides/tools.rst | 2 +- hypervisor/Makefile | 2 +- hypervisor/scripts/kconfig/kconfig.mk | 2 +- {tools => misc}/Makefile | 18 +++---- {tools => misc}/README.rst | 0 .../acrn-config}/kconfig/LICENSE.kconfiglib | 0 .../acrn-config}/kconfig/defconfig.py | 3 +- .../acrn-config}/kconfig/generate_header.py | 47 ++++++++++--------- .../acrn-config}/kconfig/savedefconfig.py | 3 +- .../acrn-config}/kconfig/silentoldconfig.py | 3 +- {scripts => misc/acrn-config/library}/deps.mk | 0 {tools => misc}/acrn-manager/Makefile | 0 {tools => misc}/acrn-manager/README.rst | 0 {tools => misc}/acrn-manager/acrn_mngr.c | 0 {tools => misc}/acrn-manager/acrn_mngr.h | 0 {tools => misc}/acrn-manager/acrn_vm_ops.c | 0 {tools => misc}/acrn-manager/acrnctl.c | 0 {tools => misc}/acrn-manager/acrnctl.h | 0 {tools => misc}/acrn-manager/acrnd.c | 0 {tools => misc}/acrn-manager/acrnd.service | 0 {tools => misc}/acrnbridge/Makefile | 0 {tools => misc}/acrnbridge/acrn.netdev | 0 {tools => misc}/acrnbridge/acrn.network | 0 {tools => misc}/acrnbridge/eth.network | 0 {tools => misc}/acrnbridge/tap0.netdev | 0 {efi-stub => misc/efi-stub}/Makefile | 6 +-- {efi-stub => misc/efi-stub}/MpService.h | 0 {efi-stub => misc/efi-stub}/boot.c | 0 {efi-stub => misc/efi-stub}/boot.h | 0 .../efi-stub}/clearlinux/acrn.conf | 0 {efi-stub => misc/efi-stub}/efilinux.h | 0 {efi-stub => misc/efi-stub}/malloc.c | 0 {efi-stub => misc/efi-stub}/multiboot.h | 0 {efi-stub => misc/efi-stub}/pe.c | 0 {efi-stub => misc/efi-stub}/stdlib.h | 0 {tools => misc/tools}/acrn-crashlog/Makefile | 0 .../tools}/acrn-crashlog/README.rst | 0 .../tools}/acrn-crashlog/acrnprobe/Makefile | 0 .../tools}/acrn-crashlog/acrnprobe/README.rst | 0 .../acrn-crashlog/acrnprobe/android_events.c | 0 .../tools}/acrn-crashlog/acrnprobe/channels.c | 0 .../tools}/acrn-crashlog/acrnprobe/conf.rst | 0 .../acrnprobe/crash_reclassify.c | 0 .../acrn-crashlog/acrnprobe/event_handler.c | 0 .../acrn-crashlog/acrnprobe/event_queue.c | 0 .../tools}/acrn-crashlog/acrnprobe/history.c | 0 .../acrnprobe/images/crash-config.dot | 0 .../acrnprobe/images/crash-match.dot | 0 .../acrnprobe/include/android_events.h | 0 .../acrnprobe/include/channels.h | 0 .../acrnprobe/include/crash_reclassify.h | 0 .../acrnprobe/include/event_handler.h | 0 .../acrnprobe/include/event_queue.h | 0 .../acrn-crashlog/acrnprobe/include/history.h | 0 .../acrnprobe/include/load_conf.h | 0 .../acrn-crashlog/acrnprobe/include/loop.h | 0 .../acrnprobe/include/probeutils.h | 0 .../acrnprobe/include/property.h | 0 .../acrn-crashlog/acrnprobe/include/sender.h | 0 .../acrnprobe/include/startupreason.h | 0 .../acrnprobe/include/vmrecord.h | 0 .../acrn-crashlog/acrnprobe/load_conf.c | 0 .../tools}/acrn-crashlog/acrnprobe/loop.c | 0 .../tools}/acrn-crashlog/acrnprobe/main.c | 0 .../acrn-crashlog/acrnprobe/probeutils.c | 0 .../tools}/acrn-crashlog/acrnprobe/property.c | 0 .../tools}/acrn-crashlog/acrnprobe/sender.c | 0 .../acrn-crashlog/acrnprobe/startupreason.c | 0 .../tools}/acrn-crashlog/acrnprobe/vmrecord.c | 0 .../tools}/acrn-crashlog/common/Makefile | 0 .../tools}/acrn-crashlog/common/cmdutils.c | 0 .../tools}/acrn-crashlog/common/fsutils.c | 0 .../acrn-crashlog/common/include/cmdutils.h | 0 .../acrn-crashlog/common/include/fsutils.h | 0 .../acrn-crashlog/common/include/log_sys.h | 0 .../acrn-crashlog/common/include/strutils.h | 0 .../tools}/acrn-crashlog/common/log_sys.c | 0 .../tools}/acrn-crashlog/common/strutils.c | 0 .../acrn-crashlog/data/40-watchdog.conf | 0 .../acrn-crashlog/data/80-coredump.conf | 0 .../data/acrn-crashlog-dirs.conf | 0 .../acrn-crashlog/data/acrnprobe.service | 0 .../tools}/acrn-crashlog/data/acrnprobe.xml | 0 .../tools}/acrn-crashlog/data/crashlogctl | 0 .../acrn-crashlog/data/usercrash-wrapper | 0 .../acrn-crashlog/data/usercrash.service | 0 .../images/crashlog-workflow.dot | 0 .../tools}/acrn-crashlog/license_header | 0 .../tools}/acrn-crashlog/usercrash/Makefile | 0 .../tools}/acrn-crashlog/usercrash/README.rst | 0 .../tools}/acrn-crashlog/usercrash/client.c | 0 .../acrn-crashlog/usercrash/crash_dump.c | 0 .../tools}/acrn-crashlog/usercrash/debugger.c | 0 .../usercrash/include/crash_dump.h | 0 .../acrn-crashlog/usercrash/include/packet.h | 0 .../usercrash/include/protocol.h | 0 .../tools}/acrn-crashlog/usercrash/protocol.c | 0 .../tools}/acrn-crashlog/usercrash/server.c | 0 {tools => misc/tools}/acrnlog/Makefile | 0 {tools => misc/tools}/acrnlog/README.rst | 0 {tools => misc/tools}/acrnlog/acrnlog.c | 0 {tools => misc/tools}/acrnlog/acrnlog.service | 0 {tools => misc/tools}/acrntrace/Makefile | 0 {tools => misc/tools}/acrntrace/README.rst | 0 {tools => misc/tools}/acrntrace/acrntrace.c | 0 {tools => misc/tools}/acrntrace/acrntrace.h | 0 {tools => misc/tools}/acrntrace/sbuf.c | 0 {tools => misc/tools}/acrntrace/sbuf.h | 0 .../tools}/acrntrace/scripts/acrnalyze.py | 0 .../acrntrace/scripts/acrntrace_format.py | 0 .../tools}/acrntrace/scripts/formats | 0 .../tools}/acrntrace/scripts/irq_analyze.py | 0 .../acrntrace/scripts/vmexit_analyze.py | 0 119 files changed, 62 insertions(+), 57 deletions(-) rename {tools => misc}/Makefile (64%) rename {tools => misc}/README.rst (100%) rename {scripts => misc/acrn-config}/kconfig/LICENSE.kconfiglib (100%) rename {scripts => misc/acrn-config}/kconfig/defconfig.py (98%) rename {scripts => misc/acrn-config}/kconfig/generate_header.py (70%) rename {scripts => misc/acrn-config}/kconfig/savedefconfig.py (98%) rename {scripts => misc/acrn-config}/kconfig/silentoldconfig.py (99%) rename {scripts => misc/acrn-config/library}/deps.mk (100%) rename {tools => misc}/acrn-manager/Makefile (100%) rename {tools => misc}/acrn-manager/README.rst (100%) rename {tools => misc}/acrn-manager/acrn_mngr.c (100%) rename {tools => misc}/acrn-manager/acrn_mngr.h (100%) rename {tools => misc}/acrn-manager/acrn_vm_ops.c (100%) rename {tools => misc}/acrn-manager/acrnctl.c (100%) rename {tools => misc}/acrn-manager/acrnctl.h (100%) rename {tools => misc}/acrn-manager/acrnd.c (100%) rename {tools => misc}/acrn-manager/acrnd.service (100%) rename {tools => misc}/acrnbridge/Makefile (100%) rename {tools => misc}/acrnbridge/acrn.netdev (100%) rename {tools => misc}/acrnbridge/acrn.network (100%) rename {tools => misc}/acrnbridge/eth.network (100%) rename {tools => misc}/acrnbridge/tap0.netdev (100%) rename {efi-stub => misc/efi-stub}/Makefile (93%) rename {efi-stub => misc/efi-stub}/MpService.h (100%) rename {efi-stub => misc/efi-stub}/boot.c (100%) rename {efi-stub => misc/efi-stub}/boot.h (100%) rename {efi-stub => misc/efi-stub}/clearlinux/acrn.conf (100%) rename {efi-stub => misc/efi-stub}/efilinux.h (100%) rename {efi-stub => misc/efi-stub}/malloc.c (100%) rename {efi-stub => misc/efi-stub}/multiboot.h (100%) rename {efi-stub => misc/efi-stub}/pe.c (100%) rename {efi-stub => misc/efi-stub}/stdlib.h (100%) rename {tools => misc/tools}/acrn-crashlog/Makefile (100%) rename {tools => misc/tools}/acrn-crashlog/README.rst (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/Makefile (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/README.rst (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/android_events.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/channels.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/conf.rst (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/crash_reclassify.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/event_handler.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/event_queue.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/history.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/images/crash-config.dot (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/images/crash-match.dot (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/android_events.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/channels.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/crash_reclassify.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/event_handler.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/event_queue.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/history.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/load_conf.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/loop.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/probeutils.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/property.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/sender.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/startupreason.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/include/vmrecord.h (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/load_conf.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/loop.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/main.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/probeutils.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/property.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/sender.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/startupreason.c (100%) rename {tools => misc/tools}/acrn-crashlog/acrnprobe/vmrecord.c (100%) rename {tools => misc/tools}/acrn-crashlog/common/Makefile (100%) rename {tools => misc/tools}/acrn-crashlog/common/cmdutils.c (100%) rename {tools => misc/tools}/acrn-crashlog/common/fsutils.c (100%) rename {tools => misc/tools}/acrn-crashlog/common/include/cmdutils.h (100%) rename {tools => misc/tools}/acrn-crashlog/common/include/fsutils.h (100%) rename {tools => misc/tools}/acrn-crashlog/common/include/log_sys.h (100%) rename {tools => misc/tools}/acrn-crashlog/common/include/strutils.h (100%) rename {tools => misc/tools}/acrn-crashlog/common/log_sys.c (100%) rename {tools => misc/tools}/acrn-crashlog/common/strutils.c (100%) rename {tools => misc/tools}/acrn-crashlog/data/40-watchdog.conf (100%) rename {tools => misc/tools}/acrn-crashlog/data/80-coredump.conf (100%) rename {tools => misc/tools}/acrn-crashlog/data/acrn-crashlog-dirs.conf (100%) rename {tools => misc/tools}/acrn-crashlog/data/acrnprobe.service (100%) rename {tools => misc/tools}/acrn-crashlog/data/acrnprobe.xml (100%) rename {tools => misc/tools}/acrn-crashlog/data/crashlogctl (100%) rename {tools => misc/tools}/acrn-crashlog/data/usercrash-wrapper (100%) rename {tools => misc/tools}/acrn-crashlog/data/usercrash.service (100%) rename {tools => misc/tools}/acrn-crashlog/images/crashlog-workflow.dot (100%) rename {tools => misc/tools}/acrn-crashlog/license_header (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/Makefile (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/README.rst (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/client.c (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/crash_dump.c (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/debugger.c (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/include/crash_dump.h (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/include/packet.h (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/include/protocol.h (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/protocol.c (100%) rename {tools => misc/tools}/acrn-crashlog/usercrash/server.c (100%) rename {tools => misc/tools}/acrnlog/Makefile (100%) rename {tools => misc/tools}/acrnlog/README.rst (100%) rename {tools => misc/tools}/acrnlog/acrnlog.c (100%) rename {tools => misc/tools}/acrnlog/acrnlog.service (100%) rename {tools => misc/tools}/acrntrace/Makefile (100%) rename {tools => misc/tools}/acrntrace/README.rst (100%) rename {tools => misc/tools}/acrntrace/acrntrace.c (100%) rename {tools => misc/tools}/acrntrace/acrntrace.h (100%) rename {tools => misc/tools}/acrntrace/sbuf.c (100%) rename {tools => misc/tools}/acrntrace/sbuf.h (100%) rename {tools => misc/tools}/acrntrace/scripts/acrnalyze.py (100%) rename {tools => misc/tools}/acrntrace/scripts/acrntrace_format.py (100%) rename {tools => misc/tools}/acrntrace/scripts/formats (100%) rename {tools => misc/tools}/acrntrace/scripts/irq_analyze.py (100%) rename {tools => misc/tools}/acrntrace/scripts/vmexit_analyze.py (100%) diff --git a/.gitignore b/.gitignore index c7fbc2e58..0ae64ac35 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ doc/doxygen doc/_build doc/tools doc/reference/kconfig/*.rst +doc/misc build *.bak *.sav diff --git a/Makefile b/Makefile index b11debb77..3aee95a15 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,9 @@ RELEASE ?= 0 O ?= build ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd) HV_OUT := $(ROOT_OUT)/hypervisor -EFI_OUT := $(ROOT_OUT)/efi-stub +EFI_OUT := $(ROOT_OUT)/misc/efi-stub DM_OUT := $(ROOT_OUT)/devicemodel -TOOLS_OUT := $(ROOT_OUT)/tools +TOOLS_OUT := $(ROOT_OUT)/misc/tools DOC_OUT := $(ROOT_OUT)/doc BUILD_VERSION ?= BUILD_TAG ?= @@ -32,7 +32,7 @@ hypervisor: $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) ifeq ($(FIRMWARE),uefi) echo "building hypervisor as EFI executable..." - $(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) + $(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) endif sbl-hypervisor: @@ -48,14 +48,14 @@ devicemodel: tools tools: mkdir -p $(TOOLS_OUT) - $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) + $(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) doc: $(MAKE) -C $(T)/doc html BUILDDIR=$(DOC_OUT) .PHONY: clean clean: - $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean + $(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) clean $(MAKE) -C $(T)/doc BUILDDIR=$(DOC_OUT) clean rm -rf $(ROOT_OUT) @@ -68,7 +68,7 @@ ifeq ($(FIRMWARE),sbl) endif ifeq ($(FIRMWARE),uefi) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) - $(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install + $(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install endif hypervisor-install-debug: @@ -76,7 +76,7 @@ ifeq ($(FIRMWARE),sbl) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install-debug endif ifeq ($(FIRMWARE),uefi) - $(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug + $(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug endif sbl-hypervisor-install: @@ -91,4 +91,4 @@ devicemodel-install: $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install tools-install: - $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install + $(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install diff --git a/doc/Makefile b/doc/Makefile index 558a04900..20d7ce752 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -43,7 +43,7 @@ doxy: $(Q)find doxygen/xml/* | xargs sed -i 's/simplesect kind="pre"/simplesect kind="preconditions"/' content: - $(Q)scripts/extract_content.py . tools + $(Q)scripts/extract_content.py . misc kconfig: $(Q)srctree=../hypervisor \ diff --git a/doc/getting-started/apl-nuc.rst b/doc/getting-started/apl-nuc.rst index beace6bce..8f0db74b3 100644 --- a/doc/getting-started/apl-nuc.rst +++ b/doc/getting-started/apl-nuc.rst @@ -487,7 +487,7 @@ partition. Follow these steps: `__ as shown here: - .. literalinclude:: ../../efi-stub/clearlinux/acrn.conf + .. literalinclude:: ../../misc/efi-stub/clearlinux/acrn.conf :caption: efi-stub/clearlinux/acrn.conf On the platform, copy the ``acrn.conf`` file to the EFI partition we mounted earlier: diff --git a/doc/tutorials/debug.rst b/doc/tutorials/debug.rst index 427f4419f..e769b5b0f 100644 --- a/doc/tutorials/debug.rst +++ b/doc/tutorials/debug.rst @@ -151,7 +151,7 @@ reason and times of each vm_exit after we have done some operations. # acrnalyze.py -i /home/trace/acrntrace/20190219-001529/1 -o vmexit --vm_exit .. note:: The acrnalyze.py script is in the - ``acrn-hypervisor/tools/acrntrace/scripts`` folder. The location + ``acrn-hypervisor/misc/tools/acrntrace/scripts`` folder. The location of the trace files produced by ``acrntrace`` may be different in your system. .. figure:: images/debug_image28.png @@ -174,7 +174,7 @@ shown in the following example: trace event id 2. Add the following format to - ``acrn-hypervisor/tools/acrntrace/scripts/formats``: + ``acrn-hypervisor/misc/tools/acrntrace/scripts/formats``: .. figure:: images/debug_image1.png :align: center @@ -224,7 +224,7 @@ shown in the following example: formats /home/trace/acrntrace/20190219-001529/1 | grep "trace test" .. note:: The acrnalyze.py script is in the - ``acrn-hypervisor/tools/acrntrace/scripts`` folder. The location + ``acrn-hypervisor/misc/tools/acrntrace/scripts`` folder. The location of the trace files produced by ``acrntrace`` may be different in your system. and we will get the following log: diff --git a/doc/tutorials/static-ip.rst b/doc/tutorials/static-ip.rst index aef6b40d4..e11f48445 100644 --- a/doc/tutorials/static-ip.rst +++ b/doc/tutorials/static-ip.rst @@ -16,7 +16,7 @@ The ACRN Service OS is based on `Clear Linux OS`_ and it uses `systemd-networkd` to set up the Service OS networking. A few files are responsible for setting up the ACRN bridge (``acrn-br0``), the TAP device (``tap0``), and how these are all connected. Those files are installed in ``/usr/lib/systemd/network`` -on the target device and can also be found under ``tools/acrnbridge`` in the source code. +on the target device and can also be found under ``misc/acrnbridge`` in the source code. Setting up the static IP address ******************************** @@ -35,8 +35,8 @@ Modify the ``[Network]`` section in the ``/etc/systemd/network/50-eth.network`` file you just created. This is the content of the file used in ACRN by default. -.. literalinclude:: ../../tools/acrnbridge/eth.network - :caption: tools/acrnbridge/eth.network +.. literalinclude:: ../../misc/acrnbridge/eth.network + :caption: misc/acrnbridge/eth.network :emphasize-lines: 5 Edit the file to remove the line highlighted above and add your network settings in diff --git a/doc/user-guides/tools.rst b/doc/user-guides/tools.rst index 37c2c663f..8a3d76687 100644 --- a/doc/user-guides/tools.rst +++ b/doc/user-guides/tools.rst @@ -7,4 +7,4 @@ Tools :glob: :maxdepth: 1 - ../tools/** + ../misc/** diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 7b321c4cf..a439a093f 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -45,7 +45,7 @@ ARCH_LDFLAGS := .PHONY: default default: all -include $(BASEDIR)/../scripts/deps.mk +include $(BASEDIR)/../misc/acrn-config/library/deps.mk include scripts/kconfig/kconfig.mk diff --git a/hypervisor/scripts/kconfig/kconfig.mk b/hypervisor/scripts/kconfig/kconfig.mk index 613280416..729061874 100644 --- a/hypervisor/scripts/kconfig/kconfig.mk +++ b/hypervisor/scripts/kconfig/kconfig.mk @@ -18,7 +18,7 @@ HV_DEFCONFIG := defconfig HV_CONFIG_H := include/config.h HV_CONFIG_MK := include/config.mk -KCONFIG_DIR := $(BASEDIR)/../scripts/kconfig +KCONFIG_DIR := $(BASEDIR)/../misc/acrn-config/kconfig # Backward-compatibility for RELEASE=(0|1) ifdef RELEASE diff --git a/tools/Makefile b/misc/Makefile similarity index 64% rename from tools/Makefile rename to misc/Makefile index de7ecdae9..e60ad0604 100644 --- a/tools/Makefile +++ b/misc/Makefile @@ -10,26 +10,26 @@ all: acrn-manager acrnbridge endif acrn-crashlog: - $(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) + $(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) acrnlog: - $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) + $(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) acrn-manager: $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) acrntrace: - $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) + $(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) acrnbridge: $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) .PHONY: clean clean: - $(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) clean $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) clean - $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) clean - $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) clean rm -rf $(OUT_DIR) .PHONY: install @@ -40,16 +40,16 @@ install: acrn-manager-install acrnbridge-install endif acrn-crashlog-install: - $(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) install acrnlog-install: - $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) install acrn-manager-install: $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install acrntrace-install: - $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) install acrnbridge-install: $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install diff --git a/tools/README.rst b/misc/README.rst similarity index 100% rename from tools/README.rst rename to misc/README.rst diff --git a/scripts/kconfig/LICENSE.kconfiglib b/misc/acrn-config/kconfig/LICENSE.kconfiglib similarity index 100% rename from scripts/kconfig/LICENSE.kconfiglib rename to misc/acrn-config/kconfig/LICENSE.kconfiglib diff --git a/scripts/kconfig/defconfig.py b/misc/acrn-config/kconfig/defconfig.py similarity index 98% rename from scripts/kconfig/defconfig.py rename to misc/acrn-config/kconfig/defconfig.py index c090fadcc..f56c14df1 100644 --- a/scripts/kconfig/defconfig.py +++ b/misc/acrn-config/kconfig/defconfig.py @@ -4,7 +4,8 @@ # This script takes a Kconfig and a defconfig file, and expands it to a .config # with all default values listed explicitly. -import sys, os +import sys +import os # Kconfiglib: Copyright (c) 2011-2018, Ulf Magnusson # SPDX-License-Identifier: ISC diff --git a/scripts/kconfig/generate_header.py b/misc/acrn-config/kconfig/generate_header.py similarity index 70% rename from scripts/kconfig/generate_header.py rename to misc/acrn-config/kconfig/generate_header.py index 2239c4489..43a11d51d 100644 --- a/scripts/kconfig/generate_header.py +++ b/misc/acrn-config/kconfig/generate_header.py @@ -4,49 +4,50 @@ # This script takes a Kconfig and a .config, and generates a C header file with # all the configuration data defined as object-like macros. -import sys, os +import sys +import os +import re # Kconfiglib: Copyright (c) 2011-2018, Ulf Magnusson # SPDX-License-Identifier: ISC # Refer to scripts/kconfig/LICENSE.kconfiglib for the permission notice. import kconfiglib -import re -class Acrn_config(kconfiglib.Kconfig): +class AcrnConfig(kconfiglib.Kconfig): help_regex = re.compile("64-bit[\s\n]+integer") - def __init__(self, filename="Kconfig", warn=True, warn_to_stderr=True, - encoding="utf-8"): + def __init__(self, filename="Kconfig", warn=True, warn_to_stderr=True, encoding="utf-8"): kconfiglib.Kconfig.__init__(self, filename, warn, warn_to_stderr, encoding) def write_autoconf(self, filename, - header="/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */\n"): + header="/* Generated by Kconfiglib (https://github.com/ulfalizer/" + "Kconfiglib) */\n"): guard_begin = "#ifndef HV_KCONFIG\n#define HV_KCONFIG\n" guard_end = "#endif" - with open(filename, "w") as f: - f.write(header) - f.write(guard_begin) + with open(filename, "w") as f_autoconf: + f_autoconf.write(header) + f_autoconf.write(guard_begin) for sym in self.defined_syms: - if sym.config_string in ("",None): + if sym.config_string in ("", None): continue else: val = sym.str_value if sym.orig_type in (kconfiglib.BOOL, kconfiglib.TRISTATE): if val != "n": - f.write("#define {}{}{} 1\n" + f_autoconf.write("#define {}{}{} 1\n" .format(self.config_prefix, sym.name, "_MODULE" if val == "m" else "")) elif sym.orig_type == kconfiglib.STRING: - f.write('#define {}{} "{}"\n' + f_autoconf.write('#define {}{} "{}"\n' .format(self.config_prefix, sym.name, kconfiglib.escape(val))) elif sym.orig_type in (kconfiglib.INT, kconfiglib.HEX): if sym.orig_type == kconfiglib.HEX: - val = val + "U" - if not val.startswith(("0x", "0X")): - val = "0x" + val + val = val + "U" + if not val.startswith(("0x", "0X")): + val = "0x" + val elif sym.orig_type == kconfiglib.INT and len(sym.ranges) > 0: left_sym = sym.ranges[0][0] right_sym = sym.ranges[0][1] @@ -56,16 +57,16 @@ class Acrn_config(kconfiglib.Kconfig): val = val + "U" _help = sym.nodes[0].help - if _help not in (None,"") and len(self.help_regex.findall(_help)) > 0: + if _help not in (None, "") and len(self.help_regex.findall(_help)) > 0: val = val + "L" - f.write("#define {}{} {}\n" + f_autoconf.write("#define {}{} {}\n" .format(self.config_prefix, sym.name, val)) else: - raise Exception("Internal error while creating C " - 'header: unknown type "{}".' - .format(sym.orig_type)) + raise Exception( + 'Internal error while creating C header: unknown type "{}".' \ + .format(sym.orig_type)) - f.write(guard_end) + f_autoconf.write(guard_end) def usage(): @@ -87,9 +88,9 @@ def main(): sys.stderr.write("Cannot find file %s\n" % config_path) sys.exit(1) - kconfig = Acrn_config(kconfig_path) + kconfig = AcrnConfig(kconfig_path) kconfig.load_config(config_path) - kconfig.write_autoconf(sys.argv[3],header) + kconfig.write_autoconf(sys.argv[3], header) sys.stdout.write("Configuration header written to %s.\n" % sys.argv[3]) if __name__ == "__main__": diff --git a/scripts/kconfig/savedefconfig.py b/misc/acrn-config/kconfig/savedefconfig.py similarity index 98% rename from scripts/kconfig/savedefconfig.py rename to misc/acrn-config/kconfig/savedefconfig.py index 23a0b7c0c..38bae86dc 100644 --- a/scripts/kconfig/savedefconfig.py +++ b/misc/acrn-config/kconfig/savedefconfig.py @@ -5,7 +5,8 @@ # having the default values. The minimized config can act as a defconfig for # future use. -import sys, os +import sys +import os # Kconfiglib: Copyright (c) 2011-2018, Ulf Magnusson # SPDX-License-Identifier: ISC diff --git a/scripts/kconfig/silentoldconfig.py b/misc/acrn-config/kconfig/silentoldconfig.py similarity index 99% rename from scripts/kconfig/silentoldconfig.py rename to misc/acrn-config/kconfig/silentoldconfig.py index cb868c113..53541f2ed 100644 --- a/scripts/kconfig/silentoldconfig.py +++ b/misc/acrn-config/kconfig/silentoldconfig.py @@ -9,7 +9,8 @@ # 3. reconstruct .config with the given list of symbol-value pairs if there # is any disagreement. -import sys, os +import sys +import os # Kconfiglib: Copyright (c) 2011-2018, Ulf Magnusson # SPDX-License-Identifier: ISC diff --git a/scripts/deps.mk b/misc/acrn-config/library/deps.mk similarity index 100% rename from scripts/deps.mk rename to misc/acrn-config/library/deps.mk diff --git a/tools/acrn-manager/Makefile b/misc/acrn-manager/Makefile similarity index 100% rename from tools/acrn-manager/Makefile rename to misc/acrn-manager/Makefile diff --git a/tools/acrn-manager/README.rst b/misc/acrn-manager/README.rst similarity index 100% rename from tools/acrn-manager/README.rst rename to misc/acrn-manager/README.rst diff --git a/tools/acrn-manager/acrn_mngr.c b/misc/acrn-manager/acrn_mngr.c similarity index 100% rename from tools/acrn-manager/acrn_mngr.c rename to misc/acrn-manager/acrn_mngr.c diff --git a/tools/acrn-manager/acrn_mngr.h b/misc/acrn-manager/acrn_mngr.h similarity index 100% rename from tools/acrn-manager/acrn_mngr.h rename to misc/acrn-manager/acrn_mngr.h diff --git a/tools/acrn-manager/acrn_vm_ops.c b/misc/acrn-manager/acrn_vm_ops.c similarity index 100% rename from tools/acrn-manager/acrn_vm_ops.c rename to misc/acrn-manager/acrn_vm_ops.c diff --git a/tools/acrn-manager/acrnctl.c b/misc/acrn-manager/acrnctl.c similarity index 100% rename from tools/acrn-manager/acrnctl.c rename to misc/acrn-manager/acrnctl.c diff --git a/tools/acrn-manager/acrnctl.h b/misc/acrn-manager/acrnctl.h similarity index 100% rename from tools/acrn-manager/acrnctl.h rename to misc/acrn-manager/acrnctl.h diff --git a/tools/acrn-manager/acrnd.c b/misc/acrn-manager/acrnd.c similarity index 100% rename from tools/acrn-manager/acrnd.c rename to misc/acrn-manager/acrnd.c diff --git a/tools/acrn-manager/acrnd.service b/misc/acrn-manager/acrnd.service similarity index 100% rename from tools/acrn-manager/acrnd.service rename to misc/acrn-manager/acrnd.service diff --git a/tools/acrnbridge/Makefile b/misc/acrnbridge/Makefile similarity index 100% rename from tools/acrnbridge/Makefile rename to misc/acrnbridge/Makefile diff --git a/tools/acrnbridge/acrn.netdev b/misc/acrnbridge/acrn.netdev similarity index 100% rename from tools/acrnbridge/acrn.netdev rename to misc/acrnbridge/acrn.netdev diff --git a/tools/acrnbridge/acrn.network b/misc/acrnbridge/acrn.network similarity index 100% rename from tools/acrnbridge/acrn.network rename to misc/acrnbridge/acrn.network diff --git a/tools/acrnbridge/eth.network b/misc/acrnbridge/eth.network similarity index 100% rename from tools/acrnbridge/eth.network rename to misc/acrnbridge/eth.network diff --git a/tools/acrnbridge/tap0.netdev b/misc/acrnbridge/tap0.netdev similarity index 100% rename from tools/acrnbridge/tap0.netdev rename to misc/acrnbridge/tap0.netdev diff --git a/efi-stub/Makefile b/misc/efi-stub/Makefile similarity index 93% rename from efi-stub/Makefile rename to misc/efi-stub/Makefile index c7b035fe2..a68187505 100644 --- a/efi-stub/Makefile +++ b/misc/efi-stub/Makefile @@ -59,10 +59,10 @@ LDSCRIPT := $(GNUEFI_DIR)/elf_$(ARCH)_efi.lds INCDIR := $(SYSROOT)/usr/include -CFLAGS=-I. -I.. -I../hypervisor/include/arch/x86/guest -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \ - -I../hypervisor/include/public -I../hypervisor/include/lib -I../hypervisor/boot/include/guest \ +CFLAGS=-I. -I.. -I../../hypervisor/include/arch/x86/guest -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \ + -I../../hypervisor/include/public -I../../hypervisor/include/lib -I../../hypervisor/boot/include/guest \ -DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \ - -Wall -I../fs/ -D$(ARCH) -O2 -I../hypervisor/include/arch/x86 \ + -Wall -I../fs/ -D$(ARCH) -O2 -I../../hypervisor/include/arch/x86 \ -include config.h CFLAGS += -mno-mmx -mno-sse -mno-sse2 -mno-80387 -mno-fp-ret-in-387 diff --git a/efi-stub/MpService.h b/misc/efi-stub/MpService.h similarity index 100% rename from efi-stub/MpService.h rename to misc/efi-stub/MpService.h diff --git a/efi-stub/boot.c b/misc/efi-stub/boot.c similarity index 100% rename from efi-stub/boot.c rename to misc/efi-stub/boot.c diff --git a/efi-stub/boot.h b/misc/efi-stub/boot.h similarity index 100% rename from efi-stub/boot.h rename to misc/efi-stub/boot.h diff --git a/efi-stub/clearlinux/acrn.conf b/misc/efi-stub/clearlinux/acrn.conf similarity index 100% rename from efi-stub/clearlinux/acrn.conf rename to misc/efi-stub/clearlinux/acrn.conf diff --git a/efi-stub/efilinux.h b/misc/efi-stub/efilinux.h similarity index 100% rename from efi-stub/efilinux.h rename to misc/efi-stub/efilinux.h diff --git a/efi-stub/malloc.c b/misc/efi-stub/malloc.c similarity index 100% rename from efi-stub/malloc.c rename to misc/efi-stub/malloc.c diff --git a/efi-stub/multiboot.h b/misc/efi-stub/multiboot.h similarity index 100% rename from efi-stub/multiboot.h rename to misc/efi-stub/multiboot.h diff --git a/efi-stub/pe.c b/misc/efi-stub/pe.c similarity index 100% rename from efi-stub/pe.c rename to misc/efi-stub/pe.c diff --git a/efi-stub/stdlib.h b/misc/efi-stub/stdlib.h similarity index 100% rename from efi-stub/stdlib.h rename to misc/efi-stub/stdlib.h diff --git a/tools/acrn-crashlog/Makefile b/misc/tools/acrn-crashlog/Makefile similarity index 100% rename from tools/acrn-crashlog/Makefile rename to misc/tools/acrn-crashlog/Makefile diff --git a/tools/acrn-crashlog/README.rst b/misc/tools/acrn-crashlog/README.rst similarity index 100% rename from tools/acrn-crashlog/README.rst rename to misc/tools/acrn-crashlog/README.rst diff --git a/tools/acrn-crashlog/acrnprobe/Makefile b/misc/tools/acrn-crashlog/acrnprobe/Makefile similarity index 100% rename from tools/acrn-crashlog/acrnprobe/Makefile rename to misc/tools/acrn-crashlog/acrnprobe/Makefile diff --git a/tools/acrn-crashlog/acrnprobe/README.rst b/misc/tools/acrn-crashlog/acrnprobe/README.rst similarity index 100% rename from tools/acrn-crashlog/acrnprobe/README.rst rename to misc/tools/acrn-crashlog/acrnprobe/README.rst diff --git a/tools/acrn-crashlog/acrnprobe/android_events.c b/misc/tools/acrn-crashlog/acrnprobe/android_events.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/android_events.c rename to misc/tools/acrn-crashlog/acrnprobe/android_events.c diff --git a/tools/acrn-crashlog/acrnprobe/channels.c b/misc/tools/acrn-crashlog/acrnprobe/channels.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/channels.c rename to misc/tools/acrn-crashlog/acrnprobe/channels.c diff --git a/tools/acrn-crashlog/acrnprobe/conf.rst b/misc/tools/acrn-crashlog/acrnprobe/conf.rst similarity index 100% rename from tools/acrn-crashlog/acrnprobe/conf.rst rename to misc/tools/acrn-crashlog/acrnprobe/conf.rst diff --git a/tools/acrn-crashlog/acrnprobe/crash_reclassify.c b/misc/tools/acrn-crashlog/acrnprobe/crash_reclassify.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/crash_reclassify.c rename to misc/tools/acrn-crashlog/acrnprobe/crash_reclassify.c diff --git a/tools/acrn-crashlog/acrnprobe/event_handler.c b/misc/tools/acrn-crashlog/acrnprobe/event_handler.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/event_handler.c rename to misc/tools/acrn-crashlog/acrnprobe/event_handler.c diff --git a/tools/acrn-crashlog/acrnprobe/event_queue.c b/misc/tools/acrn-crashlog/acrnprobe/event_queue.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/event_queue.c rename to misc/tools/acrn-crashlog/acrnprobe/event_queue.c diff --git a/tools/acrn-crashlog/acrnprobe/history.c b/misc/tools/acrn-crashlog/acrnprobe/history.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/history.c rename to misc/tools/acrn-crashlog/acrnprobe/history.c diff --git a/tools/acrn-crashlog/acrnprobe/images/crash-config.dot b/misc/tools/acrn-crashlog/acrnprobe/images/crash-config.dot similarity index 100% rename from tools/acrn-crashlog/acrnprobe/images/crash-config.dot rename to misc/tools/acrn-crashlog/acrnprobe/images/crash-config.dot diff --git a/tools/acrn-crashlog/acrnprobe/images/crash-match.dot b/misc/tools/acrn-crashlog/acrnprobe/images/crash-match.dot similarity index 100% rename from tools/acrn-crashlog/acrnprobe/images/crash-match.dot rename to misc/tools/acrn-crashlog/acrnprobe/images/crash-match.dot diff --git a/tools/acrn-crashlog/acrnprobe/include/android_events.h b/misc/tools/acrn-crashlog/acrnprobe/include/android_events.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/android_events.h rename to misc/tools/acrn-crashlog/acrnprobe/include/android_events.h diff --git a/tools/acrn-crashlog/acrnprobe/include/channels.h b/misc/tools/acrn-crashlog/acrnprobe/include/channels.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/channels.h rename to misc/tools/acrn-crashlog/acrnprobe/include/channels.h diff --git a/tools/acrn-crashlog/acrnprobe/include/crash_reclassify.h b/misc/tools/acrn-crashlog/acrnprobe/include/crash_reclassify.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/crash_reclassify.h rename to misc/tools/acrn-crashlog/acrnprobe/include/crash_reclassify.h diff --git a/tools/acrn-crashlog/acrnprobe/include/event_handler.h b/misc/tools/acrn-crashlog/acrnprobe/include/event_handler.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/event_handler.h rename to misc/tools/acrn-crashlog/acrnprobe/include/event_handler.h diff --git a/tools/acrn-crashlog/acrnprobe/include/event_queue.h b/misc/tools/acrn-crashlog/acrnprobe/include/event_queue.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/event_queue.h rename to misc/tools/acrn-crashlog/acrnprobe/include/event_queue.h diff --git a/tools/acrn-crashlog/acrnprobe/include/history.h b/misc/tools/acrn-crashlog/acrnprobe/include/history.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/history.h rename to misc/tools/acrn-crashlog/acrnprobe/include/history.h diff --git a/tools/acrn-crashlog/acrnprobe/include/load_conf.h b/misc/tools/acrn-crashlog/acrnprobe/include/load_conf.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/load_conf.h rename to misc/tools/acrn-crashlog/acrnprobe/include/load_conf.h diff --git a/tools/acrn-crashlog/acrnprobe/include/loop.h b/misc/tools/acrn-crashlog/acrnprobe/include/loop.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/loop.h rename to misc/tools/acrn-crashlog/acrnprobe/include/loop.h diff --git a/tools/acrn-crashlog/acrnprobe/include/probeutils.h b/misc/tools/acrn-crashlog/acrnprobe/include/probeutils.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/probeutils.h rename to misc/tools/acrn-crashlog/acrnprobe/include/probeutils.h diff --git a/tools/acrn-crashlog/acrnprobe/include/property.h b/misc/tools/acrn-crashlog/acrnprobe/include/property.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/property.h rename to misc/tools/acrn-crashlog/acrnprobe/include/property.h diff --git a/tools/acrn-crashlog/acrnprobe/include/sender.h b/misc/tools/acrn-crashlog/acrnprobe/include/sender.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/sender.h rename to misc/tools/acrn-crashlog/acrnprobe/include/sender.h diff --git a/tools/acrn-crashlog/acrnprobe/include/startupreason.h b/misc/tools/acrn-crashlog/acrnprobe/include/startupreason.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/startupreason.h rename to misc/tools/acrn-crashlog/acrnprobe/include/startupreason.h diff --git a/tools/acrn-crashlog/acrnprobe/include/vmrecord.h b/misc/tools/acrn-crashlog/acrnprobe/include/vmrecord.h similarity index 100% rename from tools/acrn-crashlog/acrnprobe/include/vmrecord.h rename to misc/tools/acrn-crashlog/acrnprobe/include/vmrecord.h diff --git a/tools/acrn-crashlog/acrnprobe/load_conf.c b/misc/tools/acrn-crashlog/acrnprobe/load_conf.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/load_conf.c rename to misc/tools/acrn-crashlog/acrnprobe/load_conf.c diff --git a/tools/acrn-crashlog/acrnprobe/loop.c b/misc/tools/acrn-crashlog/acrnprobe/loop.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/loop.c rename to misc/tools/acrn-crashlog/acrnprobe/loop.c diff --git a/tools/acrn-crashlog/acrnprobe/main.c b/misc/tools/acrn-crashlog/acrnprobe/main.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/main.c rename to misc/tools/acrn-crashlog/acrnprobe/main.c diff --git a/tools/acrn-crashlog/acrnprobe/probeutils.c b/misc/tools/acrn-crashlog/acrnprobe/probeutils.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/probeutils.c rename to misc/tools/acrn-crashlog/acrnprobe/probeutils.c diff --git a/tools/acrn-crashlog/acrnprobe/property.c b/misc/tools/acrn-crashlog/acrnprobe/property.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/property.c rename to misc/tools/acrn-crashlog/acrnprobe/property.c diff --git a/tools/acrn-crashlog/acrnprobe/sender.c b/misc/tools/acrn-crashlog/acrnprobe/sender.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/sender.c rename to misc/tools/acrn-crashlog/acrnprobe/sender.c diff --git a/tools/acrn-crashlog/acrnprobe/startupreason.c b/misc/tools/acrn-crashlog/acrnprobe/startupreason.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/startupreason.c rename to misc/tools/acrn-crashlog/acrnprobe/startupreason.c diff --git a/tools/acrn-crashlog/acrnprobe/vmrecord.c b/misc/tools/acrn-crashlog/acrnprobe/vmrecord.c similarity index 100% rename from tools/acrn-crashlog/acrnprobe/vmrecord.c rename to misc/tools/acrn-crashlog/acrnprobe/vmrecord.c diff --git a/tools/acrn-crashlog/common/Makefile b/misc/tools/acrn-crashlog/common/Makefile similarity index 100% rename from tools/acrn-crashlog/common/Makefile rename to misc/tools/acrn-crashlog/common/Makefile diff --git a/tools/acrn-crashlog/common/cmdutils.c b/misc/tools/acrn-crashlog/common/cmdutils.c similarity index 100% rename from tools/acrn-crashlog/common/cmdutils.c rename to misc/tools/acrn-crashlog/common/cmdutils.c diff --git a/tools/acrn-crashlog/common/fsutils.c b/misc/tools/acrn-crashlog/common/fsutils.c similarity index 100% rename from tools/acrn-crashlog/common/fsutils.c rename to misc/tools/acrn-crashlog/common/fsutils.c diff --git a/tools/acrn-crashlog/common/include/cmdutils.h b/misc/tools/acrn-crashlog/common/include/cmdutils.h similarity index 100% rename from tools/acrn-crashlog/common/include/cmdutils.h rename to misc/tools/acrn-crashlog/common/include/cmdutils.h diff --git a/tools/acrn-crashlog/common/include/fsutils.h b/misc/tools/acrn-crashlog/common/include/fsutils.h similarity index 100% rename from tools/acrn-crashlog/common/include/fsutils.h rename to misc/tools/acrn-crashlog/common/include/fsutils.h diff --git a/tools/acrn-crashlog/common/include/log_sys.h b/misc/tools/acrn-crashlog/common/include/log_sys.h similarity index 100% rename from tools/acrn-crashlog/common/include/log_sys.h rename to misc/tools/acrn-crashlog/common/include/log_sys.h diff --git a/tools/acrn-crashlog/common/include/strutils.h b/misc/tools/acrn-crashlog/common/include/strutils.h similarity index 100% rename from tools/acrn-crashlog/common/include/strutils.h rename to misc/tools/acrn-crashlog/common/include/strutils.h diff --git a/tools/acrn-crashlog/common/log_sys.c b/misc/tools/acrn-crashlog/common/log_sys.c similarity index 100% rename from tools/acrn-crashlog/common/log_sys.c rename to misc/tools/acrn-crashlog/common/log_sys.c diff --git a/tools/acrn-crashlog/common/strutils.c b/misc/tools/acrn-crashlog/common/strutils.c similarity index 100% rename from tools/acrn-crashlog/common/strutils.c rename to misc/tools/acrn-crashlog/common/strutils.c diff --git a/tools/acrn-crashlog/data/40-watchdog.conf b/misc/tools/acrn-crashlog/data/40-watchdog.conf similarity index 100% rename from tools/acrn-crashlog/data/40-watchdog.conf rename to misc/tools/acrn-crashlog/data/40-watchdog.conf diff --git a/tools/acrn-crashlog/data/80-coredump.conf b/misc/tools/acrn-crashlog/data/80-coredump.conf similarity index 100% rename from tools/acrn-crashlog/data/80-coredump.conf rename to misc/tools/acrn-crashlog/data/80-coredump.conf diff --git a/tools/acrn-crashlog/data/acrn-crashlog-dirs.conf b/misc/tools/acrn-crashlog/data/acrn-crashlog-dirs.conf similarity index 100% rename from tools/acrn-crashlog/data/acrn-crashlog-dirs.conf rename to misc/tools/acrn-crashlog/data/acrn-crashlog-dirs.conf diff --git a/tools/acrn-crashlog/data/acrnprobe.service b/misc/tools/acrn-crashlog/data/acrnprobe.service similarity index 100% rename from tools/acrn-crashlog/data/acrnprobe.service rename to misc/tools/acrn-crashlog/data/acrnprobe.service diff --git a/tools/acrn-crashlog/data/acrnprobe.xml b/misc/tools/acrn-crashlog/data/acrnprobe.xml similarity index 100% rename from tools/acrn-crashlog/data/acrnprobe.xml rename to misc/tools/acrn-crashlog/data/acrnprobe.xml diff --git a/tools/acrn-crashlog/data/crashlogctl b/misc/tools/acrn-crashlog/data/crashlogctl similarity index 100% rename from tools/acrn-crashlog/data/crashlogctl rename to misc/tools/acrn-crashlog/data/crashlogctl diff --git a/tools/acrn-crashlog/data/usercrash-wrapper b/misc/tools/acrn-crashlog/data/usercrash-wrapper similarity index 100% rename from tools/acrn-crashlog/data/usercrash-wrapper rename to misc/tools/acrn-crashlog/data/usercrash-wrapper diff --git a/tools/acrn-crashlog/data/usercrash.service b/misc/tools/acrn-crashlog/data/usercrash.service similarity index 100% rename from tools/acrn-crashlog/data/usercrash.service rename to misc/tools/acrn-crashlog/data/usercrash.service diff --git a/tools/acrn-crashlog/images/crashlog-workflow.dot b/misc/tools/acrn-crashlog/images/crashlog-workflow.dot similarity index 100% rename from tools/acrn-crashlog/images/crashlog-workflow.dot rename to misc/tools/acrn-crashlog/images/crashlog-workflow.dot diff --git a/tools/acrn-crashlog/license_header b/misc/tools/acrn-crashlog/license_header similarity index 100% rename from tools/acrn-crashlog/license_header rename to misc/tools/acrn-crashlog/license_header diff --git a/tools/acrn-crashlog/usercrash/Makefile b/misc/tools/acrn-crashlog/usercrash/Makefile similarity index 100% rename from tools/acrn-crashlog/usercrash/Makefile rename to misc/tools/acrn-crashlog/usercrash/Makefile diff --git a/tools/acrn-crashlog/usercrash/README.rst b/misc/tools/acrn-crashlog/usercrash/README.rst similarity index 100% rename from tools/acrn-crashlog/usercrash/README.rst rename to misc/tools/acrn-crashlog/usercrash/README.rst diff --git a/tools/acrn-crashlog/usercrash/client.c b/misc/tools/acrn-crashlog/usercrash/client.c similarity index 100% rename from tools/acrn-crashlog/usercrash/client.c rename to misc/tools/acrn-crashlog/usercrash/client.c diff --git a/tools/acrn-crashlog/usercrash/crash_dump.c b/misc/tools/acrn-crashlog/usercrash/crash_dump.c similarity index 100% rename from tools/acrn-crashlog/usercrash/crash_dump.c rename to misc/tools/acrn-crashlog/usercrash/crash_dump.c diff --git a/tools/acrn-crashlog/usercrash/debugger.c b/misc/tools/acrn-crashlog/usercrash/debugger.c similarity index 100% rename from tools/acrn-crashlog/usercrash/debugger.c rename to misc/tools/acrn-crashlog/usercrash/debugger.c diff --git a/tools/acrn-crashlog/usercrash/include/crash_dump.h b/misc/tools/acrn-crashlog/usercrash/include/crash_dump.h similarity index 100% rename from tools/acrn-crashlog/usercrash/include/crash_dump.h rename to misc/tools/acrn-crashlog/usercrash/include/crash_dump.h diff --git a/tools/acrn-crashlog/usercrash/include/packet.h b/misc/tools/acrn-crashlog/usercrash/include/packet.h similarity index 100% rename from tools/acrn-crashlog/usercrash/include/packet.h rename to misc/tools/acrn-crashlog/usercrash/include/packet.h diff --git a/tools/acrn-crashlog/usercrash/include/protocol.h b/misc/tools/acrn-crashlog/usercrash/include/protocol.h similarity index 100% rename from tools/acrn-crashlog/usercrash/include/protocol.h rename to misc/tools/acrn-crashlog/usercrash/include/protocol.h diff --git a/tools/acrn-crashlog/usercrash/protocol.c b/misc/tools/acrn-crashlog/usercrash/protocol.c similarity index 100% rename from tools/acrn-crashlog/usercrash/protocol.c rename to misc/tools/acrn-crashlog/usercrash/protocol.c diff --git a/tools/acrn-crashlog/usercrash/server.c b/misc/tools/acrn-crashlog/usercrash/server.c similarity index 100% rename from tools/acrn-crashlog/usercrash/server.c rename to misc/tools/acrn-crashlog/usercrash/server.c diff --git a/tools/acrnlog/Makefile b/misc/tools/acrnlog/Makefile similarity index 100% rename from tools/acrnlog/Makefile rename to misc/tools/acrnlog/Makefile diff --git a/tools/acrnlog/README.rst b/misc/tools/acrnlog/README.rst similarity index 100% rename from tools/acrnlog/README.rst rename to misc/tools/acrnlog/README.rst diff --git a/tools/acrnlog/acrnlog.c b/misc/tools/acrnlog/acrnlog.c similarity index 100% rename from tools/acrnlog/acrnlog.c rename to misc/tools/acrnlog/acrnlog.c diff --git a/tools/acrnlog/acrnlog.service b/misc/tools/acrnlog/acrnlog.service similarity index 100% rename from tools/acrnlog/acrnlog.service rename to misc/tools/acrnlog/acrnlog.service diff --git a/tools/acrntrace/Makefile b/misc/tools/acrntrace/Makefile similarity index 100% rename from tools/acrntrace/Makefile rename to misc/tools/acrntrace/Makefile diff --git a/tools/acrntrace/README.rst b/misc/tools/acrntrace/README.rst similarity index 100% rename from tools/acrntrace/README.rst rename to misc/tools/acrntrace/README.rst diff --git a/tools/acrntrace/acrntrace.c b/misc/tools/acrntrace/acrntrace.c similarity index 100% rename from tools/acrntrace/acrntrace.c rename to misc/tools/acrntrace/acrntrace.c diff --git a/tools/acrntrace/acrntrace.h b/misc/tools/acrntrace/acrntrace.h similarity index 100% rename from tools/acrntrace/acrntrace.h rename to misc/tools/acrntrace/acrntrace.h diff --git a/tools/acrntrace/sbuf.c b/misc/tools/acrntrace/sbuf.c similarity index 100% rename from tools/acrntrace/sbuf.c rename to misc/tools/acrntrace/sbuf.c diff --git a/tools/acrntrace/sbuf.h b/misc/tools/acrntrace/sbuf.h similarity index 100% rename from tools/acrntrace/sbuf.h rename to misc/tools/acrntrace/sbuf.h diff --git a/tools/acrntrace/scripts/acrnalyze.py b/misc/tools/acrntrace/scripts/acrnalyze.py similarity index 100% rename from tools/acrntrace/scripts/acrnalyze.py rename to misc/tools/acrntrace/scripts/acrnalyze.py diff --git a/tools/acrntrace/scripts/acrntrace_format.py b/misc/tools/acrntrace/scripts/acrntrace_format.py similarity index 100% rename from tools/acrntrace/scripts/acrntrace_format.py rename to misc/tools/acrntrace/scripts/acrntrace_format.py diff --git a/tools/acrntrace/scripts/formats b/misc/tools/acrntrace/scripts/formats similarity index 100% rename from tools/acrntrace/scripts/formats rename to misc/tools/acrntrace/scripts/formats diff --git a/tools/acrntrace/scripts/irq_analyze.py b/misc/tools/acrntrace/scripts/irq_analyze.py similarity index 100% rename from tools/acrntrace/scripts/irq_analyze.py rename to misc/tools/acrntrace/scripts/irq_analyze.py diff --git a/tools/acrntrace/scripts/vmexit_analyze.py b/misc/tools/acrntrace/scripts/vmexit_analyze.py similarity index 100% rename from tools/acrntrace/scripts/vmexit_analyze.py rename to misc/tools/acrntrace/scripts/vmexit_analyze.py