From 446297f96d46b9ea3c7a74fd3bb979bf74dc196d Mon Sep 17 00:00:00 2001 From: Yin Fengwei Date: Tue, 27 Mar 2018 12:40:39 +0800 Subject: [PATCH] DM: sw_load: sw_load function name update To align with file name, acrn_sw_load_direct() is changed to acrn_sw_load_bzimage(). Signed-off-by: Yin Fengwei Acked-by: Anthony Xu --- devicemodel/core/sw_load_bzimage.c | 2 +- devicemodel/core/sw_load_common.c | 2 +- devicemodel/include/sw_load.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devicemodel/core/sw_load_bzimage.c b/devicemodel/core/sw_load_bzimage.c index e2457b0e4..f9d8d7a2c 100644 --- a/devicemodel/core/sw_load_bzimage.c +++ b/devicemodel/core/sw_load_bzimage.c @@ -279,7 +279,7 @@ acrn_prepare_zeropage(struct vmctx *ctx, int setup_size) } int -acrn_sw_load_direct(struct vmctx *ctx) +acrn_sw_load_bzimage(struct vmctx *ctx) { int ret, setup_size; uint64_t *cfg_offset = (uint64_t *)(ctx->baseaddr + GUEST_CFG_OFFSET); diff --git a/devicemodel/core/sw_load_common.c b/devicemodel/core/sw_load_common.c index 9513a6854..be3e83fb1 100644 --- a/devicemodel/core/sw_load_common.c +++ b/devicemodel/core/sw_load_common.c @@ -153,5 +153,5 @@ acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820) int acrn_sw_load(struct vmctx *ctx) { - return acrn_sw_load_direct(ctx); + return acrn_sw_load_bzimage(ctx); } diff --git a/devicemodel/include/sw_load.h b/devicemodel/include/sw_load.h index ecb68587f..f32087e4e 100644 --- a/devicemodel/include/sw_load.h +++ b/devicemodel/include/sw_load.h @@ -71,7 +71,7 @@ void vsbl_set_bdf(int bnum, int snum, int fnum); int check_image(char *path); uint32_t acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820); -int acrn_sw_load_direct(struct vmctx *ctx); +int acrn_sw_load_bzimage(struct vmctx *ctx); int acrn_sw_load_vsbl(struct vmctx *ctx); int acrn_sw_load(struct vmctx *ctx); #endif