#include <palacios/vmm_debug.h>
#include <palacios/vmm_msr.h>
#include <palacios/vmm_decoder.h>
+#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_mem.h>
+#include <palacios/vmm_hypercall.h>
+
#include <devices/serial.h>
#include <devices/keyboard.h>
#include <devices/ramdisk.h>
#include <devices/cdrom.h>
#include <devices/bochs_debug.h>
+#include <devices/os_debug.h>
+#include <devices/apic.h>
+#include <devices/io_apic.h>
+
#include <palacios/vmm_host_events.h>
#define USE_GENERIC 1
-#define ROMBIOS_START 0x000f0000
-#define VGABIOS_START 0x000c0000
v3_init_host_events(info);
v3_init_decoder(info);
+
+ v3_init_shadow_map(info);
+
+ v3_init_hypercall_map(info);
- init_shadow_map(info);
if (v3_cpu_type == V3_SVM_REV3_CPU) {
info->shdw_pg_mode = NESTED_PAGING;
info->cpu_mode = REAL;
info->mem_mode = PHYSICAL_MEM;
- // Amount of ram the Guest will have
- info->mem_size = config_ptr->mem_size;
+ // Amount of ram the Guest will have, rounded to a 4K page boundary
+ info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
// Configure the memory map for the guest
- setup_memory_map(info, config_ptr);
+ if (setup_memory_map(info, config_ptr) == -1) {
+ PrintError("Setting up guest memory map failed...\n");
+ return -1;
+ }
// Configure the devices for the guest
setup_devices(info, config_ptr);
+
+ if (config_ptr->enable_profiling) {
+ info->enable_profiler = 1;
+ v3_init_profiler(info);
+ } else {
+ info->enable_profiler = 0;
+ }
+
//v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
// Setup initial cpu register state
* We need to make sure the memory map extends to cover it
*/
static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) {
+ addr_t mem_pages = info->mem_size >> 12;
- /* layout rombios */
- {
- uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
- void * guest_mem = V3_AllocPages(num_pages);
-
- PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
- memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
+ PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
- add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
-
- PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n",
- (void *)ROMBIOS_START,
- (void *)ROMBIOS_START + (num_pages * PAGE_SIZE),
- (void *)guest_mem);
+ // Fill up to the 640K hole
+ if (mem_pages >= 160) {
+ if (v3_add_shadow_mem(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)) == -1) {
+ PrintError("Could not map full conventional memory\n");
+ return -1;
+ }
+ } else {
+ // Less than 640k of memory
+ if (v3_add_shadow_mem(info, 0x0, (mem_pages * PAGE_SIZE), (addr_t)V3_AllocPages(mem_pages)) == -1) {
+ PrintError("Could not map subset of conventional memory\n");
+ return -1;
+ };
}
+#define VGABIOS_START 0x000c0000
+#define ROMBIOS_START 0x000f0000
+
+ // VGA frame buffer
+ if (1) {
+ if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) {
+ PrintError("Could not map VGA framebuffer\n");
+ return -1;
+ }
+ } else {
+ v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL);
+ }
+
+
/* layout vgabios */
{
uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
void * guest_mem = V3_AllocPages(num_pages);
+ addr_t vgabios_end = VGABIOS_START + (num_pages * PAGE_SIZE);
PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
- add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
-
+ if (v3_add_shadow_mem(info, VGABIOS_START, vgabios_end, (addr_t)guest_mem) == -1) {
+ PrintError("Could not map VGABIOS\n");
+ return -1;
+ }
+
PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n",
(void *)VGABIOS_START,
- (void *)VGABIOS_START + (num_pages * PAGE_SIZE),
+ (void *)vgabios_end,
(void *)guest_mem);
- }
- //
- add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160));
-
- if (0) {
- add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000);
- } else {
- v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL);
- }
-
- // TEMP
- //add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
-
- if (1) {
- add_shadow_region_passthrough(info, 0xc7000, 0xc8000, (addr_t)V3_AllocPages(1));
- if (add_shadow_region_passthrough(info, 0xc8000, 0xf0000, (addr_t)V3_AllocPages(40)) == -1) {
- PrintDebug("Error adding shadow region\n");
+
+ // Fill in the space between the VGABIOS and the ROMBIOS
+ // We'll just back this to shadow memory for now....
+ if (v3_add_shadow_mem(info, vgabios_end, ROMBIOS_START,
+ (addr_t)V3_AllocPages((ROMBIOS_START - vgabios_end) / PAGE_SIZE)) == -1) {
+ PrintError("Could not map VGABIOS->ROMBIOS gap\n");
+ return -1;
}
- } else {
- add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
- add_shadow_region_passthrough(info, 0xc8000, 0xf0000, 0xc8000);
}
-
-
- if (1) {
- add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
- } else {
- /* MEMORY HOOK TEST */
- add_shadow_region_passthrough(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304));
- v3_hook_write_mem(info, 0xa00000, 0xa01000, (addr_t)V3_AllocPages(1), passthrough_mem_write, NULL);
- add_shadow_region_passthrough(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791));
+
+ /* layout rombios */
+ {
+ uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+ void * guest_mem = V3_AllocPages(num_pages);
+ addr_t rombios_end = ROMBIOS_START + (num_pages * PAGE_SIZE);
+
+ PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
+ memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
+
+ if (v3_add_shadow_mem(info, ROMBIOS_START, rombios_end, (addr_t)guest_mem) == -1) {
+ PrintError("Could not map ROMBIOS\n");
+ return -1;
+ }
+
+ PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n",
+ (void *)ROMBIOS_START,
+ (void *)rombios_end,
+ (void *)guest_mem);
+
+ if (rombios_end != 0x100000) {
+ PrintError("ROMBIOS must reach the 1MB barrier....\n");
+ return -1;
+ }
}
- add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
-
- // test - give linux accesss to PCI space - PAD
- add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000);
-
+
+
+ // Fill in the extended memory map....
+ {
+ int num_ext_pages = mem_pages - (0x100000 / PAGE_SIZE);
+
+ if (num_ext_pages > 0) {
+ if (v3_add_shadow_mem(info, 0x100000, info->mem_size, (addr_t)V3_AllocPages(num_ext_pages)) == -1) {
+ PrintError("Could not allocate extended shadow memory\n");
+ return -1;
+ }
+ }
+ }
- print_shadow_map(&(info->mem_map));
+ print_shadow_map(info);
return 0;
}
struct vm_device * keyboard = v3_create_keyboard();
struct vm_device * pit = v3_create_pit();
struct vm_device * bochs_debug = v3_create_bochs_debug();
+ struct vm_device * os_debug = v3_create_os_debug();
+ struct vm_device * apic = v3_create_apic();
+ struct vm_device * ioapic = v3_create_io_apic(apic);
//struct vm_device * serial = v3_create_serial();
struct vm_device * generic = NULL;
v3_attach_device(info, keyboard);
// v3_attach_device(info, serial);
v3_attach_device(info, bochs_debug);
+ v3_attach_device(info, os_debug);
+
+ v3_attach_device(info, apic);
+ v3_attach_device(info, ioapic);
if (use_ramdisk) {
v3_attach_device(info, ramdisk);