Commit eaf84fcb authored by Charles Jacobsen's avatar Charles Jacobsen Committed by Vikram Narayanan

Fixed build errors.

parent 93a6c0ea
...@@ -70,7 +70,7 @@ static inline void __lcd_warn(char *file, int lineno, char *fmt, ...) ...@@ -70,7 +70,7 @@ static inline void __lcd_warn(char *file, int lineno, char *fmt, ...)
*/ */
static inline gpa_t lcd_mm_gp_pfn_to_gpa(unsigned long gp_pfn) static inline gpa_t lcd_mm_gp_pfn_to_gpa(unsigned long gp_pfn)
{ {
return __gpa(gp_pfn << PAGE_SHIFT + LCD_GP_MEM_START); return __gpa((gp_pfn << PAGE_SHIFT) + LCD_GP_MEM_START);
} }
/** /**
...@@ -139,6 +139,8 @@ fail1: ...@@ -139,6 +139,8 @@ fail1:
static int lcd_mm_gp_gfp(struct lcd *lcd, hva_t *hva_out, gpa_t *gpa_out) static int lcd_mm_gp_gfp(struct lcd *lcd, hva_t *hva_out, gpa_t *gpa_out)
{ {
hva_t hva; hva_t hva;
hpa_t hpa;
int ret;
/* /*
* Allocate a host physical page * Allocate a host physical page
*/ */
...@@ -177,7 +179,6 @@ fail1: ...@@ -177,7 +179,6 @@ fail1:
static void lcd_mm_gp_dealloc_unmap(struct lcd *lcd, gpa_t gpa, hpa_t *hpa_out) static void lcd_mm_gp_dealloc_unmap(struct lcd *lcd, gpa_t gpa, hpa_t *hpa_out)
{ {
int ret; int ret;
hpa_t hpa;
unsigned long gp_pfn; unsigned long gp_pfn;
/* /*
* Convert the gpa to a "page frame" * Convert the gpa to a "page frame"
...@@ -229,7 +230,6 @@ static void lcd_mm_gp_free_all(struct lcd *lcd) ...@@ -229,7 +230,6 @@ static void lcd_mm_gp_free_all(struct lcd *lcd)
{ {
unsigned long gp_pfn; unsigned long gp_pfn;
gpa_t gpa; gpa_t gpa;
int ret;
gp_pfn = 0; gp_pfn = 0;
...@@ -263,12 +263,10 @@ static void lcd_mm_gp_free_all(struct lcd *lcd) ...@@ -263,12 +263,10 @@ static void lcd_mm_gp_free_all(struct lcd *lcd)
static int lcd_mm_gv_gfp(struct lcd *lcd, gpa_t *gpa_out, hva_t *hva_out) static int lcd_mm_gv_gfp(struct lcd *lcd, gpa_t *gpa_out, hva_t *hva_out)
{ {
int ret; int ret;
gpa_t gpa;
hva_t hva;
/* /*
* Check counter * Check counter
*/ */
if (lcd->gv_paging.counter >= LCD_PAGING_MEM_SIZE) { if (lcd->gv_paging.counter >= LCD_GV_MEM_SIZE) {
LCD_ERR("exhausted guest virtual paging mem"); LCD_ERR("exhausted guest virtual paging mem");
ret = -ENOMEM; ret = -ENOMEM;
goto fail1; goto fail1;
...@@ -276,7 +274,7 @@ static int lcd_mm_gv_gfp(struct lcd *lcd, gpa_t *gpa_out, hva_t *hva_out) ...@@ -276,7 +274,7 @@ static int lcd_mm_gv_gfp(struct lcd *lcd, gpa_t *gpa_out, hva_t *hva_out)
/* /*
* Allocate a host page * Allocate a host page
*/ */
ret = lcd_mm_gp_gfp(lcd, &hva_out, &gpa_out); ret = lcd_mm_gp_gfp(lcd, hva_out, gpa_out);
if (ret) { if (ret) {
LCD_ERR("getting free page"); LCD_ERR("getting free page");
goto fail2; goto fail2;
...@@ -518,7 +516,7 @@ static void lcd_mm_gva_destroy(struct lcd *lcd) ...@@ -518,7 +516,7 @@ static void lcd_mm_gva_destroy(struct lcd *lcd)
/* /*
* Unmap and free root page dir * Unmap and free root page dir
*/ */
lcd_mm_gp_page(lcd, lcd->gv_paging.root_gpa); lcd_mm_gp_free_page(lcd, lcd->gv_paging.root_gpa);
lcd->gv_paging.root = NULL; lcd->gv_paging.root = NULL;
} }
...@@ -1045,7 +1043,7 @@ static int lcd_module_map_page(struct lcd *lcd, hpa_t hpa, hva_t hva) ...@@ -1045,7 +1043,7 @@ static int lcd_module_map_page(struct lcd *lcd, hpa_t hpa, hva_t hva)
/* /*
* Map module page in lcd's ept * Map module page in lcd's ept
*/ */
ret = lcd_mm_gp_alloc_map(lcd->lcd_arch, hpa, &gpa); ret = lcd_mm_gp_alloc_map(lcd, hpa, &gpa);
if (ret) { if (ret) {
LCD_ERR("error mapping into ept"); LCD_ERR("error mapping into ept");
return ret; return ret;
...@@ -1083,11 +1081,7 @@ static int lcd_module_unmap_page(struct lcd *lcd, hpa_t hpa, hva_t hva) ...@@ -1083,11 +1081,7 @@ static int lcd_module_unmap_page(struct lcd *lcd, hpa_t hpa, hva_t hva)
/* /*
* Unmap module page in lcd's ept * Unmap module page in lcd's ept
*/ */
ret = lcd_mm_gp_dealloc_unmap(lcd->lcd_arch, gpa); lcd_mm_gp_dealloc_unmap(lcd, gpa, NULL);
if (ret) {
LCD_ERR("error unmapping gpa in ept");
return ret;
}
return 0; return 0;
} }
...@@ -1114,9 +1108,6 @@ static int lcd_module_unmap_page(struct lcd *lcd, hpa_t hpa, hva_t hva) ...@@ -1114,9 +1108,6 @@ static int lcd_module_unmap_page(struct lcd *lcd, hpa_t hpa, hva_t hva)
static int lcd_setup_module_address_space(struct lcd *lcd) static int lcd_setup_module_address_space(struct lcd *lcd)
{ {
int ret; int ret;
pte_t *pte;
unsigned char bytes[8];
int i;
/* /*
* Map the module's init code * Map the module's init code
*/ */
...@@ -1700,7 +1691,7 @@ static int lcd_setup_initial_thread(struct lcd *lcd) ...@@ -1700,7 +1691,7 @@ static int lcd_setup_initial_thread(struct lcd *lcd)
struct lcd_thread *t = NULL; struct lcd_thread *t = NULL;
hva_t stack_page; hva_t stack_page;
gpa_t stack_page_gpa; gpa_t stack_page_gpa;
gpa_t stack_page_gva; gva_t stack_page_gva;
gpa_t stack_ptr_gpa; gpa_t stack_ptr_gpa;
gva_t stack_ptr_gva; gva_t stack_ptr_gva;
int ret; int ret;
...@@ -1749,7 +1740,7 @@ static int lcd_setup_initial_thread(struct lcd *lcd) ...@@ -1749,7 +1740,7 @@ static int lcd_setup_initial_thread(struct lcd *lcd)
lcd->init_thread = t; lcd->init_thread = t;
return 0; return 0;
fail4: fail3:
lcd_mm_gva_unmap(lcd, stack_page_gva); lcd_mm_gva_unmap(lcd, stack_page_gva);
fail2: fail2:
lcd_mm_gp_free_page(lcd, stack_page_gpa); lcd_mm_gp_free_page(lcd, stack_page_gpa);
......
...@@ -49,7 +49,7 @@ static int test02(void) ...@@ -49,7 +49,7 @@ static int test02(void)
goto fail2; goto fail2;
} }
ret = lcd_mm_alloc_gv_page(lcd, &gpa, &hva); ret = lcd_mm_gv_gfp(lcd, &gpa, &hva);
if (ret) { if (ret) {
LCD_ERR("failed to alloc pg mem"); LCD_ERR("failed to alloc pg mem");
goto fail3; goto fail3;
...@@ -94,8 +94,7 @@ fail6: ...@@ -94,8 +94,7 @@ fail6:
fail5: fail5:
kfree(pmd_entry); kfree(pmd_entry);
fail4: fail4:
free_page(hva_val(hva)); lcd_mm_gp_free_page(lcd, gpa);
lcd_arch_ept_unmap_range(lcd->lcd_arch, gpa, 1);
fail3: fail3:
fail2: fail2:
lcd_destroy(lcd); lcd_destroy(lcd);
...@@ -125,7 +124,7 @@ static int test03(void) ...@@ -125,7 +124,7 @@ static int test03(void)
goto fail2; goto fail2;
} }
ret = lcd_mm_alloc_gv_page(lcd, &gpa, &hva); ret = lcd_mm_gv_gfp(lcd, &gpa, &hva);
if (ret) { if (ret) {
LCD_ERR("failed to alloc pg mem"); LCD_ERR("failed to alloc pg mem");
goto fail3; goto fail3;
...@@ -202,7 +201,7 @@ static int test04(void) ...@@ -202,7 +201,7 @@ static int test04(void)
goto fail2; goto fail2;
} }
ret = lcd_mm_alloc_gv_page(lcd, &gpa, &hva); ret = lcd_mm_gv_gfp(lcd, &gpa, &hva);
if (ret) { if (ret) {
LCD_ERR("failed to alloc pg mem"); LCD_ERR("failed to alloc pg mem");
goto fail3; goto fail3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment