Skip to content
Snippets Groups Projects
Commit 2f51aec2 authored by Rom Walton's avatar Rom Walton
Browse files

VBOX: Convert create_vm()

parent bb0e905b
No related branches found
No related tags found
No related merge requests found
...@@ -77,7 +77,6 @@ VBOX_BASE::VBOX_BASE() { ...@@ -77,7 +77,6 @@ VBOX_BASE::VBOX_BASE() {
vm_disk_controller_type.clear(); vm_disk_controller_type.clear();
vm_disk_controller_model.clear(); vm_disk_controller_model.clear();
os_name.clear(); os_name.clear();
vm_memory_size_mb.clear();
memory_size_mb = 0.0; memory_size_mb = 0.0;
image_filename.clear(); image_filename.clear();
iso_image_filename.clear(); iso_image_filename.clear();
......
...@@ -107,8 +107,6 @@ public: ...@@ -107,8 +107,6 @@ public:
// unique name for the VM or UUID of a stale VM if deregistering it // unique name for the VM or UUID of a stale VM if deregistering it
std::string vm_cpu_count; std::string vm_cpu_count;
// required CPU core count // required CPU core count
std::string vm_memory_size_mb;
// required size of the memory allocation for the VM, in megabytes
std::string image_filename; std::string image_filename;
// name of the virtual machine disk image file // name of the virtual machine disk image file
std::string iso_image_filename; std::string iso_image_filename;
......
This diff is collapsed.
...@@ -330,10 +330,10 @@ void read_completion_file_info(unsigned long& exit_code, bool& is_notice, string ...@@ -330,10 +330,10 @@ void read_completion_file_info(unsigned long& exit_code, bool& is_notice, string
FILE* f = fopen(path, "r"); FILE* f = fopen(path, "r");
if (f) { if (f) {
if (fgets(buf, 1024, f) != NULL) { if (fgets(buf, 1024, f) != NULL) {
exit_code = atoi(buf); exit_code = atoi(buf) != 0;
} }
if (fgets(buf, 1024, f) != NULL) { if (fgets(buf, 1024, f) != NULL) {
is_notice = atoi(buf); is_notice = atoi(buf) != 0;
} }
while (fgets(buf, 1024, f) != NULL) { while (fgets(buf, 1024, f) != NULL) {
message += buf; message += buf;
...@@ -356,7 +356,7 @@ void read_temporary_exit_file_info(int& temp_delay, bool& is_notice, string& mes ...@@ -356,7 +356,7 @@ void read_temporary_exit_file_info(int& temp_delay, bool& is_notice, string& mes
temp_delay = atoi(buf); temp_delay = atoi(buf);
} }
if (fgets(buf, 1024, f) != NULL) { if (fgets(buf, 1024, f) != NULL) {
is_notice = atoi(buf); is_notice = atoi(buf) != 0;
} }
while (fgets(buf, 1024, f) != NULL) { while (fgets(buf, 1024, f) != NULL) {
message += buf; message += buf;
...@@ -945,7 +945,6 @@ int main(int argc, char** argv) { ...@@ -945,7 +945,6 @@ int main(int argc, char** argv) {
} else { } else {
sprintf(buf, "%d", (int)ceil(vm.memory_size_mb)); sprintf(buf, "%d", (int)ceil(vm.memory_size_mb));
} }
vm.vm_memory_size_mb = buf;
} }
if (aid.vbox_window && !aid.using_sandbox) { if (aid.vbox_window && !aid.using_sandbox) {
vm.headless = false; vm.headless = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment