Enhancements to text mode console clients

[palacios.git] / palacios / include / palacios / vmm_multiboot.h

diff --git a/palacios/include/palacios/vmm_multiboot.h b/palacios/include/palacios/vmm_multiboot.h
index f4aaac1..6803e80 100644 (file)
--- a/palacios/include/palacios/vmm_multiboot.h
+++ b/palacios/include/palacios/vmm_multiboot.h
@@ -190,8 +190,10 @@ typedef struct mb_info_cmdline {
 
 
 #define MEM_RAM   1
+#define MEM_RESV  2
 #define MEM_ACPI  3
-#define MEM_RESV  4
+#define MEM_NVS   4
+#define MEM_BAD   6
 
 typedef struct mb_info_memmap_entry {
     uint64_t  base_addr;
@@ -293,8 +295,8 @@ int v3_setup_multiboot_core_for_boot(struct guest_info *core);
 int v3_handle_multiboot_reset(struct guest_info *core);
 
 // The following are utility functions that HVM builds on
-int      v3_parse_multiboot_header(struct v3_cfg_file *file, mb_data_t *result);
-int      v3_write_multiboot_kernel(struct v3_vm_info *vm, mb_data_t *mb, struct v3_cfg_file *file, 
+int      v3_parse_multiboot_header(void *data, uint64_t len, mb_data_t *result);
+int      v3_write_multiboot_kernel(struct v3_vm_info *vm, mb_data_t *mb, void *data, uint64_t len,
                                   void *base, uint64_t limit);
 // The multiboot table is prepared from the perspective of the given
 // core - this allows it to be generated appropriately for ROS and HRT cores