github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 20:22:46 +00:00
Code Issues Projects Releases Wiki Activity

acrn-dm: enable debug option for acrn-dm

Browse Source 
enable acrn-dm debug option via RELEASE=0(by default)

Tracked-On: #2939
Reviewed-by: Minggui Cao <minggui.cao@intel.com>
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Wei Liu 2019-04-16 10:59:25 +08:00 committed by wenlingz
parent 2e5a6e28b9
commit 948d58fb9c
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -43,8 +43,8 @@ sbl-hypervisor:
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-up2 BOARD=apl-up2 FIRMWARE=sbl RELEASE=$(RELEASE) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-up2 BOARD=apl-up2 FIRMWARE=sbl RELEASE=$(RELEASE)
devicemodel: tools devicemodel: tools
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) RELEASE=$(RELEASE) clean
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG) DM_ASL_COMPILER=$(ASL_COMPILER) $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG) DM_ASL_COMPILER=$(ASL_COMPILER) RELEASE=$(RELEASE)
tools: tools:
mkdir -p $(TOOLS_OUT) mkdir -p $(TOOLS_OUT)

5
devicemodel/Makefile
View File

@ -9,6 +9,7 @@ DM_BUILD_VERSION ?=
DM_BUILD_TAG ?= DM_BUILD_TAG ?=
CC ?= gcc CC ?= gcc
RELEASE ?= 0
CFLAGS := -g -O0 -std=gnu11 CFLAGS := -g -O0 -std=gnu11
CFLAGS += -D_GNU_SOURCE CFLAGS += -D_GNU_SOURCE
@ -47,6 +48,10 @@ endif
endif endif
endif endif
ifeq ($(RELEASE),0)
CFLAGS += -DDM_DEBUG
endif
LDFLAGS += -Wl,-z,noexecstack LDFLAGS += -Wl,-z,noexecstack
LDFLAGS += -Wl,-z,relro,-z,now LDFLAGS += -Wl,-z,relro,-z,now
LDFLAGS += -pie LDFLAGS += -pie

2
devicemodel/core/main.c
View File

@ -322,12 +322,14 @@ delete_cpu(struct vmctx *ctx, int vcpu)
return CPU_EMPTY(&cpumask); return CPU_EMPTY(&cpumask);
} }
#ifdef DM_DEBUG
void void
notify_vmloop_thread(void) notify_vmloop_thread(void)
{ {
pthread_kill(mt_vmm_info[0].mt_thr, SIGCONT); pthread_kill(mt_vmm_info[0].mt_thr, SIGCONT);
return; return;
} }
#endif
static void static void
vmexit_inout(struct vmctx *ctx, struct vhm_request *vhm_req, int *pvcpu) vmexit_inout(struct vmctx *ctx, struct vhm_request *vhm_req, int *pvcpu)

4
devicemodel/hw/pci/wdt_i6300esb.c
View File

@ -136,9 +136,13 @@ wdt_expired_handler(void *arg, uint64_t nexp)
wdt_timeout = 1; wdt_timeout = 1;
/* watchdog timer out, set the uos to reboot */ /* watchdog timer out, set the uos to reboot */
#ifdef DM_DEBUG
vm_set_suspend_mode(VM_SUSPEND_SYSTEM_RESET); vm_set_suspend_mode(VM_SUSPEND_SYSTEM_RESET);
/* Notify vm thread to handle VM_SUSPEND_SYSTEM_RESET request */ /* Notify vm thread to handle VM_SUSPEND_SYSTEM_RESET request */
notify_vmloop_thread(); notify_vmloop_thread();
#else
vm_set_suspend_mode(VM_SUSPEND_FULL_RESET);
#endif
mevent_notify(); mevent_notify();
} else { } else {
/* if not need reboot, just loop timer */ /* if not need reboot, just loop timer */

2
devicemodel/include/vmmapi.h
View File

@ -101,7 +101,9 @@ int vm_attach_ioreq_client(struct vmctx *ctx);
int vm_notify_request_done(struct vmctx *ctx, int vcpu); int vm_notify_request_done(struct vmctx *ctx, int vcpu);
void vm_clear_ioreq(struct vmctx *ctx); void vm_clear_ioreq(struct vmctx *ctx);
void vm_set_suspend_mode(enum vm_suspend_how how); void vm_set_suspend_mode(enum vm_suspend_how how);
#ifdef DM_DEBUG
void notify_vmloop_thread(void); void notify_vmloop_thread(void);
#endif
int vm_get_suspend_mode(void); int vm_get_suspend_mode(void);
void vm_destroy(struct vmctx *ctx); void vm_destroy(struct vmctx *ctx);
int vm_parse_memsize(const char *optarg, size_t *memsize); int vm_parse_memsize(const char *optarg, size_t *memsize);