DM: sw_load: sw_load function name update

fyin1 · jren1 · commit 446297f96d46 · 2018-05-15T17:19:38.000+08:00
To align with file name, acrn_sw_load_direct() is changed
to acrn_sw_load_bzimage().

Signed-off-by: Yin Fengwei &lt;fengwei.yin@intel.com&gt;
Acked-by: Anthony Xu &lt;anthony.xu@intel.com&gt;
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ acrn_prepare_zeropage(struct vmctx *ctx, int setup_size)`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`int`
`282`		`-acrn_sw_load_direct(struct vmctx *ctx)`
	`282`	`+acrn_sw_load_bzimage(struct vmctx *ctx)`
`283`	`283`	`{`
`284`	`284`	`int ret, setup_size;`
`285`	`285`	`uint64_t cfg_offset = (uint64_t )(ctx->baseaddr + GUEST_CFG_OFFSET);`
Original file line number	Diff line number	Diff line change
`@@ -153,5 +153,5 @@ acrn_create_e820_table(struct vmctx ctx, struct e820_entry e820)`
`153`	`153`	`int`
`154`	`154`	`acrn_sw_load(struct vmctx *ctx)`
`155`	`155`	`{`
`156`		`- return acrn_sw_load_direct(ctx);`
	`156`	`+ return acrn_sw_load_bzimage(ctx);`
`157`	`157`	`}`