From 0ab5db9cf95c4f7a3f21051cb87b698aecf04210 Mon Sep 17 00:00:00 2001 From: "Xie, nanlin" Date: Sat, 23 Jan 2021 06:00:38 +0800 Subject: [PATCH] tools: rename and category content into debug tools and services 1. Rename folder name with "_" 2. Category acrn_crashlog, acrn_log, acrn_trace into debug_tools folder and acrn_bridge, life_mngr, acrn_manager into services. Tracked-On: #5644 Signed-off-by: Xie, nanlin --- misc/Makefile | 34 +++++++++---------- .../acrn_crashlog}/Makefile | 0 .../acrn_crashlog}/README.rst | 0 .../acrn_crashlog}/acrnprobe/Makefile | 0 .../acrn_crashlog}/acrnprobe/README.rst | 0 .../acrn_crashlog}/acrnprobe/android_events.c | 0 .../acrn_crashlog}/acrnprobe/channels.c | 0 .../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 .../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 .../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 .../acrn_crashlog}/acrnprobe/loop.c | 0 .../acrn_crashlog}/acrnprobe/main.c | 0 .../acrn_crashlog}/acrnprobe/probeutils.c | 0 .../acrn_crashlog}/acrnprobe/property.c | 0 .../acrn_crashlog}/acrnprobe/sender.c | 0 .../acrn_crashlog}/acrnprobe/startupreason.c | 0 .../acrn_crashlog}/acrnprobe/vmrecord.c | 0 .../acrn_crashlog}/common/Makefile | 0 .../acrn_crashlog}/common/cmdutils.c | 0 .../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 .../acrn_crashlog}/common/log_sys.c | 0 .../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 .../acrn_crashlog}/data/acrnprobe.xml | 0 .../acrn_crashlog}/data/crashlogctl | 0 .../acrn_crashlog}/data/usercrash-wrapper | 0 .../acrn_crashlog}/data/usercrash.service | 0 .../images/crashlog-workflow.dot | 0 .../acrn_crashlog}/license_header | 0 .../acrn_crashlog}/usercrash/Makefile | 0 .../acrn_crashlog}/usercrash/README.rst | 0 .../acrn_crashlog}/usercrash/client.c | 0 .../acrn_crashlog}/usercrash/crash_dump.c | 0 .../acrn_crashlog}/usercrash/debugger.c | 0 .../usercrash/include/crash_dump.h | 0 .../acrn_crashlog}/usercrash/include/packet.h | 0 .../usercrash/include/protocol.h | 0 .../acrn_crashlog}/usercrash/protocol.c | 0 .../acrn_crashlog}/usercrash/server.c | 0 .../acrnlog => debug_tools/acrn_log}/Makefile | 0 .../acrn_log}/README.rst | 0 .../acrn_log}/acrnlog.c | 0 .../acrn_log}/acrnlog.service | 0 .../acrn_trace}/Makefile | 0 .../acrn_trace}/README.rst | 0 .../acrn_trace}/acrntrace.c | 0 .../acrn_trace}/acrntrace.h | 0 .../acrn_trace}/sbuf.c | 0 .../acrn_trace}/sbuf.h | 0 .../acrn_trace}/scripts/acrnalyze.py | 0 .../acrn_trace}/scripts/acrntrace_format.py | 0 .../acrn_trace}/scripts/formats | 0 .../acrn_trace}/scripts/irq_analyze.py | 0 .../acrn_trace}/scripts/vmexit_analyze.py | 0 .../acrn_bridge}/Makefile | 2 +- .../acrn_bridge}/acrn.netdev | 0 .../acrn_bridge}/acrn.network | 0 .../acrn_bridge}/eth.network | 0 .../acrn_bridge}/tap0.netdev | 0 .../acrn_manager}/Makefile | 22 ++++++------ .../acrn_manager}/README.rst | 0 .../acrn_manager}/acrn_mngr.c | 0 .../acrn_manager}/acrn_mngr.h | 0 .../acrn_manager}/acrn_vm_ops.c | 0 .../acrn_manager}/acrnctl.c | 0 .../acrn_manager}/acrnctl.h | 0 .../acrn_manager}/acrnd.c | 0 .../acrn_manager}/acrnd.service | 0 .../life_mngr/COPYING.MinGW-w64-runtime.txt | 0 misc/{ => services}/life_mngr/Makefile | 0 misc/{ => services}/life_mngr/life_mngr.c | 0 .../life_mngr/life_mngr.service | 0 misc/{ => services}/life_mngr/life_mngr_win.c | 0 misc/{ => services}/life_mngr/s5_trigger.sh | 0 99 files changed, 29 insertions(+), 29 deletions(-) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/Makefile (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/README.rst (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/Makefile (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/README.rst (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/android_events.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/channels.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/conf.rst (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/crash_reclassify.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/event_handler.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/event_queue.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/history.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/images/crash-config.dot (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/images/crash-match.dot (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/android_events.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/channels.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/crash_reclassify.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/event_handler.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/event_queue.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/history.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/load_conf.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/loop.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/probeutils.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/property.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/sender.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/startupreason.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/include/vmrecord.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/load_conf.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/loop.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/main.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/probeutils.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/property.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/sender.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/startupreason.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/acrnprobe/vmrecord.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/Makefile (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/cmdutils.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/fsutils.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/include/cmdutils.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/include/fsutils.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/include/log_sys.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/include/strutils.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/log_sys.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/common/strutils.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/40-watchdog.conf (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/80-coredump.conf (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/acrn-crashlog-dirs.conf (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/acrnprobe.service (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/acrnprobe.xml (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/crashlogctl (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/usercrash-wrapper (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/data/usercrash.service (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/images/crashlog-workflow.dot (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/license_header (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/Makefile (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/README.rst (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/client.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/crash_dump.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/debugger.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/include/crash_dump.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/include/packet.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/include/protocol.h (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/protocol.c (100%) rename misc/{tools/acrn-crashlog => debug_tools/acrn_crashlog}/usercrash/server.c (100%) rename misc/{tools/acrnlog => debug_tools/acrn_log}/Makefile (100%) rename misc/{tools/acrnlog => debug_tools/acrn_log}/README.rst (100%) rename misc/{tools/acrnlog => debug_tools/acrn_log}/acrnlog.c (100%) rename misc/{tools/acrnlog => debug_tools/acrn_log}/acrnlog.service (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/Makefile (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/README.rst (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/acrntrace.c (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/acrntrace.h (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/sbuf.c (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/sbuf.h (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/scripts/acrnalyze.py (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/scripts/acrntrace_format.py (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/scripts/formats (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/scripts/irq_analyze.py (100%) rename misc/{tools/acrntrace => debug_tools/acrn_trace}/scripts/vmexit_analyze.py (100%) rename misc/{acrnbridge => services/acrn_bridge}/Makefile (95%) rename misc/{acrnbridge => services/acrn_bridge}/acrn.netdev (100%) rename misc/{acrnbridge => services/acrn_bridge}/acrn.network (100%) rename misc/{acrnbridge => services/acrn_bridge}/eth.network (100%) rename misc/{acrnbridge => services/acrn_bridge}/tap0.netdev (100%) rename misc/{acrn-manager => services/acrn_manager}/Makefile (83%) rename misc/{acrn-manager => services/acrn_manager}/README.rst (100%) rename misc/{acrn-manager => services/acrn_manager}/acrn_mngr.c (100%) rename misc/{acrn-manager => services/acrn_manager}/acrn_mngr.h (100%) rename misc/{acrn-manager => services/acrn_manager}/acrn_vm_ops.c (100%) rename misc/{acrn-manager => services/acrn_manager}/acrnctl.c (100%) rename misc/{acrn-manager => services/acrn_manager}/acrnctl.h (100%) rename misc/{acrn-manager => services/acrn_manager}/acrnd.c (100%) rename misc/{acrn-manager => services/acrn_manager}/acrnd.service (100%) rename misc/{ => services}/life_mngr/COPYING.MinGW-w64-runtime.txt (100%) rename misc/{ => services}/life_mngr/Makefile (100%) rename misc/{ => services}/life_mngr/life_mngr.c (100%) rename misc/{ => services}/life_mngr/life_mngr.service (100%) rename misc/{ => services}/life_mngr/life_mngr_win.c (100%) rename misc/{ => services}/life_mngr/s5_trigger.sh (100%) diff --git a/misc/Makefile b/misc/Makefile index 1a510ad35..8b2a703a6 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -10,30 +10,30 @@ all: acrn-manager acrnbridge life_mngr endif acrn-crashlog: - $(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) + $(MAKE) -C $(T)/debug_tools/acrn_crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) acrnlog: - $(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) + $(MAKE) -C $(T)/debug_tools/acrn_log OUT_DIR=$(OUT_DIR) acrn-manager: - $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) + $(MAKE) -C $(T)/services/acrn_manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) acrntrace: - $(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) + $(MAKE) -C $(T)/debug_tools/acrn_trace OUT_DIR=$(OUT_DIR) acrnbridge: - $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) + $(MAKE) -C $(T)/services/acrn_bridge OUT_DIR=$(OUT_DIR) life_mngr: - $(MAKE) -C $(T)/life_mngr OUT_DIR=$(OUT_DIR) + $(MAKE) -C $(T)/services/life_mngr OUT_DIR=$(OUT_DIR) .PHONY: clean 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)/tools/acrntrace OUT_DIR=$(OUT_DIR) clean - $(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) clean - $(MAKE) -C $(T)/life_mngr OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/debug_tools/acrn_crashlog OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/services/acrn_manager OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/debug_tools/acrn_trace OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/debug_tools/acrn_log OUT_DIR=$(OUT_DIR) clean + $(MAKE) -C $(T)/services/life_mngr OUT_DIR=$(OUT_DIR) clean rm -rf $(OUT_DIR) .PHONY: install @@ -45,19 +45,19 @@ install: acrn-manager-install acrnbridge-install acrn-life-mngr-install endif acrn-crashlog-install: - $(MAKE) -C $(T)/tools/acrn-crashlog OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/debug_tools/acrn_crashlog OUT_DIR=$(OUT_DIR) install acrnlog-install: - $(MAKE) -C $(T)/tools/acrnlog OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/debug_tools/acrn_log OUT_DIR=$(OUT_DIR) install acrn-manager-install: - $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/services/acrn_manager OUT_DIR=$(OUT_DIR) install acrntrace-install: - $(MAKE) -C $(T)/tools/acrntrace OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/debug_tools/acrn_trace OUT_DIR=$(OUT_DIR) install acrnbridge-install: - $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/services/acrn_bridge OUT_DIR=$(OUT_DIR) install acrn-life-mngr-install: - $(MAKE) -C $(T)/life_mngr OUT_DIR=$(OUT_DIR) install + $(MAKE) -C $(T)/services/life_mngr OUT_DIR=$(OUT_DIR) install diff --git a/misc/tools/acrn-crashlog/Makefile b/misc/debug_tools/acrn_crashlog/Makefile similarity index 100% rename from misc/tools/acrn-crashlog/Makefile rename to misc/debug_tools/acrn_crashlog/Makefile diff --git a/misc/tools/acrn-crashlog/README.rst b/misc/debug_tools/acrn_crashlog/README.rst similarity index 100% rename from misc/tools/acrn-crashlog/README.rst rename to misc/debug_tools/acrn_crashlog/README.rst diff --git a/misc/tools/acrn-crashlog/acrnprobe/Makefile b/misc/debug_tools/acrn_crashlog/acrnprobe/Makefile similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/Makefile rename to misc/debug_tools/acrn_crashlog/acrnprobe/Makefile diff --git a/misc/tools/acrn-crashlog/acrnprobe/README.rst b/misc/debug_tools/acrn_crashlog/acrnprobe/README.rst similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/README.rst rename to misc/debug_tools/acrn_crashlog/acrnprobe/README.rst diff --git a/misc/tools/acrn-crashlog/acrnprobe/android_events.c b/misc/debug_tools/acrn_crashlog/acrnprobe/android_events.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/android_events.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/android_events.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/channels.c b/misc/debug_tools/acrn_crashlog/acrnprobe/channels.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/channels.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/channels.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/conf.rst b/misc/debug_tools/acrn_crashlog/acrnprobe/conf.rst similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/conf.rst rename to misc/debug_tools/acrn_crashlog/acrnprobe/conf.rst diff --git a/misc/tools/acrn-crashlog/acrnprobe/crash_reclassify.c b/misc/debug_tools/acrn_crashlog/acrnprobe/crash_reclassify.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/crash_reclassify.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/crash_reclassify.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/event_handler.c b/misc/debug_tools/acrn_crashlog/acrnprobe/event_handler.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/event_handler.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/event_handler.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/event_queue.c b/misc/debug_tools/acrn_crashlog/acrnprobe/event_queue.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/event_queue.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/event_queue.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/history.c b/misc/debug_tools/acrn_crashlog/acrnprobe/history.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/history.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/history.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/images/crash-config.dot b/misc/debug_tools/acrn_crashlog/acrnprobe/images/crash-config.dot similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/images/crash-config.dot rename to misc/debug_tools/acrn_crashlog/acrnprobe/images/crash-config.dot diff --git a/misc/tools/acrn-crashlog/acrnprobe/images/crash-match.dot b/misc/debug_tools/acrn_crashlog/acrnprobe/images/crash-match.dot similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/images/crash-match.dot rename to misc/debug_tools/acrn_crashlog/acrnprobe/images/crash-match.dot diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/android_events.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/android_events.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/android_events.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/android_events.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/channels.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/channels.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/channels.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/channels.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/crash_reclassify.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/crash_reclassify.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/crash_reclassify.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/crash_reclassify.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/event_handler.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/event_handler.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/event_handler.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/event_handler.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/event_queue.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/event_queue.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/event_queue.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/event_queue.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/history.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/history.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/history.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/history.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/load_conf.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/load_conf.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/load_conf.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/load_conf.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/loop.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/loop.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/loop.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/loop.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/probeutils.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/probeutils.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/probeutils.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/probeutils.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/property.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/property.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/property.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/property.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/sender.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/sender.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/sender.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/sender.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/startupreason.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/startupreason.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/startupreason.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/startupreason.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/include/vmrecord.h b/misc/debug_tools/acrn_crashlog/acrnprobe/include/vmrecord.h similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/include/vmrecord.h rename to misc/debug_tools/acrn_crashlog/acrnprobe/include/vmrecord.h diff --git a/misc/tools/acrn-crashlog/acrnprobe/load_conf.c b/misc/debug_tools/acrn_crashlog/acrnprobe/load_conf.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/load_conf.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/load_conf.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/loop.c b/misc/debug_tools/acrn_crashlog/acrnprobe/loop.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/loop.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/loop.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/main.c b/misc/debug_tools/acrn_crashlog/acrnprobe/main.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/main.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/main.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/probeutils.c b/misc/debug_tools/acrn_crashlog/acrnprobe/probeutils.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/probeutils.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/probeutils.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/property.c b/misc/debug_tools/acrn_crashlog/acrnprobe/property.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/property.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/property.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/sender.c b/misc/debug_tools/acrn_crashlog/acrnprobe/sender.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/sender.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/sender.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/startupreason.c b/misc/debug_tools/acrn_crashlog/acrnprobe/startupreason.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/startupreason.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/startupreason.c diff --git a/misc/tools/acrn-crashlog/acrnprobe/vmrecord.c b/misc/debug_tools/acrn_crashlog/acrnprobe/vmrecord.c similarity index 100% rename from misc/tools/acrn-crashlog/acrnprobe/vmrecord.c rename to misc/debug_tools/acrn_crashlog/acrnprobe/vmrecord.c diff --git a/misc/tools/acrn-crashlog/common/Makefile b/misc/debug_tools/acrn_crashlog/common/Makefile similarity index 100% rename from misc/tools/acrn-crashlog/common/Makefile rename to misc/debug_tools/acrn_crashlog/common/Makefile diff --git a/misc/tools/acrn-crashlog/common/cmdutils.c b/misc/debug_tools/acrn_crashlog/common/cmdutils.c similarity index 100% rename from misc/tools/acrn-crashlog/common/cmdutils.c rename to misc/debug_tools/acrn_crashlog/common/cmdutils.c diff --git a/misc/tools/acrn-crashlog/common/fsutils.c b/misc/debug_tools/acrn_crashlog/common/fsutils.c similarity index 100% rename from misc/tools/acrn-crashlog/common/fsutils.c rename to misc/debug_tools/acrn_crashlog/common/fsutils.c diff --git a/misc/tools/acrn-crashlog/common/include/cmdutils.h b/misc/debug_tools/acrn_crashlog/common/include/cmdutils.h similarity index 100% rename from misc/tools/acrn-crashlog/common/include/cmdutils.h rename to misc/debug_tools/acrn_crashlog/common/include/cmdutils.h diff --git a/misc/tools/acrn-crashlog/common/include/fsutils.h b/misc/debug_tools/acrn_crashlog/common/include/fsutils.h similarity index 100% rename from misc/tools/acrn-crashlog/common/include/fsutils.h rename to misc/debug_tools/acrn_crashlog/common/include/fsutils.h diff --git a/misc/tools/acrn-crashlog/common/include/log_sys.h b/misc/debug_tools/acrn_crashlog/common/include/log_sys.h similarity index 100% rename from misc/tools/acrn-crashlog/common/include/log_sys.h rename to misc/debug_tools/acrn_crashlog/common/include/log_sys.h diff --git a/misc/tools/acrn-crashlog/common/include/strutils.h b/misc/debug_tools/acrn_crashlog/common/include/strutils.h similarity index 100% rename from misc/tools/acrn-crashlog/common/include/strutils.h rename to misc/debug_tools/acrn_crashlog/common/include/strutils.h diff --git a/misc/tools/acrn-crashlog/common/log_sys.c b/misc/debug_tools/acrn_crashlog/common/log_sys.c similarity index 100% rename from misc/tools/acrn-crashlog/common/log_sys.c rename to misc/debug_tools/acrn_crashlog/common/log_sys.c diff --git a/misc/tools/acrn-crashlog/common/strutils.c b/misc/debug_tools/acrn_crashlog/common/strutils.c similarity index 100% rename from misc/tools/acrn-crashlog/common/strutils.c rename to misc/debug_tools/acrn_crashlog/common/strutils.c diff --git a/misc/tools/acrn-crashlog/data/40-watchdog.conf b/misc/debug_tools/acrn_crashlog/data/40-watchdog.conf similarity index 100% rename from misc/tools/acrn-crashlog/data/40-watchdog.conf rename to misc/debug_tools/acrn_crashlog/data/40-watchdog.conf diff --git a/misc/tools/acrn-crashlog/data/80-coredump.conf b/misc/debug_tools/acrn_crashlog/data/80-coredump.conf similarity index 100% rename from misc/tools/acrn-crashlog/data/80-coredump.conf rename to misc/debug_tools/acrn_crashlog/data/80-coredump.conf diff --git a/misc/tools/acrn-crashlog/data/acrn-crashlog-dirs.conf b/misc/debug_tools/acrn_crashlog/data/acrn-crashlog-dirs.conf similarity index 100% rename from misc/tools/acrn-crashlog/data/acrn-crashlog-dirs.conf rename to misc/debug_tools/acrn_crashlog/data/acrn-crashlog-dirs.conf diff --git a/misc/tools/acrn-crashlog/data/acrnprobe.service b/misc/debug_tools/acrn_crashlog/data/acrnprobe.service similarity index 100% rename from misc/tools/acrn-crashlog/data/acrnprobe.service rename to misc/debug_tools/acrn_crashlog/data/acrnprobe.service diff --git a/misc/tools/acrn-crashlog/data/acrnprobe.xml b/misc/debug_tools/acrn_crashlog/data/acrnprobe.xml similarity index 100% rename from misc/tools/acrn-crashlog/data/acrnprobe.xml rename to misc/debug_tools/acrn_crashlog/data/acrnprobe.xml diff --git a/misc/tools/acrn-crashlog/data/crashlogctl b/misc/debug_tools/acrn_crashlog/data/crashlogctl similarity index 100% rename from misc/tools/acrn-crashlog/data/crashlogctl rename to misc/debug_tools/acrn_crashlog/data/crashlogctl diff --git a/misc/tools/acrn-crashlog/data/usercrash-wrapper b/misc/debug_tools/acrn_crashlog/data/usercrash-wrapper similarity index 100% rename from misc/tools/acrn-crashlog/data/usercrash-wrapper rename to misc/debug_tools/acrn_crashlog/data/usercrash-wrapper diff --git a/misc/tools/acrn-crashlog/data/usercrash.service b/misc/debug_tools/acrn_crashlog/data/usercrash.service similarity index 100% rename from misc/tools/acrn-crashlog/data/usercrash.service rename to misc/debug_tools/acrn_crashlog/data/usercrash.service diff --git a/misc/tools/acrn-crashlog/images/crashlog-workflow.dot b/misc/debug_tools/acrn_crashlog/images/crashlog-workflow.dot similarity index 100% rename from misc/tools/acrn-crashlog/images/crashlog-workflow.dot rename to misc/debug_tools/acrn_crashlog/images/crashlog-workflow.dot diff --git a/misc/tools/acrn-crashlog/license_header b/misc/debug_tools/acrn_crashlog/license_header similarity index 100% rename from misc/tools/acrn-crashlog/license_header rename to misc/debug_tools/acrn_crashlog/license_header diff --git a/misc/tools/acrn-crashlog/usercrash/Makefile b/misc/debug_tools/acrn_crashlog/usercrash/Makefile similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/Makefile rename to misc/debug_tools/acrn_crashlog/usercrash/Makefile diff --git a/misc/tools/acrn-crashlog/usercrash/README.rst b/misc/debug_tools/acrn_crashlog/usercrash/README.rst similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/README.rst rename to misc/debug_tools/acrn_crashlog/usercrash/README.rst diff --git a/misc/tools/acrn-crashlog/usercrash/client.c b/misc/debug_tools/acrn_crashlog/usercrash/client.c similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/client.c rename to misc/debug_tools/acrn_crashlog/usercrash/client.c diff --git a/misc/tools/acrn-crashlog/usercrash/crash_dump.c b/misc/debug_tools/acrn_crashlog/usercrash/crash_dump.c similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/crash_dump.c rename to misc/debug_tools/acrn_crashlog/usercrash/crash_dump.c diff --git a/misc/tools/acrn-crashlog/usercrash/debugger.c b/misc/debug_tools/acrn_crashlog/usercrash/debugger.c similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/debugger.c rename to misc/debug_tools/acrn_crashlog/usercrash/debugger.c diff --git a/misc/tools/acrn-crashlog/usercrash/include/crash_dump.h b/misc/debug_tools/acrn_crashlog/usercrash/include/crash_dump.h similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/include/crash_dump.h rename to misc/debug_tools/acrn_crashlog/usercrash/include/crash_dump.h diff --git a/misc/tools/acrn-crashlog/usercrash/include/packet.h b/misc/debug_tools/acrn_crashlog/usercrash/include/packet.h similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/include/packet.h rename to misc/debug_tools/acrn_crashlog/usercrash/include/packet.h diff --git a/misc/tools/acrn-crashlog/usercrash/include/protocol.h b/misc/debug_tools/acrn_crashlog/usercrash/include/protocol.h similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/include/protocol.h rename to misc/debug_tools/acrn_crashlog/usercrash/include/protocol.h diff --git a/misc/tools/acrn-crashlog/usercrash/protocol.c b/misc/debug_tools/acrn_crashlog/usercrash/protocol.c similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/protocol.c rename to misc/debug_tools/acrn_crashlog/usercrash/protocol.c diff --git a/misc/tools/acrn-crashlog/usercrash/server.c b/misc/debug_tools/acrn_crashlog/usercrash/server.c similarity index 100% rename from misc/tools/acrn-crashlog/usercrash/server.c rename to misc/debug_tools/acrn_crashlog/usercrash/server.c diff --git a/misc/tools/acrnlog/Makefile b/misc/debug_tools/acrn_log/Makefile similarity index 100% rename from misc/tools/acrnlog/Makefile rename to misc/debug_tools/acrn_log/Makefile diff --git a/misc/tools/acrnlog/README.rst b/misc/debug_tools/acrn_log/README.rst similarity index 100% rename from misc/tools/acrnlog/README.rst rename to misc/debug_tools/acrn_log/README.rst diff --git a/misc/tools/acrnlog/acrnlog.c b/misc/debug_tools/acrn_log/acrnlog.c similarity index 100% rename from misc/tools/acrnlog/acrnlog.c rename to misc/debug_tools/acrn_log/acrnlog.c diff --git a/misc/tools/acrnlog/acrnlog.service b/misc/debug_tools/acrn_log/acrnlog.service similarity index 100% rename from misc/tools/acrnlog/acrnlog.service rename to misc/debug_tools/acrn_log/acrnlog.service diff --git a/misc/tools/acrntrace/Makefile b/misc/debug_tools/acrn_trace/Makefile similarity index 100% rename from misc/tools/acrntrace/Makefile rename to misc/debug_tools/acrn_trace/Makefile diff --git a/misc/tools/acrntrace/README.rst b/misc/debug_tools/acrn_trace/README.rst similarity index 100% rename from misc/tools/acrntrace/README.rst rename to misc/debug_tools/acrn_trace/README.rst diff --git a/misc/tools/acrntrace/acrntrace.c b/misc/debug_tools/acrn_trace/acrntrace.c similarity index 100% rename from misc/tools/acrntrace/acrntrace.c rename to misc/debug_tools/acrn_trace/acrntrace.c diff --git a/misc/tools/acrntrace/acrntrace.h b/misc/debug_tools/acrn_trace/acrntrace.h similarity index 100% rename from misc/tools/acrntrace/acrntrace.h rename to misc/debug_tools/acrn_trace/acrntrace.h diff --git a/misc/tools/acrntrace/sbuf.c b/misc/debug_tools/acrn_trace/sbuf.c similarity index 100% rename from misc/tools/acrntrace/sbuf.c rename to misc/debug_tools/acrn_trace/sbuf.c diff --git a/misc/tools/acrntrace/sbuf.h b/misc/debug_tools/acrn_trace/sbuf.h similarity index 100% rename from misc/tools/acrntrace/sbuf.h rename to misc/debug_tools/acrn_trace/sbuf.h diff --git a/misc/tools/acrntrace/scripts/acrnalyze.py b/misc/debug_tools/acrn_trace/scripts/acrnalyze.py similarity index 100% rename from misc/tools/acrntrace/scripts/acrnalyze.py rename to misc/debug_tools/acrn_trace/scripts/acrnalyze.py diff --git a/misc/tools/acrntrace/scripts/acrntrace_format.py b/misc/debug_tools/acrn_trace/scripts/acrntrace_format.py similarity index 100% rename from misc/tools/acrntrace/scripts/acrntrace_format.py rename to misc/debug_tools/acrn_trace/scripts/acrntrace_format.py diff --git a/misc/tools/acrntrace/scripts/formats b/misc/debug_tools/acrn_trace/scripts/formats similarity index 100% rename from misc/tools/acrntrace/scripts/formats rename to misc/debug_tools/acrn_trace/scripts/formats diff --git a/misc/tools/acrntrace/scripts/irq_analyze.py b/misc/debug_tools/acrn_trace/scripts/irq_analyze.py similarity index 100% rename from misc/tools/acrntrace/scripts/irq_analyze.py rename to misc/debug_tools/acrn_trace/scripts/irq_analyze.py diff --git a/misc/tools/acrntrace/scripts/vmexit_analyze.py b/misc/debug_tools/acrn_trace/scripts/vmexit_analyze.py similarity index 100% rename from misc/tools/acrntrace/scripts/vmexit_analyze.py rename to misc/debug_tools/acrn_trace/scripts/vmexit_analyze.py diff --git a/misc/acrnbridge/Makefile b/misc/services/acrn_bridge/Makefile similarity index 95% rename from misc/acrnbridge/Makefile rename to misc/services/acrn_bridge/Makefile index 32b6f0b72..6aeabd9fb 100644 --- a/misc/acrnbridge/Makefile +++ b/misc/services/acrn_bridge/Makefile @@ -1,4 +1,4 @@ -include ../../paths.make +include ../../../paths.make OUT_DIR ?= . diff --git a/misc/acrnbridge/acrn.netdev b/misc/services/acrn_bridge/acrn.netdev similarity index 100% rename from misc/acrnbridge/acrn.netdev rename to misc/services/acrn_bridge/acrn.netdev diff --git a/misc/acrnbridge/acrn.network b/misc/services/acrn_bridge/acrn.network similarity index 100% rename from misc/acrnbridge/acrn.network rename to misc/services/acrn_bridge/acrn.network diff --git a/misc/acrnbridge/eth.network b/misc/services/acrn_bridge/eth.network similarity index 100% rename from misc/acrnbridge/eth.network rename to misc/services/acrn_bridge/eth.network diff --git a/misc/acrnbridge/tap0.netdev b/misc/services/acrn_bridge/tap0.netdev similarity index 100% rename from misc/acrnbridge/tap0.netdev rename to misc/services/acrn_bridge/tap0.netdev diff --git a/misc/acrn-manager/Makefile b/misc/services/acrn_manager/Makefile similarity index 83% rename from misc/acrn-manager/Makefile rename to misc/services/acrn_manager/Makefile index de70c7b01..92a23b58e 100644 --- a/misc/acrn-manager/Makefile +++ b/misc/services/acrn_manager/Makefile @@ -1,4 +1,4 @@ -include ../../paths.make +include ../../../paths.make T := $(CURDIR) OUT_DIR ?= $(shell mkdir -p $(T)/build;cd $(T)/build;pwd) @@ -20,17 +20,17 @@ MANAGER_CFLAGS += -Wno-format-truncation -Wno-unused-result MANAGER_CFLAGS += -Wno-stringop-truncation MANAGER_CFLAGS += $(CFLAGS) -MANAGER_CFLAGS += -I../../devicemodel/include -MANAGER_CFLAGS += -I../../devicemodel/include/public -MANAGER_CFLAGS += -I../../hypervisor/include +MANAGER_CFLAGS += -I../../../devicemodel/include +MANAGER_CFLAGS += -I../../../devicemodel/include/public +MANAGER_CFLAGS += -I../../../hypervisor/include -MANAGER_HEADERS := ../../devicemodel/include/dm.h -MANAGER_HEADERS += ../../devicemodel/include/types.h -MANAGER_HEADERS += ../../devicemodel/include/vmm.h -MANAGER_HEADERS += ../../devicemodel/include/dm_string.h -MANAGER_HEADERS += ../../devicemodel/include/macros.h -MANAGER_HEADERS += ../../devicemodel/include/public/vhm_ioctl_defs.h -MANAGER_HEADERS += ../../devicemodel/include/public/acrn_common.h +MANAGER_HEADERS := ../../../devicemodel/include/dm.h +MANAGER_HEADERS += ../../../devicemodel/include/types.h +MANAGER_HEADERS += ../../../devicemodel/include/vmm.h +MANAGER_HEADERS += ../../../devicemodel/include/dm_string.h +MANAGER_HEADERS += ../../../devicemodel/include/macros.h +MANAGER_HEADERS += ../../../devicemodel/include/public/vhm_ioctl_defs.h +MANAGER_HEADERS += ../../../devicemodel/include/public/acrn_common.h GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1) GCC_MINOR=$(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1) diff --git a/misc/acrn-manager/README.rst b/misc/services/acrn_manager/README.rst similarity index 100% rename from misc/acrn-manager/README.rst rename to misc/services/acrn_manager/README.rst diff --git a/misc/acrn-manager/acrn_mngr.c b/misc/services/acrn_manager/acrn_mngr.c similarity index 100% rename from misc/acrn-manager/acrn_mngr.c rename to misc/services/acrn_manager/acrn_mngr.c diff --git a/misc/acrn-manager/acrn_mngr.h b/misc/services/acrn_manager/acrn_mngr.h similarity index 100% rename from misc/acrn-manager/acrn_mngr.h rename to misc/services/acrn_manager/acrn_mngr.h diff --git a/misc/acrn-manager/acrn_vm_ops.c b/misc/services/acrn_manager/acrn_vm_ops.c similarity index 100% rename from misc/acrn-manager/acrn_vm_ops.c rename to misc/services/acrn_manager/acrn_vm_ops.c diff --git a/misc/acrn-manager/acrnctl.c b/misc/services/acrn_manager/acrnctl.c similarity index 100% rename from misc/acrn-manager/acrnctl.c rename to misc/services/acrn_manager/acrnctl.c diff --git a/misc/acrn-manager/acrnctl.h b/misc/services/acrn_manager/acrnctl.h similarity index 100% rename from misc/acrn-manager/acrnctl.h rename to misc/services/acrn_manager/acrnctl.h diff --git a/misc/acrn-manager/acrnd.c b/misc/services/acrn_manager/acrnd.c similarity index 100% rename from misc/acrn-manager/acrnd.c rename to misc/services/acrn_manager/acrnd.c diff --git a/misc/acrn-manager/acrnd.service b/misc/services/acrn_manager/acrnd.service similarity index 100% rename from misc/acrn-manager/acrnd.service rename to misc/services/acrn_manager/acrnd.service diff --git a/misc/life_mngr/COPYING.MinGW-w64-runtime.txt b/misc/services/life_mngr/COPYING.MinGW-w64-runtime.txt similarity index 100% rename from misc/life_mngr/COPYING.MinGW-w64-runtime.txt rename to misc/services/life_mngr/COPYING.MinGW-w64-runtime.txt diff --git a/misc/life_mngr/Makefile b/misc/services/life_mngr/Makefile similarity index 100% rename from misc/life_mngr/Makefile rename to misc/services/life_mngr/Makefile diff --git a/misc/life_mngr/life_mngr.c b/misc/services/life_mngr/life_mngr.c similarity index 100% rename from misc/life_mngr/life_mngr.c rename to misc/services/life_mngr/life_mngr.c diff --git a/misc/life_mngr/life_mngr.service b/misc/services/life_mngr/life_mngr.service similarity index 100% rename from misc/life_mngr/life_mngr.service rename to misc/services/life_mngr/life_mngr.service diff --git a/misc/life_mngr/life_mngr_win.c b/misc/services/life_mngr/life_mngr_win.c similarity index 100% rename from misc/life_mngr/life_mngr_win.c rename to misc/services/life_mngr/life_mngr_win.c diff --git a/misc/life_mngr/s5_trigger.sh b/misc/services/life_mngr/s5_trigger.sh similarity index 100% rename from misc/life_mngr/s5_trigger.sh rename to misc/services/life_mngr/s5_trigger.sh