-/*
+ /*
* This file is part of the Palacios Virtual Machine Monitor developed
* by the V3VEE Project with funding from the United States National
* Science Foundation and the Department of Energy.
#include <devices/generic.h>
#include <devices/ide.h>
#include <devices/ram_cd.h>
+#include <devices/net_cd.h>
#include <devices/ram_hd.h>
+#include <devices/net_hd.h>
#include <devices/bochs_debug.h>
#include <devices/os_debug.h>
#include <devices/apic.h>
#define USE_GENERIC 1
-
+#include <palacios/vmm_socket.h>
static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr);
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr);
static struct vm_device * configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
}
-
-int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
- extern v3_cpu_arch_t v3_cpu_type;
+int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+ extern v3_cpu_arch_t v3_cpu_type;
// Amount of ram the Guest will have, rounded to a 4K page boundary
info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
// Initialize the memory map
v3_init_shadow_map(info);
-
if ((v3_cpu_type == V3_SVM_REV3_CPU) &&
(config_ptr->enable_nested_paging == 1)) {
PrintDebug("Guest Page Mode: NESTED_PAGING\n");
v3_init_shadow_page_state(info);
info->shdw_pg_mode = SHADOW_PAGING;
}
+
+ if (config_ptr->enable_profiling) {
+ info->enable_profiler = 1;
+ v3_init_profiler(info);
+ } else {
+ info->enable_profiler = 0;
+ }
+
// Initial CPU operating mode
info->cpu_mode = REAL;
info->mem_mode = PHYSICAL_MEM;
-
+
+ return 0;
+}
+
+
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
// Configure the memory map for the guest
if (setup_memory_map(info, config_ptr) == -1) {
PrintError("Setting up guest memory map failed...\n");
return -1;
}
-
- 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
- info->rip = 0xfff0;
- info->vm_regs.rsp = 0x0;
-
+ if (setup_devices(info, config_ptr) == -1) {
+ PrintError("Failed to setup devices\n");
+ return -1;
+ }
+
+ info->run_state = VM_STOPPED;
+
+ info->vm_regs.rdi = 0;
+ info->vm_regs.rsi = 0;
+ info->vm_regs.rbp = 0;
+ info->vm_regs.rsp = 0;
+ info->vm_regs.rbx = 0;
+ info->vm_regs.rdx = 0;
+ info->vm_regs.rcx = 0;
+ info->vm_regs.rax = 0;
+
return 0;
}
-int v3_config_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
struct vm_device * ide = NULL;
- struct vm_device * ramdisk = NULL;
+ struct vm_device * primary_disk = NULL;
+ struct vm_device * secondary_disk = NULL;
struct vm_device * pci = NULL;
struct vm_device * northbridge = NULL;
ide = v3_create_ide(NULL, NULL);
}
-
-
nvram = v3_create_nvram(ide);
- if (config_ptr->use_ram_cd == 1) {
- PrintDebug("Creating Ram CD\n");
- ramdisk = v3_create_ram_cd(ide, 0, 0,
- (addr_t)(config_ptr->ramdisk),
- config_ptr->ramdisk_size);
- } else if (config_ptr->use_ram_hd == 1) {
- PrintDebug("Creating Ram HD\n");
- ramdisk = v3_create_ram_hd(ide, 0, 0,
- (addr_t)(config_ptr->ramdisk),
- config_ptr->ramdisk_size);
+ if (config_ptr->pri_disk_type != NONE) {
+ if (config_ptr->pri_disk_type == CDROM) {
+ if (config_ptr->pri_disk_con == RAM) {
+ PrintDebug("Creating RAM CD\n");
+ primary_disk = v3_create_ram_cd(ide, 0, 0,
+ (addr_t)(config_ptr->pri_disk_info.ram.data_ptr),
+ config_ptr->pri_disk_info.ram.size);
+ } else if (config_ptr->pri_disk_con == NETWORK) {
+ PrintDebug("Creating NET CD\n");
+ primary_disk = v3_create_net_cd(ide, 0, 0,
+ config_ptr->pri_disk_info.net.ip_str,
+ config_ptr->pri_disk_info.net.port,
+ config_ptr->pri_disk_info.net.disk_name);
+ }
+ } else if (config_ptr->pri_disk_type == HARDDRIVE) {
+ if (config_ptr->pri_disk_con == RAM) {
+ PrintDebug("Creating RAM HD\n");
+ primary_disk = v3_create_ram_hd(ide, 0, 0,
+ (addr_t)(config_ptr->pri_disk_info.ram.data_ptr),
+ config_ptr->pri_disk_info.ram.size);
+ } else if (config_ptr->pri_disk_con == NETWORK) {
+ PrintDebug("Creating NET HD\n");
+ primary_disk = v3_create_net_hd(ide, 0, 0,
+ config_ptr->pri_disk_info.net.ip_str,
+ config_ptr->pri_disk_info.net.port,
+ config_ptr->pri_disk_info.net.disk_name);
+ }
+ }
}
-
-
- if (use_generic) {
- generic = configure_generic(info, config_ptr);
+
+
+
+ if (config_ptr->sec_disk_type != NONE) {
+ if (config_ptr->sec_disk_type == CDROM) {
+ if (config_ptr->sec_disk_con == RAM) {
+ PrintDebug("Creating RAM CD\n");
+ secondary_disk = v3_create_ram_cd(ide, 0, 1,
+ (addr_t)(config_ptr->sec_disk_info.ram.data_ptr),
+ config_ptr->sec_disk_info.ram.size);
+ } else if (config_ptr->sec_disk_con == NETWORK) {
+ PrintDebug("Creating NET CD\n");
+ secondary_disk = v3_create_net_cd(ide, 0, 1,
+ config_ptr->sec_disk_info.net.ip_str,
+ config_ptr->sec_disk_info.net.port,
+ config_ptr->sec_disk_info.net.disk_name);
+ }
+ } else if (config_ptr->sec_disk_type == HARDDRIVE) {
+ if (config_ptr->sec_disk_con == RAM) {
+ PrintDebug("Creating RAM HD\n");
+ secondary_disk = v3_create_ram_hd(ide, 0, 1,
+ (addr_t)(config_ptr->sec_disk_info.ram.data_ptr),
+ config_ptr->sec_disk_info.ram.size);
+ } else if (config_ptr->sec_disk_con == NETWORK) {
+ PrintDebug("Creating NET HD\n");
+ secondary_disk = v3_create_net_hd(ide, 0, 1,
+ config_ptr->sec_disk_info.net.ip_str,
+ config_ptr->sec_disk_info.net.port,
+ config_ptr->sec_disk_info.net.disk_name);
+ }
+ }
}
+ if (use_generic) {
+ generic = configure_generic(info, config_ptr);
+ }
v3_attach_device(info, pic);
PrintDebug("Attaching IDE\n");
v3_attach_device(info, ide);
- if (ramdisk != NULL) {
- v3_attach_device(info, ramdisk);
+ if (primary_disk != NULL) {
+ v3_attach_device(info, primary_disk);
+ }
+
+ if (secondary_disk != NULL) {
+ v3_attach_device(info, secondary_disk);
}
if (use_generic) {